diff --git a/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js index 45cce837350..1f836e8242a 100644 --- a/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js +++ b/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js @@ -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++; diff --git a/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js index 0fa2d8a6315..770f59c60d7 100644 --- a/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js +++ b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js @@ -406,6 +406,24 @@ describe('Paste', () => { '
d[]