pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_editor: fix rollback on pasting using ctrl+shift+v

Browse Source 
Before this commit:

When pasting using CTRL+SHIFT+V, if the textFragment includes linebreak(\n),
each textFragment is divided, and each seperated fragment is inserted using
`insert` command, followed by `oEnter` command. However, when `oEnter` is
UNBREAKABLE, the inserted text is ROLLBACKED.

After this commit:

We now check whether the anchorNode's closestBlock is UNBREAKABLE. If so use
`oShiftEnter` command; otherwise, use `oEnter` command which avoids ROLLBACK.

task-3563785

closes odoo/odoo#151911

X-original-commit: f1e35ca82cf72ffb21c586d9bf1714bb388fe257
Signed-off-by: Geelen Sébastien (sge) <sge@odoo.com>
This commit is contained in:
Deependra Solanki
2024-01-31 17:13:55 +00:00
parent 8ae764a97b
commit b4a7e5333f
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js
+5 -3
View File
@@ -79,6 +79,7 @@ import {
getFontSizeDisplayValue,
rightLeafOnlyNotBlockPath,
lastLeaf,
isUnbreakable,
} from './utils/utils.js';
import { editorCommands } from './commands/commands.js';
import { Powerbox } from './powerbox/Powerbox.js';
@@ -4983,10 +4984,11 @@ export class OdooEditor extends EventTarget {
// Break line by inserting new paragraph and
// remove current paragraph's bottom margin.
const p = closestElement(sel.anchorNode, 'p');
if (this._applyCommand('oEnter') === UNBREAKABLE_ROLLBACK_CODE) {
if (isUnbreakable(closestBlock(sel.anchorNode))) {
this._applyCommand('oShiftEnter');
} else if (p) {
p.style.marginBottom = '0px';
} else {
this._applyCommand('oEnter');
p && (p.style.marginBottom = '0px');
}
}
textIndex++;
addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js
+18
View File
@@ -406,6 +406,24 @@ describe('Paste', () => {
'<p>d[]<br></p>',
});
});
it('should paste text and understand \\n newlines within UNBREAKABLE node', async () => {
await testEditor(BasicEditor, {
contentBefore: '<div>[]<br></div>',
stepFunction: async editor => {
await pasteText(editor, 'a\nb\nc\nd');
},
contentAfter: '<div>a<br>b<br>c<br>d[]<br></div>',
});
});
it('should paste text and understand \\n newlines within UNBREAKABLE node(2)', async () => {
await testEditor(BasicEditor, {
contentBefore: '<div><span style="font-size: 9px;">a[]</span></div>',
stepFunction: async editor => {
await pasteText(editor, 'b\nc\nd');
},
contentAfter: '<div><span style="font-size: 9px;">ab<br>c<br>d[]<br></span></div>',
});
});
});
describe('range not collapsed', async () => {
it('should paste a text in a p', async () => {