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

package/dist/index.js

@@ -5800,7 +5800,9 @@ ViewDocumentSelection.prototype.is = function(type) {
     }
 }
 
-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.
  *
@@ -5821,40 +5823,27 @@ const contextsSymbol = Symbol('bubbling contexts');
         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;
-                        }
-                    } 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;
@@ -5862,7 +5851,7 @@ const contextsSymbol = Symbol('bubbling contexts');
                 }
                 updateEventInfo(eventInfo, 'bubbling', this);
                 // Document context.
-                fireListenerFor(eventContexts, '$document', eventInfo, ...eventArgs);
+                fireListenerFor(bubblingEmitter, '$document', eventInfo, ...eventArgs);
                 return eventInfo.return;
             } catch (err) {
                 // @if CK_DEBUG // throw err;
@@ -5871,20 +5860,27 @@ const contextsSymbol = Symbol('bubbling contexts');
         }
         _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);
             }
         }
     }
@@ -5908,32 +5904,85 @@ const contextsSymbol = Symbol('bubbling contexts');
  * @param eventInfo The `EventInfo` object.
  * @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.
- */ function getCustomContext(eventContexts, node) {
-    for (const [context, emitter] of eventContexts){
-        if (typeof context == 'function' && context(node)) {
-            return emitter;
+ * Returns an event callback wrapped with context check condition.
+ */ 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 null;
+    return source[bubblingEmitterSymbol];
+}
+/**
+ * Returns map of callbacks (original to wrapped one).
+ */ function getCallbackMap(source) {
+    if (!source[callbackMapSymbol]) {
+        source[callbackMapSymbol] = new Map();
+    }
+    return source[callbackMapSymbol];
 }
 /**
- * Returns bubbling contexts map for the source (emitter).
- */ function getBubblingContexts(source) {
+ * Returns the set of registered custom contexts.
+ */ 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.
  */ function getDeeperRangeParent(range) {
@@ -21842,7 +21891,9 @@ function getFromAttributeCreator(config) {
  * Helper function for `highlight`. Prepares the actual descriptor object using value passed to the converter.
  */ 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;
+    const descriptor = typeof highlightDescriptor == 'function' ? highlightDescriptor(data, conversionApi) : {
+        ...highlightDescriptor
+    };
     if (!descriptor) {
         return null;
     }
@@ -27173,7 +27224,7 @@ function* _getUpcastDefinition(model, view, upcastAlso) {
 			 *
 			 * @error split-operation-split-in-root
 			 */ 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.
 			 *
@@ -27186,6 +27237,7 @@ function* _getUpcastDefinition(model, view, upcastAlso) {
 			 * @error split-operation-graveyard-position-invalid
 			 */ throw new CKEditorError('split-operation-graveyard-position-invalid', this);
         }
+        this.howMany = this.splitPosition.parent.maxOffset - this.splitPosition.offset;
     }
     /**
 	 * @inheritDoc
@@ -27343,13 +27395,14 @@ function* _getUpcastDefinition(model, view, upcastAlso) {
 			 *
 			 * @error merge-operation-target-position-invalid
 			 */ 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.
 			 *
 			 * @error merge-operation-how-many-invalid
 			 */ throw new CKEditorError('merge-operation-how-many-invalid', this);
         }
+        this.howMany = this.sourcePosition.parent.maxOffset;
     }
     /**
 	 * @inheritDoc
@@ -27746,13 +27799,14 @@ class MarkerOperation extends Operation {
 			 *
 			 * @error rename-operation-wrong-position
 			 */ 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.
 			 *
 			 * @error rename-operation-wrong-name
 			 */ throw new CKEditorError('rename-operation-wrong-name', this);
         }
+        this.oldName = element.name;
     }
     /**
 	 * @inheritDoc