@ckeditor/ckeditor5-engine 41.3.1 → 41.4.0

package/src/view/renderer.js

@@ -8,7 +8,7 @@
 import ViewText from './text.js';
 import ViewPosition from './position.js';
 import { INLINE_FILLER, INLINE_FILLER_LENGTH, startsWithFiller, isInlineFiller } from './filler.js';
-import { CKEditorError, ObservableMixin, diff, env, fastDiff, insertAt, isComment, isNode, isText, remove } from '@ckeditor/ckeditor5-utils';
+import { CKEditorError, ObservableMixin, diff, env, fastDiff, insertAt, isComment, isNode, isText, remove, indexOf } from '@ckeditor/ckeditor5-utils';
 import '../../theme/renderer.css';
 /**
  * Renderer is responsible for updating the DOM structure and the DOM selection based on
@@ -400,15 +400,15 @@ export default class Renderer extends ObservableMixin() {
         if (!isEditable(selectionParent)) {
             return false;
         }
-        // We have block filler, we do not need inline one.
-        if (selectionOffset === selectionParent.getFillerOffset()) {
-            return false;
-        }
         const nodeBefore = selectionPosition.nodeBefore;
         const nodeAfter = selectionPosition.nodeAfter;
         if (nodeBefore instanceof ViewText || nodeAfter instanceof ViewText) {
             return false;
         }
+        // We have block filler, we do not need inline one.
+        if (selectionOffset === selectionParent.getFillerOffset() && (!nodeBefore || !nodeBefore.is('element', 'br'))) {
+            return false;
+        }
         // Do not use inline filler while typing outside inline elements on Android.
         // The deleteContentBackward would remove part of the inline filler instead of removing last letter in a link.
         if (env.isAndroid && (nodeBefore || nodeAfter)) {
@@ -923,13 +923,18 @@ function sameNodes(domConverter, actualDomChild, expectedDomChild) {
  * caret to the new line. A quick fix is as simple as force–refreshing the selection with the same range.
  */
 function fixGeckoSelectionAfterBr(focus, domSelection) {
-    const parent = focus.parent;
+    let parent = focus.parent;
+    let offset = focus.offset;
+    if (isText(parent) && isInlineFiller(parent)) {
+        offset = indexOf(parent) + 1;
+        parent = parent.parentNode;
+    }
     // This fix works only when the focus point is at the very end of an element.
     // There is no point in running it in cases unrelated to the browser bug.
-    if (parent.nodeType != Node.ELEMENT_NODE || focus.offset != parent.childNodes.length - 1) {
+    if (parent.nodeType != Node.ELEMENT_NODE || offset != parent.childNodes.length - 1) {
         return;
     }
-    const childAtOffset = parent.childNodes[focus.offset];
+    const childAtOffset = parent.childNodes[offset];
     // To stay on the safe side, the fix being as specific as possible, it targets only the
     // selection which is at the very end of the element and preceded by <br />.
     if (childAtOffset && childAtOffset.tagName == 'BR') {