@vonage/vivid 5.15.0 → 5.15.1

package/rich-text-editor/definition.cjs

@@ -11,9 +11,9 @@ const divider_definition = require('../divider/definition.cjs');
 const select_definition = require('../select/definition.cjs');
 const option_definition = require('../unbundled/definition3.cjs');
 const menu_definition = require('../menu/definition.cjs');
-const menuItem_definition = require('../unbundled/definition2.cjs');
+const menuItem_definition = require('../unbundled/definition.cjs');
 const progressRing_definition = require('../progress-ring/definition.cjs');
-const button_definition = require('../unbundled/definition.cjs');
+const button_definition = require('../unbundled/definition2.cjs');
 const tooltip_definition = require('../tooltip/definition.cjs');
 const textField_definition = require('../text-field/definition.cjs');
 const divider = require('../unbundled/divider.cjs');
@@ -1899,6 +1899,27 @@ class Transform {
         return this.steps.length > 0;
     }
     /**
+    Return a single range, in post-transform document positions,
+    that covers all content changed by this transform. Returns null
+    if no replacements are made. Note that this will ignore changes
+    that add/remove marks without replacing the underlying content.
+    */
+    changedRange() {
+        let from = 1e9, to = -1e9;
+        for (let i = 0; i < this.mapping.maps.length; i++) {
+            let map = this.mapping.maps[i];
+            if (i) {
+                from = map.map(from, 1);
+                to = map.map(to, -1);
+            }
+            map.forEach((_f, _t, fromB, toB) => {
+                from = Math.min(from, fromB);
+                to = Math.max(to, toB);
+            });
+        }
+        return from == 1e9 ? null : { from, to };
+    }
+    /**
     @internal
     */
     addStep(step, doc) {
@@ -3473,17 +3494,20 @@ function findOffsetInNode(node, coords) {
 }
 function findOffsetInText(node, coords) {
     let len = node.nodeValue.length;
-    let range = document.createRange();
+    let range = document.createRange(), result;
     for (let i = 0; i < len; i++) {
         range.setEnd(node, i + 1);
         range.setStart(node, i);
         let rect = singleRect(range, 1);
         if (rect.top == rect.bottom)
             continue;
-        if (inRect(coords, rect))
-            return { node, offset: i + (coords.left >= (rect.left + rect.right) / 2 ? 1 : 0) };
+        if (inRect(coords, rect)) {
+            result = { node, offset: i + (coords.left >= (rect.left + rect.right) / 2 ? 1 : 0) };
+            break;
+        }
     }
-    return { node, offset: 0 };
+    range.detach();
+    return result || { node, offset: 0 };
 }
 function inRect(coords, rect) {
     return coords.left >= rect.left - 1 && coords.left <= rect.right + 1 &&
@@ -4479,15 +4503,15 @@ class NodeViewDesc extends ViewDesc {
         let updater = new ViewTreeUpdater(this, localComposition && localComposition.node, view);
         iterDeco(this.node, this.innerDeco, (widget, i, insideNode) => {
             if (widget.spec.marks)
-                updater.syncToMarks(widget.spec.marks, inline, view);
+                updater.syncToMarks(widget.spec.marks, inline, view, i);
             else if (widget.type.side >= 0 && !insideNode)
-                updater.syncToMarks(i == this.node.childCount ? slottableRequest.Mark.none : this.node.child(i).marks, inline, view);
+                updater.syncToMarks(i == this.node.childCount ? slottableRequest.Mark.none : this.node.child(i).marks, inline, view, i);
             // If the next node is a desc matching this widget, reuse it,
             // otherwise insert the widget as a new view desc.
             updater.placeWidget(widget, view, off);
         }, (child, outerDeco, innerDeco, i) => {
             // Make sure the wrapping mark descs match the node's marks.
-            updater.syncToMarks(child.marks, inline, view);
+            updater.syncToMarks(child.marks, inline, view, i);
             // Try several strategies for drawing this node
             let compIndex;
             if (updater.findNodeMatch(child, outerDeco, innerDeco, i)) ;
@@ -4503,7 +4527,7 @@ class NodeViewDesc extends ViewDesc {
             off += child.nodeSize;
         });
         // Drop all remaining descs after the current position.
-        updater.syncToMarks([], inline, view);
+        updater.syncToMarks([], inline, view, 0);
         if (this.node.isTextblock)
             updater.addTextblockHacks();
         updater.destroyRest();
@@ -4893,7 +4917,7 @@ class ViewTreeUpdater {
     }
     // Sync the current stack of mark descs with the given array of
     // marks, reusing existing mark descs when possible.
-    syncToMarks(marks, inline, view) {
+    syncToMarks(marks, inline, view, parentIndex) {
         let keep = 0, depth = this.stack.length >> 1;
         let maxKeep = Math.min(depth, marks.length);
         while (keep < maxKeep &&
@@ -4909,8 +4933,10 @@ class ViewTreeUpdater {
         }
         while (depth < marks.length) {
             this.stack.push(this.top, this.index + 1);
-            let found = -1;
-            for (let i = this.index; i < Math.min(this.index + 3, this.top.children.length); i++) {
+            let found = -1, scanTo = this.top.children.length;
+            if (parentIndex < this.preMatch.index)
+                scanTo = Math.min(this.index + 3, scanTo);
+            for (let i = this.index; i < scanTo; i++) {
                 let next = this.top.children[i];
                 if (next.matchesMark(marks[depth]) && !this.isLocked(next.dom)) {
                     found = i;
@@ -5106,9 +5132,7 @@ class ViewTreeUpdater {
 }
 // Iterate from the end of the fragment and array of descs to find
 // directly matching ones, in order to avoid overeagerly reusing those
-// for other nodes. Returns the fragment index of the first node that
-// is part of the sequence of matched nodes at the end of the
-// fragment.
+// for other nodes.
 function preMatch(frag, parentDesc) {
     let curDesc = parentDesc, descI = curDesc.children.length;
     let fI = frag.childCount, matched = new Map, matches = [];
@@ -5131,7 +5155,6 @@ function preMatch(frag, parentDesc) {
                 break outer;
             }
             else {
-                // FIXME
                 descI = curDesc.parent.children.indexOf(curDesc);
                 curDesc = curDesc.parent;
             }
@@ -6178,6 +6201,7 @@ class InputState {
         this.compositionNodes = [];
         this.compositionEndedAt = -2e8;
         this.compositionID = 1;
+        this.badSafariComposition = false;
         // Set to a composition ID when there are pending changes at compositionend
         this.compositionPendingChanges = 0;
         this.domChangeCount = 0;
@@ -6576,7 +6600,8 @@ editHandlers.compositionstart = editHandlers.compositionupdate = view => {
         let { state } = view, $pos = state.selection.$to;
         if (state.selection instanceof TextSelection &&
             (state.storedMarks ||
-                (!$pos.textOffset && $pos.parentOffset && $pos.nodeBefore.marks.some(m => m.type.spec.inclusive === false)))) {
+                (!$pos.textOffset && $pos.parentOffset && $pos.nodeBefore.marks.some(m => m.type.spec.inclusive === false)) ||
+                chrome && windows$1 && selectionBeforeUneditable(view))) { // Issue #1500
             // Need to wrap the cursor in mark nodes different from the ones in the DOM context
             view.markCursor = view.state.storedMarks || $pos.marks();
             endComposition(view, true);
@@ -6610,13 +6635,22 @@ editHandlers.compositionstart = editHandlers.compositionupdate = view => {
     }
     scheduleComposeEnd(view, timeoutComposition);
 };
+function selectionBeforeUneditable(view) {
+    let { focusNode, focusOffset } = view.domSelectionRange();
+    if (!focusNode || focusNode.nodeType != 1 || focusOffset >= focusNode.childNodes.length)
+        return false;
+    let next = focusNode.childNodes[focusOffset];
+    return next.nodeType == 1 && next.contentEditable == "false";
+}
 editHandlers.compositionend = (view, event) => {
     if (view.composing) {
         view.input.composing = false;
         view.input.compositionEndedAt = event.timeStamp;
         view.input.compositionPendingChanges = view.domObserver.pendingRecords().length ? view.input.compositionID : 0;
         view.input.compositionNode = null;
-        if (view.input.compositionPendingChanges)
+        if (view.input.badSafariComposition)
+            view.domObserver.forceFlush();
+        else if (view.input.compositionPendingChanges)
             Promise.resolve().then(() => view.domObserver.flush());
         view.input.compositionID++;
         scheduleComposeEnd(view, 20);
@@ -6837,10 +6871,15 @@ handlers.dragend = view => {
     }, 50);
 };
 editHandlers.dragover = editHandlers.dragenter = (_, e) => e.preventDefault();
-editHandlers.drop = (view, _event) => {
-    let event = _event;
-    let dragging = view.dragging;
-    view.dragging = null;
+editHandlers.drop = (view, event) => {
+    try {
+        handleDrop(view, event, view.dragging);
+    }
+    finally {
+        view.dragging = null;
+    }
+};
+function handleDrop(view, event, dragging) {
     if (!event.dataTransfer)
         return;
     let eventPos = view.posAtCoords(eventCoords(event));
@@ -6894,7 +6933,7 @@ editHandlers.drop = (view, _event) => {
     }
     view.focus();
     view.dispatch(tr.setMeta("uiEvent", "drop"));
-};
+}
 handlers.focus = view => {
     view.input.lastFocus = Date.now();
     if (!view.focused) {
@@ -7674,15 +7713,24 @@ class DOMObserver {
             new window.MutationObserver(mutations => {
                 for (let i = 0; i < mutations.length; i++)
                     this.queue.push(mutations[i]);
-                // IE11 will sometimes (on backspacing out a single character
-                // text node after a BR node) call the observer callback
-                // before actually updating the DOM, which will cause
-                // ProseMirror to miss the change (see #930)
                 if (ie$1 && ie_version <= 11 && mutations.some(m => m.type == "childList" && m.removedNodes.length ||
-                    m.type == "characterData" && m.oldValue.length > m.target.nodeValue.length))
+                    m.type == "characterData" && m.oldValue.length > m.target.nodeValue.length)) {
+                    // IE11 will sometimes (on backspacing out a single character
+                    // text node after a BR node) call the observer callback
+                    // before actually updating the DOM, which will cause
+                    // ProseMirror to miss the change (see #930)
                     this.flushSoon();
-                else
+                }
+                else if (safari && view.composing && mutations.some(m => m.type == "childList" && m.target.nodeName == "TR")) {
+                    // Safari does weird stuff when finishing a composition in a
+                    // table cell, which tends to involve inserting inappropriate
+                    // nodes in the table row.
+                    view.input.badSafariComposition = true;
+                    this.flushSoon();
+                }
+                else {
                     this.flush();
+                }
             });
         if (useCharData) {
             this.onCharData = e => {
@@ -7802,7 +7850,17 @@ class DOMObserver {
                 }
             }
         }
-        if (gecko && added.length) {
+        if (added.some(n => n.nodeName == "BR") && (view.input.lastKeyCode == 8 || view.input.lastKeyCode == 46)) {
+            // Browsers sometimes insert a bogus break node if you
+            // backspace out the last bit of text before an inline-flex node (#1552)
+            for (let node of added)
+                if (node.nodeName == "BR" && node.parentNode) {
+                    let after = node.nextSibling;
+                    if (after && after.nodeType == 1 && after.contentEditable == "false")
+                        node.parentNode.removeChild(node);
+                }
+        }
+        else if (gecko && added.length) {
             let brs = added.filter(n => n.nodeName == "BR");
             if (brs.length == 2) {
                 let [a, b] = brs;
@@ -7838,6 +7896,10 @@ class DOMObserver {
                 view.docView.markDirty(from, to);
                 checkCSS(view);
             }
+            if (view.input.badSafariComposition) {
+                view.input.badSafariComposition = false;
+                fixUpBadSafariComposition(view, added);
+            }
             this.handleDOMChange(from, to, typeOver, added);
             if (view.docView && view.docView.dirty)
                 view.updateState(view.state);
@@ -7961,6 +8023,37 @@ function blockParent(view, node) {
     }
     return null;
 }
+// Kludge for a Safari bug where, on ending a composition in an
+// otherwise empty table cell, it randomly moves the composed text
+// into the table row around that cell, greatly confusing everything
+// (#188).
+function fixUpBadSafariComposition(view, addedNodes) {
+    var _a;
+    let { focusNode, focusOffset } = view.domSelectionRange();
+    for (let node of addedNodes) {
+        if (((_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.nodeName) == "TR") {
+            let nextCell = node.nextSibling;
+            while (nextCell && (nextCell.nodeName != "TD" && nextCell.nodeName != "TH"))
+                nextCell = nextCell.nextSibling;
+            if (nextCell) {
+                let parent = nextCell;
+                for (;;) {
+                    let first = parent.firstChild;
+                    if (!first || first.nodeType != 1 || first.contentEditable == "false" ||
+                        /^(BR|IMG)$/.test(first.nodeName))
+                        break;
+                    parent = first;
+                }
+                parent.insertBefore(node, parent.firstChild);
+                if (focusNode == node)
+                    view.domSelection().collapse(node, focusOffset);
+            }
+            else {
+                node.parentNode.removeChild(node);
+            }
+        }
+    }
+}
 
 // Note that all referencing and parsing is done with the
 // start-of-operation selection and document, since that's the one
@@ -8524,7 +8617,7 @@ class EditorView {
                     this.docView.destroy();
                     this.docView = docViewDesc(state.doc, outerDeco, innerDeco, this.dom, this);
                 }
-                if (chromeKludge && !this.trackWrites)
+                if (chromeKludge && (!this.trackWrites || !this.dom.contains(this.trackWrites)))
                     forceSelUpdate = true;
             }
             // Work around for an issue where an update arriving right between
@@ -8975,11 +9068,9 @@ const convertToView = (doc, ctx) => {
     const attrsA = a.attrs;
     const attrsB = b.attrs;
     if (attrsA === attrsB) return true;
-    /* v8 ignore next -- not currently reachable since all attrs are required @preserve */
     if (!attrsA || !attrsB) return false;
     const keysA = Object.keys(attrsA);
     const keysB = Object.keys(attrsB);
-    /* v8 ignore next -- not currently reachable since all attrs are required @preserve */
     if (keysA.length !== keysB.length) return false;
     for (const key of keysA) {
       if (attrsA[key] !== attrsB[key]) return false;
@@ -10351,10 +10442,8 @@ function drawGapCursor(state) {
 function defaultTextblockForMatch(match) {
   for (let i = 0; i < match.edgeCount; i++) {
     const { type } = match.edge(i);
-    /* v8 ignore if -- @preserve It's currently not possible to exercise this code in our RTE */
     if (type.isTextblock && !type.hasRequiredAttrs()) return type;
   }
-  /* v8 ignore next 1 -- @preserve*/
   throw new Error("No default textblock found.");
 }
 
@@ -11592,7 +11681,6 @@ const sanitizeLinkHref = (url) => {
     RETURN_DOM: true,
     ...domPurifyConfig
   }).querySelector("a");
-  /* v8 ignore next -- since href is already validated it's probably always present @preserve */
   return sanitizedAnchor.getAttribute("href") ?? "";
 };
 const sanitizeImageSrc = (url) => {
@@ -12760,7 +12848,7 @@ class RteHardBreakFeatureImpl extends slottableRequest.RteFeatureImpl {
 }
 const RteHardBreakFeature = slottableRequest.featureFacade(RteHardBreakFeatureImpl);
 
-const mixedFontSize = Symbol("mixedFontSize");
+const mixedFontSize = /* @__PURE__ */ Symbol("mixedFontSize");
 class RteFontSizePickerFeatureImpl extends slottableRequest.RteFeatureImpl {
   constructor(config) {
     super();
@@ -13420,7 +13508,7 @@ function markApplies(doc, ranges, type) {
   }
   return false;
 }
-const mixedColor = Symbol("mixedColor");
+const mixedColor = /* @__PURE__ */ Symbol("mixedColor");
 class RteTextColorPickerFeatureImpl extends slottableRequest.RteFeatureImpl {
   constructor(config) {
     super();
@@ -14316,7 +14404,7 @@ class RteLinkFeatureImpl extends slottableRequest.RteFeatureImpl {
       try {
         new URL(url);
         return true;
-      } catch (e) {
+      } catch {
         return false;
       }
     };
@@ -14655,7 +14743,6 @@ class RteInlineImageFeatureImpl extends slottableRequest.RteFeatureImpl {
         new Plugin({
           props: {
             nodeViews: {
-              // eslint-disable-next-line @typescript-eslint/naming-convention
               inlineImage: (node, view, getPos) => new InlineImageView(node, view, getPos, this.config)
             }
           },
@@ -15326,7 +15413,6 @@ class RteSuggestFeatureImpl extends slottableRequest.RteFeatureImpl {
                   loadingDecoration: loadingDecoration(false)
                 };
               case "navigate": {
-                /* v8 ignore next 3 -- defensive: navigate is only dispatched after results are loaded @preserve */
                 if (!prevState.suggestions?.items.length) {
                   return prevState;
                 }
@@ -15524,7 +15610,6 @@ class RteSuggestFeatureImpl extends slottableRequest.RteFeatureImpl {
               return false;
             }
             const suggestion = suggestState.suggestions.items[suggestState.suggestions.selectedIndex];
-            /* v8 ignore next 3 -- defensive: view is always passed by keymap @preserve */
             if (view) {
               this.selectSuggestion(view, suggestState, suggestion);
             }