@ckeditor/ckeditor5-engine 35.3.2 → 36.0.0

package/src/view/attributeelement.js

@@ -1,12 +1,12 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
  * @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/containerelement.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/datatransfer.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/document.js

@@ -1,15 +1,13 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, 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.
      *

package/src/view/documentfragment.js

@@ -1,16 +1,14 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, 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.
  *
@@ -46,6 +44,14 @@ export default class DocumentFragment extends EmitterMixin(TypeCheckable) {
         if (children) {
             this._insertChild(0, children);
         }
+        /**
+         * Map of custom properties.
+         * Custom properties can be added to document fragment instance.
+         *
+         * @protected
+         * @member {Map}
+         */
+        this._customProperties = new Map();
     }
     /**
      * Iterable interface.
@@ -93,6 +99,24 @@ export default class DocumentFragment extends EmitterMixin(TypeCheckable) {
     get parent() {
         return null;
     }
+    /**
+     * Returns the custom property value for the given key.
+     *
+     * @param {String|Symbol} key
+     * @returns {*}
+     */
+    getCustomProperty(key) {
+        return this._customProperties.get(key);
+    }
+    /**
+     * Returns an iterator which iterates over this document fragment's custom properties.
+     * Iterator provides `[ key, value ]` pairs for each stored property.
+     *
+     * @returns {Iterable.<*>}
+     */
+    *getCustomProperties() {
+        yield* this._customProperties.entries();
+    }
     /**
      * {@link module:engine/view/documentfragment~DocumentFragment#_insertChild Insert} a child node or a list of child nodes at the end
      * and sets the parent of these nodes to this fragment.
@@ -179,6 +203,28 @@ export default class DocumentFragment extends EmitterMixin(TypeCheckable) {
     _fireChange(type, node) {
         this.fire('change:' + type, node);
     }
+    /**
+     * Sets a custom property. They can be used to add special data to elements.
+     *
+     * @see module:engine/view/downcastwriter~DowncastWriter#setCustomProperty
+     * @protected
+     * @param {String|Symbol} key
+     * @param {*} value
+     */
+    _setCustomProperty(key, value) {
+        this._customProperties.set(key, value);
+    }
+    /**
+     * Removes the custom property stored under the given key.
+     *
+     * @see module:engine/view/downcastwriter~DowncastWriter#removeCustomProperty
+     * @protected
+     * @param {String|Symbol} key
+     * @returns {Boolean} Returns true if property was removed.
+     */
+    _removeCustomProperty(key) {
+        return this._customProperties.delete(key);
+    }
 }
 /**
  * Checks whether this object is of the given type.

package/src/view/documentselection.js

@@ -1,14 +1,13 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, 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

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
@@ -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, first } 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
@@ -438,7 +433,8 @@ export default class DomConverter {
                 yield this._getBlockFiller();
             }
             const transparentRendering = childView.is('element') &&
-                childView.getCustomProperty('dataPipeline:transparentRendering');
+                !!childView.getCustomProperty('dataPipeline:transparentRendering') &&
+                !first(childView.getAttributes());
             if (transparentRendering && this.renderingMode == 'data') {
                 yield* this.viewChildrenToDom(childView, options);
             }

package/src/view/downcastwriter.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
@@ -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

@@ -1,13 +1,12 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, 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

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
@@ -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';
@@ -581,16 +579,16 @@ export default class Element extends Node {
      * @fires module:engine/view/node~Node#change
      */
     _setAttribute(key, value) {
-        value = String(value);
+        const stringValue = String(value);
         this._fireChange('attributes', this);
         if (key == 'class') {
-            parseClasses(this._classes, value);
+            parseClasses(this._classes, stringValue);
         }
         else if (key == 'style') {
-            this._styles.setTo(value);
+            this._styles.setTo(stringValue);
         }
         else {
-            this._attrs.set(key, value);
+            this._attrs.set(key, stringValue);
         }
     }
     /**

package/src/view/elementdefinition.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 export {};

package/src/view/emptyelement.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
@@ -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

@@ -1,9 +1,8 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, 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/item.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 export {};

package/src/view/matcher.js

@@ -1,9 +1,9 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * 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

@@ -1,15 +1,12 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, 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/arrowkeysobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/observer/bubblingemittermixin.js

@@ -1,14 +1,11 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
  * @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

@@ -1,11 +1,11 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
  * @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/clickobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/observer/compositionobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/observer/domeventdata.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/observer/domeventobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/observer/fakeselectionobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
@@ -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

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
@@ -20,11 +20,20 @@ import DomEventObserver from './domeventobserver';
 export default class FocusObserver extends DomEventObserver {
     constructor(view) {
         super(view);
+        this._isFocusChanging = false;
         this.domEventType = ['focus', 'blur'];
         this.useCapture = true;
         const document = this.document;
         document.on('focus', () => {
-            document.isFocused = true;
+            /**
+             * Set to `true` if the document is in the process of setting the focus.
+             *
+             * The flag is used to indicate that setting the focus is in progress.
+             *
+             * @internal
+             * @type {Boolean} module:engine/view/observer/focusobserver#_isFocusChanging
+             */
+            this._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,12 +42,16 @@ 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(() => {
+                this.flush();
+                view.change(() => { });
+            }, 50);
         });
         document.on('blur', (evt, data) => {
             const selectedEditable = document.selection.editableElement;
             if (selectedEditable === null || selectedEditable === data.target) {
                 document.isFocused = false;
+                this._isFocusChanging = false;
                 // Re-render the document to update view elements
                 // (changing document.isFocused already marked view as changed since last rendering).
                 view.change(() => { });
@@ -51,6 +64,15 @@ export default class FocusObserver extends DomEventObserver {
          * @member {Number} #_renderTimeoutId
          */
     }
+    /**
+     * Finishes setting the document focus state.
+     */
+    flush() {
+        if (this._isFocusChanging) {
+            this._isFocusChanging = false;
+            this.document.isFocused = true;
+        }
+    }
     onDomEvent(domEvent) {
         this.fire(domEvent.type, domEvent);
     }

package/src/view/observer/inputobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
@@ -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

@@ -1,12 +1,12 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
  * @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/mouseobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/observer/mutationobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**

package/src/view/observer/observer.js

@@ -1,11 +1,11 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
  * @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

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 /**
@@ -8,8 +8,9 @@
 /* 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';
+import FocusObserver from './focusobserver';
 /**
  * Selection observer class observes selection changes in the document. If a selection changes on the document this
  * observer checks if the DOM selection is different from the {@link module:engine/view/document~Document#selection view selection}.
@@ -35,6 +36,15 @@ export default class SelectionObserver extends Observer {
          * module:engine/view/observer/selectionobserver~SelectionObserver#mutationObserver
          */
         this.mutationObserver = view.getObserver(MutationObserver);
+        /**
+         * Instance of the focus observer. Selection observer calls
+         * {@link module:engine/view/observer/focusobserver~FocusObserver#flush} to mark the latest focus change as complete.
+         *
+         * @readonly
+         * @member {module:engine/view/observer/focusobserver~FocusObserver}
+         * module:engine/view/observer/focusobserver~FocusObserver#focusObserver
+         */
+        this.focusObserver = view.getObserver(FocusObserver);
         /**
          * Reference to the view {@link module:engine/view/documentselection~DocumentSelection} object used to compare
          * new selection with it.
@@ -171,6 +181,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,9 +228,11 @@ 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;
         }
+        // Mark the latest focus change as complete (we got new selection after the focus so the selection is in the focused element).
+        this.focusObserver.flush();
         if (this.selection.isSimilar(newViewSelection)) {
             // If selection was equal and we are at this point of algorithm, it means that it was incorrect.
             // Just re-render it, no need to fire any events, etc.