@ckeditor/ckeditor5-engine 46.1.1 → 47.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-engine",
-  "version": "46.1.1",
+  "version": "47.0.0-alpha.1",
   "description": "The editing engine of CKEditor 5 – the best browser-based rich text editor.",
   "keywords": [
     "wysiwyg",
@@ -24,7 +24,7 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-utils": "46.1.1",
+    "@ckeditor/ckeditor5-utils": "47.0.0-alpha.1",
     "es-toolkit": "1.39.5"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/conversion/downcasthelpers.js

@@ -1881,7 +1881,7 @@ function prepareDescriptor(highlightDescriptor, data, conversionApi) {
     // If passed descriptor is a creator function, call it. If not, just use passed value.
     const descriptor = typeof highlightDescriptor == 'function' ?
         highlightDescriptor(data, conversionApi) :
-        highlightDescriptor;
+        { ...highlightDescriptor };
     if (!descriptor) {
         return null;
     }

package/src/model/differ.js

@@ -15,7 +15,7 @@ import { ModelRange } from './range.js';
  * changed elements, after all changes are applied on the model document. Calculates the diff between saved
  * elements and new ones and returns a change set.
  */
-class Differ {
+export class Differ {
     /**
      * Priority of the {@link ~Differ#_elementState element states}. States on higher indexes of the array can overwrite states on the lower
      * indexes.
@@ -1144,7 +1144,6 @@ class Differ {
         }
     }
 }
-export { Differ };
 /**
  * Returns a snapshot for the specified child node. Text node snapshots have the `name` property set to `$text`.
  */

package/src/model/operation/mergeoperation.js

@@ -133,7 +133,7 @@ export class MergeOperation extends Operation {
              */
             throw new CKEditorError('merge-operation-target-position-invalid', this);
         }
-        else if (this.howMany != sourceElement.maxOffset) {
+        else if (this.howMany !== Number.NEGATIVE_INFINITY && this.howMany != sourceElement.maxOffset) {
             /**
              * Merge operation specifies wrong number of nodes to move.
              *
@@ -141,6 +141,7 @@ export class MergeOperation extends Operation {
              */
             throw new CKEditorError('merge-operation-how-many-invalid', this);
         }
+        this.howMany = this.sourcePosition.parent.maxOffset;
     }
     /**
      * @inheritDoc

package/src/model/operation/renameoperation.js

@@ -84,7 +84,7 @@ export class RenameOperation extends Operation {
              */
             throw new CKEditorError('rename-operation-wrong-position', this);
         }
-        else if (element.name !== this.oldName) {
+        else if (this.oldName !== '' && element.name !== this.oldName) {
             /**
              * Element to change has different name than operation's old name.
              *
@@ -92,6 +92,7 @@ export class RenameOperation extends Operation {
              */
             throw new CKEditorError('rename-operation-wrong-name', this);
         }
+        this.oldName = element.name;
     }
     /**
      * @inheritDoc

package/src/model/operation/splitoperation.js

@@ -138,7 +138,7 @@ export class SplitOperation extends Operation {
              */
             throw new CKEditorError('split-operation-split-in-root', this);
         }
-        else if (this.howMany != element.maxOffset - this.splitPosition.offset) {
+        else if (this.howMany !== Number.NEGATIVE_INFINITY && this.howMany != element.maxOffset - this.splitPosition.offset) {
             /**
              * Split operation specifies wrong number of nodes to move.
              *
@@ -154,6 +154,7 @@ export class SplitOperation extends Operation {
              */
             throw new CKEditorError('split-operation-graveyard-position-invalid', this);
         }
+        this.howMany = this.splitPosition.parent.maxOffset - this.splitPosition.offset;
     }
     /**
      * @inheritDoc

package/src/view/attributeelement.js

@@ -20,7 +20,7 @@ const DEFAULT_PRIORITY = 10;
  * To create a new attribute element instance use the
  * {@link module:engine/view/downcastwriter~ViewDowncastWriter#createAttributeElement `ViewDowncastWriter#createAttributeElement()`} method.
  */
-class ViewAttributeElement extends ViewElement {
+export class ViewAttributeElement extends ViewElement {
     static DEFAULT_PRIORITY = DEFAULT_PRIORITY;
     /**
      * Element priority. Decides in what order elements are wrapped by {@link module:engine/view/downcastwriter~ViewDowncastWriter}.
@@ -173,7 +173,6 @@ class ViewAttributeElement extends ViewElement {
         return super._canSubtractAttributesOf(otherElement);
     }
 }
-export { ViewAttributeElement };
 // The magic of type inference using `is` method is centralized in `TypeCheckable` class.
 // Proper overload would interfere with that.
 ViewAttributeElement.prototype.is = function (type, name) {

package/src/view/observer/bubblingemittermixin.js

@@ -7,7 +7,9 @@
  */
 import { CKEditorError, EmitterMixin, EventInfo, toArray } from '@ckeditor/ckeditor5-utils';
 import { BubblingEventInfo } from './bubblingeventinfo.js';
-const contextsSymbol = Symbol('bubbling contexts');
+const bubblingEmitterSymbol = Symbol('bubblingEmitter');
+const callbackMapSymbol = Symbol('bubblingCallbacks');
+const contextsSymbol = Symbol('bubblingContexts');
 /**
  * Bubbling emitter mixin for the view document as described in the {@link ~BubblingEmitter} interface.
  *
@@ -29,42 +31,27 @@ export function BubblingEmitterMixin(base) {
         fire(eventOrInfo, ...eventArgs) {
             try {
                 const eventInfo = eventOrInfo instanceof EventInfo ? eventOrInfo : new EventInfo(this, eventOrInfo);
-                const eventContexts = getBubblingContexts(this);
-                if (!eventContexts.size) {
-                    return;
-                }
+                const bubblingEmitter = getBubblingEmitter(this);
+                const customContexts = getCustomContexts(this);
                 updateEventInfo(eventInfo, 'capturing', this);
                 // The capture phase of the event.
-                if (fireListenerFor(eventContexts, '$capture', eventInfo, ...eventArgs)) {
+                if (fireListenerFor(bubblingEmitter, '$capture', eventInfo, ...eventArgs)) {
                     return eventInfo.return;
                 }
                 const startRange = eventInfo.startRange || this.selection.getFirstRange();
                 const selectedElement = startRange ? startRange.getContainedElement() : null;
-                const isCustomContext = selectedElement ? Boolean(getCustomContext(eventContexts, selectedElement)) : false;
+                const isCustomContext = selectedElement ? hasMatchingCustomContext(customContexts, selectedElement) : false;
                 let node = selectedElement || getDeeperRangeParent(startRange);
                 updateEventInfo(eventInfo, 'atTarget', node);
                 // For the not yet bubbling event trigger for $text node if selection can be there and it's not a custom context selected.
                 if (!isCustomContext) {
-                    if (fireListenerFor(eventContexts, '$text', eventInfo, ...eventArgs)) {
+                    if (fireListenerFor(bubblingEmitter, '$text', eventInfo, ...eventArgs)) {
                         return eventInfo.return;
                     }
                     updateEventInfo(eventInfo, 'bubbling', node);
                 }
                 while (node) {
-                    // Root node handling.
-                    if (node.is('rootElement')) {
-                        if (fireListenerFor(eventContexts, '$root', eventInfo, ...eventArgs)) {
-                            return eventInfo.return;
-                        }
-                    }
-                    // Element node handling.
-                    else if (node.is('element')) {
-                        if (fireListenerFor(eventContexts, node.name, eventInfo, ...eventArgs)) {
-                            return eventInfo.return;
-                        }
-                    }
-                    // Check custom contexts (i.e., a widget).
-                    if (fireListenerFor(eventContexts, node, eventInfo, ...eventArgs)) {
+                    if (node.is('element') && fireListenerFor(bubblingEmitter, node, eventInfo, ...eventArgs)) {
                         return eventInfo.return;
                     }
                     node = node.parent;
@@ -72,7 +59,7 @@ export function BubblingEmitterMixin(base) {
                 }
                 updateEventInfo(eventInfo, 'bubbling', this);
                 // Document context.
-                fireListenerFor(eventContexts, '$document', eventInfo, ...eventArgs);
+                fireListenerFor(bubblingEmitter, '$document', eventInfo, ...eventArgs);
                 return eventInfo.return;
             }
             catch (err) {
@@ -83,20 +70,27 @@ export function BubblingEmitterMixin(base) {
         }
         _addEventListener(event, callback, options) {
             const contexts = toArray(options.context || '$document');
-            const eventContexts = getBubblingContexts(this);
+            const bubblingEmitter = getBubblingEmitter(this);
+            const callbacksMap = getCallbackMap(this);
             for (const context of contexts) {
-                let emitter = eventContexts.get(context);
-                if (!emitter) {
-                    emitter = new (EmitterMixin())();
-                    eventContexts.set(context, emitter);
+                if (typeof context == 'function') {
+                    getCustomContexts(this).add(context);
                 }
-                this.listenTo(emitter, event, callback, options);
             }
+            // Wrap callback with current target match.
+            const wrappedCallback = wrapCallback(this, contexts, callback);
+            // Store for later removing of listeners.
+            callbacksMap.set(callback, wrappedCallback);
+            // Listen for the event.
+            this.listenTo(bubblingEmitter, event, wrappedCallback, options);
         }
         _removeEventListener(event, callback) {
-            const eventContexts = getBubblingContexts(this);
-            for (const emitter of eventContexts.values()) {
-                this.stopListening(emitter, event, callback);
+            const bubblingEmitter = getBubblingEmitter(this);
+            const callbacksMap = getCallbackMap(this);
+            const wrappedCallback = callbacksMap.get(callback);
+            if (wrappedCallback) {
+                callbacksMap.delete(callback);
+                this.stopListening(bubblingEmitter, event, wrappedCallback);
             }
         }
     }
@@ -122,34 +116,90 @@ function updateEventInfo(eventInfo, eventPhase, currentTarget) {
  * @param eventArgs Additional arguments to be passed to the callbacks.
  * @returns True if event stop was called.
  */
-function fireListenerFor(eventContexts, context, eventInfo, ...eventArgs) {
-    const emitter = typeof context == 'string' ? eventContexts.get(context) : getCustomContext(eventContexts, context);
-    if (!emitter) {
-        return false;
+function fireListenerFor(emitter, currentTarget, eventInfo, ...eventArgs) {
+    emitter.fire(eventInfo, {
+        currentTarget,
+        eventArgs
+    });
+    // Similar to DOM Event#stopImmediatePropagation() this does not fire events
+    // for other contexts on the same node.
+    if (eventInfo.stop.called) {
+        return true;
     }
-    emitter.fire(eventInfo, ...eventArgs);
-    return eventInfo.stop.called;
+    return false;
 }
 /**
- * Returns an emitter for a specified view node.
+ * Returns an event callback wrapped with context check condition.
  */
-function getCustomContext(eventContexts, node) {
-    for (const [context, emitter] of eventContexts) {
-        if (typeof context == 'function' && context(node)) {
-            return emitter;
+function wrapCallback(emitter, contexts, callback) {
+    return function (event, data) {
+        const { currentTarget, eventArgs } = data;
+        // Quick path for string based context ($capture, $text, $document).
+        if (typeof currentTarget == 'string') {
+            if (contexts.includes(currentTarget)) {
+                callback.call(emitter, event, ...eventArgs);
+            }
+            return;
+        }
+        // The current target is a view element.
+        // Special case for the root element as it could be handled ac $root context.
+        // Note that it could also be matched later by custom context.
+        if (currentTarget.is('rootElement') && contexts.includes('$root')) {
+            callback.call(emitter, event, ...eventArgs);
+            return;
         }
+        // Check if it is a context for this element name.
+        if (contexts.includes(currentTarget.name)) {
+            callback.call(emitter, event, ...eventArgs);
+            return;
+        }
+        // Check if dynamic context matches.
+        for (const context of contexts) {
+            if (typeof context == 'function' && context(currentTarget)) {
+                callback.call(emitter, event, ...eventArgs);
+                return;
+            }
+        }
+    };
+}
+/**
+ * Returns bubbling emitter for the source (emitter).
+ */
+function getBubblingEmitter(source) {
+    if (!source[bubblingEmitterSymbol]) {
+        source[bubblingEmitterSymbol] = new (EmitterMixin())();
+    }
+    return source[bubblingEmitterSymbol];
+}
+/**
+ * Returns map of callbacks (original to wrapped one).
+ */
+function getCallbackMap(source) {
+    if (!source[callbackMapSymbol]) {
+        source[callbackMapSymbol] = new Map();
     }
-    return null;
+    return source[callbackMapSymbol];
 }
 /**
- * Returns bubbling contexts map for the source (emitter).
+ * Returns the set of registered custom contexts.
  */
-function getBubblingContexts(source) {
+function getCustomContexts(source) {
     if (!source[contextsSymbol]) {
-        source[contextsSymbol] = new Map();
+        source[contextsSymbol] = new Set();
     }
     return source[contextsSymbol];
 }
+/**
+ * Returns true if any of custom context match the given element.
+ */
+function hasMatchingCustomContext(customContexts, element) {
+    for (const context of customContexts) {
+        if (context(element)) {
+            return true;
+        }
+    }
+    return false;
+}
 /**
  * Returns the deeper parent element for the range.
  */