@ckeditor/ckeditor5-engine 35.3.2 → 35.4.0

package/src/model/operation/utils.js

@@ -9,8 +9,7 @@ import Node from '../node';
 import Range from '../range';
 import Text from '../text';
 import TextProxy from '../textproxy';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
+import { CKEditorError, isIterable } from '@ckeditor/ckeditor5-utils';
 /**
  * Contains functions used for composing model tree by {@link module:engine/model/operation/operation~Operation operations}.
  * Those functions are built on top of {@link module:engine/model/node~Node node}, and it's child classes', APIs.

package/src/model/position.js

@@ -7,8 +7,7 @@
  */
 import TypeCheckable from './typecheckable';
 import TreeWalker from './treewalker';
-import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, compareArrays } from '@ckeditor/ckeditor5-utils';
 // To check if component is loaded more than once.
 import '@ckeditor/ckeditor5-utils/src/version';
 /**

package/src/model/range.js

@@ -8,8 +8,7 @@
 import TypeCheckable from './typecheckable';
 import Position from './position';
 import TreeWalker from './treewalker';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
+import { CKEditorError, compareArrays } from '@ckeditor/ckeditor5-utils';
 /**
  * Represents a range in the model tree.
  *

package/src/model/schema.js

@@ -10,8 +10,7 @@ import Position from './position';
 import Range from './range';
 import Text from './text';
 import TreeWalker from './treewalker';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
+import { CKEditorError, ObservableMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * The model's schema. It defines the allowed and disallowed structures of nodes as well as nodes' attributes.
  * The schema is usually defined by the features and based on them, the editing framework and features
@@ -23,11 +22,11 @@ import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
  *
  * * The {@glink framework/guides/architecture/editing-engine#schema schema section} of the
  * {@glink framework/guides/architecture/editing-engine Introduction to the Editing engine architecture} guide.
- * * The {@glink framework/guides/deep-dive/schema Schema deep dive} guide.
+ * * The {@glink framework/guides/deep-dive/schema Schema deep-dive guide}.
  *
  * @mixes module:utils/observablemixin~ObservableMixin
  */
-export default class Schema extends Observable {
+export default class Schema extends ObservableMixin() {
     /**
      * Creates a schema instance.
      */
@@ -198,7 +197,7 @@ export default class Schema extends Observable {
      *		schema.isBlock( paragraphElement ); // -> true
      *
      * See the {@glink framework/guides/deep-dive/schema#block-elements Block elements} section of
-     * the {@glink framework/guides/deep-dive/schema Schema deep dive} guide for more details.
+     * the {@glink framework/guides/deep-dive/schema Schema deep-dive guide} for more details.
      *
      * @param {module:engine/model/item~Item|module:engine/model/schema~SchemaContextItem|String} item
      * @returns {Boolean}
@@ -222,7 +221,7 @@ export default class Schema extends Observable {
      *		schema.isLimit( 'imageBlock' ); // -> true
      *
      * See the {@glink framework/guides/deep-dive/schema#limit-elements Limit elements} section of
-     * the {@glink framework/guides/deep-dive/schema Schema deep dive} guide for more details.
+     * the {@glink framework/guides/deep-dive/schema Schema deep-dive guide} for more details.
      *
      * @param {module:engine/model/item~Item|module:engine/model/schema~SchemaContextItem|String} item
      * @returns {Boolean}
@@ -249,7 +248,7 @@ export default class Schema extends Observable {
      *		schema.isObject( imageElement ); // -> true
      *
      * See the {@glink framework/guides/deep-dive/schema#object-elements Object elements} section of
-     * the {@glink framework/guides/deep-dive/schema Schema deep dive} guide for more details.
+     * the {@glink framework/guides/deep-dive/schema Schema deep-dive guide} for more details.
      *
      * @param {module:engine/model/item~Item|module:engine/model/schema~SchemaContextItem|String} item
      * @returns {Boolean}
@@ -274,7 +273,7 @@ export default class Schema extends Observable {
      *		schema.isInline( text ); // -> true
      *
      * See the {@glink framework/guides/deep-dive/schema#inline-elements Inline elements} section of
-     * the {@glink framework/guides/deep-dive/schema Schema deep dive} guide for more details.
+     * the {@glink framework/guides/deep-dive/schema Schema deep-dive guide} for more details.
      *
      * @param {module:engine/model/item~Item|module:engine/model/schema~SchemaContextItem|String} item
      * @returns {Boolean}
@@ -296,7 +295,7 @@ export default class Schema extends Observable {
      *		schema.isSelectable( text ); // -> false
      *
      * See the {@glink framework/guides/deep-dive/schema#selectable-elements Selectable elements section} of
-     * the {@glink framework/guides/deep-dive/schema Schema deep dive} guide for more details.
+     * the {@glink framework/guides/deep-dive/schema Schema deep-dive guide} for more details.
      *
      * @param {module:engine/model/item~Item|module:engine/model/schema~SchemaContextItem|String} item
      * @returns {Boolean}
@@ -321,7 +320,7 @@ export default class Schema extends Observable {
      *		schema.isContent( text ); // -> true
      *
      * See the {@glink framework/guides/deep-dive/schema#content-elements Content elements section} of
-     * the {@glink framework/guides/deep-dive/schema Schema deep dive} guide for more details.
+     * the {@glink framework/guides/deep-dive/schema Schema deep-dive guide} for more details.
      *
      * @param {module:engine/model/item~Item|module:engine/model/schema~SchemaContextItem|String} item
      * @returns {Boolean}

package/src/model/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/model/selection
  */
@@ -10,9 +9,7 @@ import TypeCheckable from './typecheckable';
 import Node from './node';
 import Position from './position';
 import Range from './range';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
-import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
+import { CKEditorError, EmitterMixin, isIterable } from '@ckeditor/ckeditor5-utils';
 /**
  * Selection is a set of {@link module:engine/model/range~Range ranges}. It has a direction specified by its
  * {@link module:engine/model/selection~Selection#anchor anchor} and {@link module:engine/model/selection~Selection#focus focus}

package/src/model/textproxy.js

@@ -6,7 +6,7 @@
  * @module engine/model/textproxy
  */
 import TypeCheckable from './typecheckable';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 // @if CK_DEBUG_ENGINE // const { convertMapToStringifiedObject } = require( '../dev-utils/utils' );
 /**
  * `TextProxy` represents a part of {@link module:engine/model/text~Text text node}.

package/src/model/treewalker.js

@@ -9,7 +9,7 @@ import Element from './element';
 import { default as Position, getTextNodeAtPosition, getNodeAfterPosition, getNodeBeforePosition } from './position';
 import Text from './text';
 import TextProxy from './textproxy';
-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/model/utils/findoptimalinsertionrange.js

@@ -5,7 +5,7 @@
 /**
  * @module engine/model/utils/findoptimalinsertionrange
  */
-import first from '@ckeditor/ckeditor5-utils/src/first';
+import { first } from '@ckeditor/ckeditor5-utils';
 // Returns a model range which is optimal (in terms of UX) for inserting a widget block.
 //
 // For instance, if a selection is in the middle of a paragraph, the collapsed range before this paragraph

package/src/model/utils/insertcontent.js

@@ -11,7 +11,7 @@ import LivePosition from '../liveposition';
 import Position from '../position';
 import Range from '../range';
 import Selection from '../selection';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 import { LiveRange } from '../../index';
 /**
  * Inserts content into the editor (specified selection) as one would expect the paste functionality to work.

package/src/model/utils/insertobject.js

@@ -8,8 +8,7 @@
 import { findOptimalInsertionRange } from './findoptimalinsertionrange';
 import DocumentSelection from '../documentselection';
 import Selection from '../selection';
-import first from '@ckeditor/ckeditor5-utils/src/first';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, first } from '@ckeditor/ckeditor5-utils';
 /**
  * Inserts an {@glink framework/guides/deep-dive/schema#object-elements object element} at a specific position in the editor content.
  *
@@ -118,25 +117,11 @@ export default function insertObject(model, object, selectable, placeOrOffset, o
 // `place` parameter is equal to `after` but there is no element with `$text` node to set selection in.
 function updateSelection(writer, contextElement, place, paragraphAttributes) {
     const model = writer.model;
-    if (place == 'after') {
-        let nextElement = contextElement.nextSibling;
-        // Check whether an element next to the inserted element is defined and can contain a text.
-        const canSetSelection = nextElement && model.schema.checkChild(nextElement, '$text');
-        // If the element is missing, but a paragraph could be inserted next to the element, let's add it.
-        if (!canSetSelection && model.schema.checkChild(contextElement.parent, 'paragraph')) {
-            nextElement = writer.createElement('paragraph');
-            model.schema.setAllowedAttributes(nextElement, paragraphAttributes, writer);
-            model.insertContent(nextElement, writer.createPositionAfter(contextElement));
-        }
-        // Put the selection inside the element, at the beginning.
-        if (nextElement) {
-            writer.setSelection(nextElement, 0);
-        }
-    }
-    else if (place == 'on') {
+    if (place == 'on') {
         writer.setSelection(contextElement, 'on');
+        return;
     }
-    else {
+    if (place != 'after') {
         /**
          * The unsupported `options.setSelection` parameter was passed
          * to the {@link module:engine/model/utils/insertobject insertObject()} function.
@@ -147,4 +132,21 @@ function updateSelection(writer, contextElement, place, paragraphAttributes) {
          */
         throw new CKEditorError('insertobject-invalid-place-parameter-value', model);
     }
+    let nextElement = contextElement.nextSibling;
+    if (model.schema.isInline(contextElement)) {
+        writer.setSelection(contextElement, 'after');
+        return;
+    }
+    // Check whether an element next to the inserted element is defined and can contain a text.
+    const canSetSelection = nextElement && model.schema.checkChild(nextElement, '$text');
+    // If the element is missing, but a paragraph could be inserted next to the element, let's add it.
+    if (!canSetSelection && model.schema.checkChild(contextElement.parent, 'paragraph')) {
+        nextElement = writer.createElement('paragraph');
+        model.schema.setAllowedAttributes(nextElement, paragraphAttributes, writer);
+        model.insertContent(nextElement, writer.createPositionAfter(contextElement));
+    }
+    // Put the selection inside the element, at the beginning.
+    if (nextElement) {
+        writer.setSelection(nextElement, 0);
+    }
 }

package/src/model/utils/modifyselection.js

@@ -9,7 +9,7 @@ import DocumentSelection from '../documentselection';
 import Position from '../position';
 import Range from '../range';
 import TreeWalker from '../treewalker';
-import { isInsideSurrogatePair, isInsideCombinedSymbol, isInsideEmojiSequence } from '@ckeditor/ckeditor5-utils/src/unicode';
+import { isInsideSurrogatePair, isInsideCombinedSymbol, isInsideEmojiSequence } from '@ckeditor/ckeditor5-utils';
 const wordBoundaryCharacters = ' ,.?!:;"-()';
 /**
  * Modifies the selection. Currently, the supported modifications are:

package/src/model/writer.js

@@ -21,8 +21,7 @@ import Position from './position';
 import Range from './range';
 import RootElement from './rootelement';
 import Text from './text';
-import toMap from '@ckeditor/ckeditor5-utils/src/tomap';
-import CKEditorError, { logWarning } from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, logWarning, toMap } from '@ckeditor/ckeditor5-utils';
 /**
  * The model can only be modified by using the writer. It should be used whenever you want to create a node, modify
  * child nodes, attributes or text, set the selection's position and its attributes.

package/src/view/attributeelement.js

@@ -6,7 +6,7 @@
  * @module engine/view/attributeelement
  */
 import Element from './element';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 // Default attribute priority.
 const DEFAULT_PRIORITY = 10;
 /**

package/src/view/document.js

@@ -2,14 +2,12 @@
  * @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/document
  */
 import DocumentSelection from './documentselection';
-import Collection from '@ckeditor/ckeditor5-utils/src/collection';
 import BubblingEmitterMixin from './observer/bubblingemittermixin';
-import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
+import { Collection, ObservableMixin } from '@ckeditor/ckeditor5-utils';
 // @if CK_DEBUG_ENGINE // const { logDocument } = require( '../dev-utils/utils' );
 /**
  * Document class creates an abstract layer over the content editable area, contains a tree of view elements and
@@ -18,7 +16,7 @@ import { Observable } from '@ckeditor/ckeditor5-utils/src/observablemixin';
  * @mixes module:engine/view/observer/bubblingemittermixin~BubblingEmitterMixin
  * @mixes module:utils/observablemixin~ObservableMixin
  */
-export default class Document extends BubblingEmitterMixin(Observable) {
+export default class Document extends BubblingEmitterMixin(ObservableMixin()) {
     /**
      * Creates a Document instance.
      *
@@ -73,6 +71,22 @@ export default class Document extends BubblingEmitterMixin(Observable) {
          */
         this.set('isFocused', false);
         /**
+         * Set to `true` if the document is in the process of setting the focus.
+         *
+         * To be precise, there are two browser events that we care about: `focus` and `selectionchange`.
+         *
+         * Different browsers handle them differently. Chromium sends the `focus` event before the
+         * `selectionchange` event, which leads to rendering with the old selection state.
+         *
+         * The flag is used to prevent rendering when setting the focus is in progress
+         * and we are waiting for the new value.
+         *
+         * @internal
+         * @observable
+         * @member {Boolean} module:engine/view/document~Document#_isFocusChanging
+         */
+        this.set('_isFocusChanging', false);
+        /** @
          * `true` while 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`.
          *

package/src/view/documentfragment.js

@@ -2,15 +2,13 @@
  * @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/documentfragment
  */
 import TypeCheckable from './typecheckable';
 import Text from './text';
 import TextProxy from './textproxy';
-import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import { EmitterMixin, isIterable } from '@ckeditor/ckeditor5-utils';
 /**
  * Document fragment.
  *

package/src/view/documentselection.js

@@ -2,13 +2,12 @@
  * @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/documentselection
  */
 import TypeCheckable from './typecheckable';
 import Selection from './selection';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
+import { EmitterMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * Class representing the document selection in the view.
  *

package/src/view/domconverter.js

@@ -16,12 +16,7 @@ import ViewDocumentFragment from './documentfragment';
 import ViewTreeWalker from './treewalker';
 import { default as Matcher } from './matcher';
 import { BR_FILLER, INLINE_FILLER_LENGTH, NBSP_FILLER, MARKED_NBSP_FILLER, getDataWithoutFiller, isInlineFiller, startsWithFiller } from './filler';
-import global from '@ckeditor/ckeditor5-utils/src/dom/global';
-import { logWarning } from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import indexOf from '@ckeditor/ckeditor5-utils/src/dom/indexof';
-import getAncestors from '@ckeditor/ckeditor5-utils/src/dom/getancestors';
-import isText from '@ckeditor/ckeditor5-utils/src/dom/istext';
-import isComment from '@ckeditor/ckeditor5-utils/src/dom/iscomment';
+import { global, logWarning, indexOf, getAncestors, isText, isComment } from '@ckeditor/ckeditor5-utils';
 const BR_FILLER_REF = BR_FILLER(global.document); // eslint-disable-line new-cap
 const NBSP_FILLER_REF = NBSP_FILLER(global.document); // eslint-disable-line new-cap
 const MARKED_NBSP_FILLER_REF = MARKED_NBSP_FILLER(global.document); // eslint-disable-line new-cap

package/src/view/downcastwriter.js

@@ -13,9 +13,8 @@ import AttributeElement from './attributeelement';
 import EmptyElement from './emptyelement';
 import UIElement from './uielement';
 import RawElement from './rawelement';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, isIterable } from '@ckeditor/ckeditor5-utils';
 import DocumentFragment from './documentfragment';
-import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
 import Text from './text';
 import EditableElement from './editableelement';
 import { isPlainObject } from 'lodash-es';

package/src/view/editableelement.js

@@ -2,12 +2,11 @@
  * @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/editableelement
  */
 import ContainerElement from './containerelement';
-import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
+import { ObservableMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * Editable element which can be a {@link module:engine/view/rooteditableelement~RootEditableElement root}
  * or nested editable area in the editor.

package/src/view/element.js

@@ -8,9 +8,7 @@
 import Node from './node';
 import Text from './text';
 import TextProxy from './textproxy';
-import toMap from '@ckeditor/ckeditor5-utils/src/tomap';
-import toArray from '@ckeditor/ckeditor5-utils/src/toarray';
-import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
+import { isIterable, toArray, toMap } from '@ckeditor/ckeditor5-utils';
 import { default as Matcher } from './matcher';
 import { default as StylesMap } from './stylesmap';
 import { isPlainObject } from 'lodash-es';

package/src/view/emptyelement.js

@@ -7,7 +7,7 @@
  */
 import Element from './element';
 import Node from './node';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * Empty element class. It is used to represent elements that cannot contain any child nodes (for example `<img>` elements).
  *

package/src/view/filler.js

@@ -2,8 +2,7 @@
  * @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
  */
-import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
-import isText from '@ckeditor/ckeditor5-utils/src/dom/istext';
+import { keyCodes, isText } from '@ckeditor/ckeditor5-utils';
 /**
  * Set of utilities related to handling block and inline fillers.
  *

package/src/view/matcher.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 import { isPlainObject } from 'lodash-es';
-import { logWarning } from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { logWarning } from '@ckeditor/ckeditor5-utils';
 /**
  * View matcher class.
  * Instance of this class can be used to find {@link module:engine/view/element~Element elements} that match given pattern.

package/src/view/node.js

@@ -2,14 +2,11 @@
  * @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/node
  */
 import TypeCheckable from './typecheckable';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
-import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
+import { CKEditorError, EmitterMixin, compareArrays } from '@ckeditor/ckeditor5-utils';
 import { clone } from 'lodash-es';
 // To check if component is loaded more than once.
 import '@ckeditor/ckeditor5-utils/src/version';

package/src/view/observer/bubblingemittermixin.js

@@ -5,10 +5,7 @@
 /**
  * @module engine/view/observer/bubblingemittermixin
  */
-import EventInfo from '@ckeditor/ckeditor5-utils/src/eventinfo';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
-import { Emitter } from '@ckeditor/ckeditor5-utils/src/emittermixin';
-import toArray from '@ckeditor/ckeditor5-utils/src/toarray';
+import { CKEditorError, EmitterMixin, EventInfo, toArray } from '@ckeditor/ckeditor5-utils';
 import BubblingEventInfo from './bubblingeventinfo';
 const contextsSymbol = Symbol('bubbling contexts');
 /**
@@ -81,7 +78,7 @@ export default function BubblingEmitterMixin(base) {
             for (const context of contexts) {
                 let emitter = eventContexts.get(context);
                 if (!emitter) {
-                    emitter = new Emitter();
+                    emitter = new (EmitterMixin())();
                     eventContexts.set(context, emitter);
                 }
                 this.listenTo(emitter, event, callback, options);

package/src/view/observer/bubblingeventinfo.js

@@ -5,7 +5,7 @@
 /**
  * @module engine/view/observer/bubblingeventinfo
  */
-import EventInfo from '@ckeditor/ckeditor5-utils/src/eventinfo';
+import { EventInfo } from '@ckeditor/ckeditor5-utils';
 /**
  * The event object passed to bubbling event callbacks. It is used to provide information about the event as well as a tool to
  * manipulate it.

package/src/view/observer/fakeselectionobserver.js

@@ -7,7 +7,7 @@
  */
 import Observer from './observer';
 import ViewSelection from '../selection';
-import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
+import { keyCodes } from '@ckeditor/ckeditor5-utils';
 import { debounce } from 'lodash-es';
 /**
  * Fake selection observer class. If view selection is fake it is placed in dummy DOM container. This observer listens

package/src/view/observer/focusobserver.js

@@ -25,6 +25,7 @@ export default class FocusObserver extends DomEventObserver {
         const document = this.document;
         document.on('focus', () => {
             document.isFocused = true;
+            document._isFocusChanging = true;
             // Unfortunately native `selectionchange` event is fired asynchronously.
             // We need to wait until `SelectionObserver` handle the event and then render. Otherwise rendering will
             // overwrite new DOM selection with selection from the view.
@@ -33,7 +34,10 @@ export default class FocusObserver extends DomEventObserver {
             //
             // Using `view.change()` instead of `view.forceRender()` to prevent double rendering
             // in a situation where `selectionchange` already caused selection change.
-            this._renderTimeoutId = setTimeout(() => view.change(() => { }), 50);
+            this._renderTimeoutId = setTimeout(() => {
+                document._isFocusChanging = false;
+                view.change(() => { });
+            }, 50);
         });
         document.on('blur', (evt, data) => {
             const selectedEditable = document.selection.editableElement;

package/src/view/observer/inputobserver.js

@@ -7,7 +7,7 @@
  */
 import DomEventObserver from './domeventobserver';
 import DataTransfer from '../datatransfer';
-import env from '@ckeditor/ckeditor5-utils/src/env';
+import { env } from '@ckeditor/ckeditor5-utils';
 /**
  * Observer for events connected with data input.
  *

package/src/view/observer/keyobserver.js

@@ -6,7 +6,7 @@
  * @module engine/view/observer/keyobserver
  */
 import DomEventObserver from './domeventobserver';
-import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
+import { getCode } from '@ckeditor/ckeditor5-utils';
 /**
  * Observer for events connected with pressing keyboard keys.
  *

package/src/view/observer/observer.js

@@ -5,7 +5,7 @@
 /**
  * @module engine/view/observer/observer
  */
-import { Emitter as DomEmitter } from '@ckeditor/ckeditor5-utils/src/dom/emittermixin';
+import { DomEmitterMixin } from '@ckeditor/ckeditor5-utils';
 /**
  * Abstract base observer class. Observers are classes which listen to DOM events, do the preliminary
  * processing and fire events on the {@link module:engine/view/document~Document} objects.
@@ -14,7 +14,7 @@ import { Emitter as DomEmitter } from '@ckeditor/ckeditor5-utils/src/dom/emitter
  *
  * @abstract
  */
-export default class Observer extends DomEmitter {
+export default class Observer extends DomEmitterMixin() {
     /**
      * Creates an instance of the observer.
      *

package/src/view/observer/selectionobserver.js

@@ -8,7 +8,7 @@
 /* global setInterval, clearInterval */
 import Observer from './observer';
 import MutationObserver from './mutationobserver';
-import env from '@ckeditor/ckeditor5-utils/src/env';
+import { env } from '@ckeditor/ckeditor5-utils';
 import { debounce } from 'lodash-es';
 /**
  * Selection observer class observes selection changes in the document. If a selection changes on the document this
@@ -171,6 +171,12 @@ export default class SelectionObserver extends Observer {
         this._fireSelectionChangeDoneDebounced.cancel();
         this._documentIsSelectingInactivityTimeoutDebounced.cancel();
     }
+    // @if CK_DEBUG //	_reportInfiniteLoop() {
+    // @if CK_DEBUG //		throw new Error(
+    // @if CK_DEBUG //			'Selection change observer detected an infinite rendering loop.\n\n' +
+    // @if CK_DEBUG //	 		'⚠️⚠️ Report this error on https://github.com/ckeditor/ckeditor5/issues/11658.'
+    // @if CK_DEBUG //		);
+    // @if CK_DEBUG //	}
     /**
      * Selection change listener. {@link module:engine/view/observer/mutationobserver~MutationObserver#flush Flush} mutations, check if
      * a selection changes and fires {@link module:engine/view/document~Document#event:selectionChange} event on every change
@@ -212,7 +218,7 @@ export default class SelectionObserver extends Observer {
             // by the browser and browser fixes it automatically what causes `selectionchange` event on
             // which a loopback through a model tries to re-render the wrong selection and again.
             //
-            // @if CK_DEBUG // console.warn( 'Selection change observer detected an infinite rendering loop.' );
+            // @if CK_DEBUG // this._reportInfiniteLoop();
             return;
         }
         if (this.selection.isSimilar(newViewSelection)) {
@@ -232,6 +238,7 @@ export default class SelectionObserver extends Observer {
             // @if CK_DEBUG_TYPING // 		newViewSelection.getFirstRange()
             // @if CK_DEBUG_TYPING // 	);
             // @if CK_DEBUG_TYPING // }
+            this.document._isFocusChanging = false;
             // Prepare data for new selection and fire appropriate events.
             this.document.fire('selectionChange', data);
             // Call `#_fireSelectionChangeDoneDebounced` every time when `selectionChange` event is fired.

package/src/view/observer/tabobserver.js

@@ -4,7 +4,7 @@
  */
 import Observer from './observer';
 import BubblingEventInfo from './bubblingeventinfo';
-import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
+import { keyCodes } from '@ckeditor/ckeditor5-utils';
 /**
  * Tab observer introduces the {@link module:engine/view/document~Document#event:tab `Document#tab`} event.
  *

package/src/view/position.js

@@ -6,8 +6,7 @@
  * @module engine/view/position
  */
 import TypeCheckable from './typecheckable';
-import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError, compareArrays } from '@ckeditor/ckeditor5-utils';
 import EditableElement from './editableelement';
 // To check if component is loaded more than once.
 import '@ckeditor/ckeditor5-utils/src/version';

package/src/view/rawelement.js

@@ -7,7 +7,7 @@
  */
 import Element from './element';
 import Node from './node';
-import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
+import { CKEditorError } from '@ckeditor/ckeditor5-utils';
 /**
  * The raw element class.
  *