@ckeditor/ckeditor5-engine 35.3.2 → 35.4.0

package/src/view/renderer.js

@@ -8,16 +8,7 @@
 import ViewText from './text';
 import ViewPosition from './position';
 import { INLINE_FILLER, INLINE_FILLER_LENGTH, startsWithFiller, isInlineFiller } from './filler';
-import { default as diff } from '@ckeditor/ckeditor5-utils/src/diff';
-import insertAt from '@ckeditor/ckeditor5-utils/src/dom/insertat';
-import remove from '@ckeditor/ckeditor5-utils/src/dom/remove';
-import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import isText from '@ckeditor/ckeditor5-utils/src/dom/istext';
-import isComment from '@ckeditor/ckeditor5-utils/src/dom/iscomment';
-import isNode from '@ckeditor/ckeditor5-utils/src/dom/isnode';
-import fastDiff from '@ckeditor/ckeditor5-utils/src/fastdiff';
-import env from '@ckeditor/ckeditor5-utils/src/env';
+import { CKEditorError, ObservableMixin, diff, env, fastDiff, insertAt, isComment, isNode, isText, remove } from '@ckeditor/ckeditor5-utils';
 import '../../theme/renderer.css';
 /**
  * Renderer is responsible for updating the DOM structure and the DOM selection based on
@@ -32,7 +23,7 @@ import '../../theme/renderer.css';
  * Renderer uses {@link module:engine/view/domconverter~DomConverter} to transform view nodes and positions
  * to and from the DOM.
  */
-export default class Renderer extends Observable {
+export default class Renderer extends ObservableMixin() {
     /**
      * Creates a renderer instance.
      *
@@ -91,6 +82,14 @@ export default class Renderer extends Observable {
          * @observable
          */
         this.set('isFocused', false);
+        /**
+         * Indicates if the view document is changing the focus (`true`) and selection rendering should be prevented.
+         *
+         * @internal
+         * @observable
+         * @member {Boolean}
+         */
+        this.set('_isFocusChanging', false);
         /**
          * Indicates whether the user is making a selection in the document (e.g. holding the mouse button and moving the cursor).
          * When they stop selecting, the property goes back to `false`.
@@ -759,6 +758,11 @@ export default class Renderer extends Observable {
         if (env.isBlink && !env.isAndroid && this.isSelecting && !this.markedChildren.size) {
             return;
         }
+        // The focus is still in progress and we are waiting for new values from `selectionchange` event.
+        // In that case, we need to prevent update selection since it would be updated using old values.
+        if (this._isFocusChanging) {
+            return;
+        }
         // If there is no selection - remove DOM and fake selections.
         if (this.selection.rangeCount === 0) {
             this._removeDomSelection();

package/src/view/selection.js

@@ -2,7 +2,6 @@
  * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-/* eslint-disable new-cap */
 /**
  * @module engine/view/selection
  */
@@ -11,10 +10,7 @@ import Range from './range';
 import Position from './position';
 import Node from './node';
 import DocumentSelection from './documentselection';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import count from '@ckeditor/ckeditor5-utils/src/count';
-import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import { CKEditorError, EmitterMixin, count, isIterable } from '@ckeditor/ckeditor5-utils';
 /**
  * Class representing an arbirtary selection in the view.
  * See also {@link module:engine/view/documentselection~DocumentSelection}.

package/src/view/textproxy.js

@@ -6,7 +6,7 @@
  * @module engine/view/textproxy
  */
 import TypeCheckable from './typecheckable';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * TextProxy is a wrapper for substring of {@link module:engine/view/text~Text}. Instance of this class is created by
  * {@link module:engine/view/treewalker~TreeWalker} when only a part of {@link module:engine/view/text~Text} needs to be returned.

package/src/view/treewalker.js

@@ -9,7 +9,7 @@ import Element from './element';
 import Text from './text';
 import TextProxy from './textproxy';
 import Position from './position';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * Position iterator class. It allows to iterate forward and backward over the document.
  */

package/src/view/uielement.js

@@ -7,8 +7,7 @@
  */
 import Element from './element';
 import Node from './node';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
+import { CKEditorError, keyCodes } from '@ckeditor/ckeditor5-utils';
 /**
  * UI element class. It should be used to represent editing UI which needs to be injected into the editing view
  * If possible, you should keep your UI outside the editing view. However, if that is not possible,

package/src/view/view.js

@@ -21,11 +21,9 @@ import CompositionObserver from './observer/compositionobserver';
 import InputObserver from './observer/inputobserver';
 import ArrowKeysObserver from './observer/arrowkeysobserver';
 import TabObserver from './observer/tabobserver';
-import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
-import { scrollViewportToShowTarget } from '@ckeditor/ckeditor5-utils/src/dom/scroll';
+import { CKEditorError, ObservableMixin, scrollViewportToShowTarget } from '@ckeditor/ckeditor5-utils';
 import { injectUiElementHandling } from './uielement';
 import { injectQuirksHandling } from './filler';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 /**
  * Editor's view controller class. Its main responsibility is DOM - View management for editing purposes, to provide
  * abstraction over the DOM structure and events and hide all browsers quirks.
@@ -58,7 +56,7 @@ import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
  *
  * @mixes module:utils/observablemixin~ObservableMixin
  */
-export default class View extends Observable {
+export default class View extends ObservableMixin() {
     /**
      * @param {module:engine/view/stylesmap~StylesProcessor} stylesProcessor The styles processor instance.
      */
@@ -108,7 +106,8 @@ export default class View extends Observable {
          * @type {module:engine/view/renderer~Renderer}
          */
         this._renderer = new Renderer(this.domConverter, this.document.selection);
-        this._renderer.bind('isFocused', 'isSelecting', 'isComposing').to(this.document, 'isFocused', 'isSelecting', 'isComposing');
+        this._renderer.bind('isFocused', 'isSelecting', 'isComposing', '_isFocusChanging')
+            .to(this.document, 'isFocused', 'isSelecting', 'isComposing', '_isFocusChanging');
         /**
          * A DOM root attributes cache. It saves the initial values of DOM root attributes before the DOM element
          * is {@link module:engine/view/view~View#attachDomRoot attached} to the view so later on, when
@@ -452,6 +451,7 @@ export default class View extends Observable {
      */
     forceRender() {
         this._hasChangedSinceTheLastRendering = true;
+        this.document._isFocusChanging = false;
         this.change(() => { });
     }
     /**