@ni/nimble-components 35.5.3 → 35.5.4

package/dist/all-components-bundle.js

@@ -32801,7 +32801,8 @@ so this becomes the fallback color for the slot */ ''}
           return new ReplaceStep(this.from, this.from + this.slice.size, doc.slice(this.from, this.to));
       }
       map(mapping) {
-          let from = mapping.mapResult(this.from, 1), to = mapping.mapResult(this.to, -1);
+          let to = mapping.mapResult(this.to, -1);
+          let from = this.from == this.to && ReplaceStep.MAP_BIAS < 0 ? to : mapping.mapResult(this.from, 1);
           if (from.deletedAcross && to.deletedAcross)
               return null;
           return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice, this.structure);
@@ -32840,6 +32841,15 @@ so this becomes the fallback color for the slot */ ''}
           return new ReplaceStep(json.from, json.to, Slice.fromJSON(schema, json.slice), !!json.structure);
       }
   }
+  /**
+  By default, for backwards compatibility, an inserting step
+  mapped over an insertion at that same position fill move after
+  the inserted content. In a collaborative editing situation, that
+  can make redone insertions appear in unexpected places. You can
+  set this to -1 to make such mapping keep the step before the
+  insertion instead.
+  */
+  ReplaceStep.MAP_BIAS = 1;
   Step$1.jsonID("replace", ReplaceStep);
   /**
   Replace a part of the document with a slice of content, but
@@ -33826,6 +33836,26 @@ so this becomes the fallback color for the slot */ ''}
   }
   function deleteRange$1(tr, from, to) {
       let $from = tr.doc.resolve(from), $to = tr.doc.resolve(to);
+      // When the deleted range spans from the start of one textblock to
+      // the start of another one, move out of the start of both blocks.
+      if ($from.parent.isTextblock && $to.parent.isTextblock && $from.start() != $to.start() &&
+          $from.parentOffset == 0 && $to.parentOffset == 0) {
+          let shared = $from.sharedDepth(to), isolated = false;
+          for (let d = $from.depth; d > shared; d--)
+              if ($from.node(d).type.spec.isolating)
+                  isolated = true;
+          for (let d = $to.depth; d > shared; d--)
+              if ($to.node(d).type.spec.isolating)
+                  isolated = true;
+          if (!isolated) {
+              for (let d = $from.depth; d > 0 && from == $from.start(d); d--)
+                  from = $from.before(d);
+              for (let d = $to.depth; d > 0 && to == $to.start(d); d--)
+                  to = $to.before(d);
+              $from = tr.doc.resolve(from);
+              $to = tr.doc.resolve(to);
+          }
+      }
       let covered = coveredDepths($from, $to);
       for (let i = 0; i < covered.length; i++) {
           let depth = covered[i], last = i == covered.length - 1;
@@ -42574,7 +42604,6 @@ so this becomes the fallback color for the slot */ ''}
     return !!findMarkInSet(marks, type, attributes);
   }
   function getMarkRange($pos, type, attributes) {
-    var _a;
     if (!$pos || !type) {
       return;
     }
@@ -42585,7 +42614,12 @@ so this becomes the fallback color for the slot */ ''}
     if (!start.node || !start.node.marks.some((mark2) => mark2.type === type)) {
       return;
     }
-    attributes = attributes || ((_a = start.node.marks[0]) == null ? void 0 : _a.attrs);
+    if (!attributes) {
+      const firstMark = start.node.marks.find((mark2) => mark2.type === type);
+      if (firstMark) {
+        attributes = firstMark.attrs;
+      }
+    }
     const mark = findMarkInSet([...start.node.marks], type, attributes);
     if (!mark) {
       return;
@@ -42620,7 +42654,7 @@ so this becomes the fallback color for the slot */ ''}
   }
 
   // src/commands/extendMarkRange.ts
-  var extendMarkRange = (typeOrName, attributes = {}) => ({ tr, state, dispatch }) => {
+  var extendMarkRange = (typeOrName, attributes) => ({ tr, state, dispatch }) => {
     const type = getMarkType(typeOrName, state.schema);
     const { doc, selection } = tr;
     const { $from, from, to } = selection;
@@ -45875,7 +45909,7 @@ so this becomes the fallback color for the slot */ ''}
             const newEnd = mapping.slice(index).map(step.to);
             const oldStart = mapping.invert().map(newStart, -1);
             const oldEnd = mapping.invert().map(newEnd);
-            const foundBeforeMark = (_a3 = nextTransaction.doc.nodeAt(newStart - 1)) == null ? void 0 : _a3.marks.some((mark) => mark.eq(step.mark));
+            const foundBeforeMark = newStart > 0 ? (_a3 = nextTransaction.doc.nodeAt(newStart - 1)) == null ? void 0 : _a3.marks.some((mark) => mark.eq(step.mark)) : false;
             const foundAfterMark = (_b3 = nextTransaction.doc.nodeAt(newEnd)) == null ? void 0 : _b3.marks.some((mark) => mark.eq(step.mark));
             this.editor.emit("delete", {
               type: "mark",
@@ -61856,6 +61890,19 @@ ${nextLine.slice(indentLevel + 2)}`;
   }
 
   // src/suggestion.ts
+  function hasInsertedWhitespace(transaction) {
+    if (!transaction.docChanged) {
+      return false;
+    }
+    return transaction.steps.some((step) => {
+      const slice = step.slice;
+      if (!(slice == null ? void 0 : slice.content)) {
+        return false;
+      }
+      const inserted = slice.content.textBetween(0, slice.content.size, "\n");
+      return /\s/.test(inserted);
+    });
+  }
   var SuggestionPluginKey = new PluginKey("suggestion");
   function Suggestion({
     pluginKey = SuggestionPluginKey,
@@ -61874,10 +61921,12 @@ ${nextLine.slice(indentLevel + 2)}`;
     render = () => ({}),
     allow = () => true,
     findSuggestionMatch: findSuggestionMatch2 = findSuggestionMatch,
-    shouldShow
+    shouldShow,
+    shouldResetDismissed
   }) {
     let props;
     const renderer = render == null ? void 0 : render();
+    const effectiveAllowSpaces = allowSpaces && !allowToIncludeChar;
     const getAnchorClientRect = () => {
       const pos = editor.state.selection.$anchor.pos;
       const coords = editor.view.coordsAtPos(pos);
@@ -61899,6 +61948,27 @@ ${nextLine.slice(indentLevel + 2)}`;
         return (currentDecorationNode == null ? void 0 : currentDecorationNode.getBoundingClientRect()) || null;
       };
     };
+    const shouldKeepDismissed = ({
+      match,
+      dismissedRange,
+      state,
+      transaction
+    }) => {
+      if (shouldResetDismissed == null ? void 0 : shouldResetDismissed({
+        editor,
+        state,
+        range: dismissedRange,
+        match,
+        transaction,
+        allowSpaces: effectiveAllowSpaces
+      })) {
+        return false;
+      }
+      if (effectiveAllowSpaces) {
+        return match.range.from === dismissedRange.from;
+      }
+      return match.range.from === dismissedRange.from && !hasInsertedWhitespace(transaction);
+    };
     function dispatchExit(view, pluginKeyRef) {
       var _a;
       try {
@@ -62001,7 +62071,8 @@ ${nextLine.slice(indentLevel + 2)}`;
             },
             query: null,
             text: null,
-            composing: false
+            composing: false,
+            dismissedRange: null
           };
           return state;
         },
@@ -62019,9 +62090,16 @@ ${nextLine.slice(indentLevel + 2)}`;
             next.range = { from: 0, to: 0 };
             next.query = null;
             next.text = null;
+            next.dismissedRange = prev.active ? { ...prev.range } : prev.dismissedRange;
             return next;
           }
           next.composing = composing;
+          if (transaction.docChanged && next.dismissedRange !== null) {
+            next.dismissedRange = {
+              from: transaction.mapping.map(next.dismissedRange.from),
+              to: transaction.mapping.map(next.dismissedRange.to)
+            };
+          }
           if (isEditable && (empty || editor.view.composing)) {
             if ((from < prev.range.from || from > prev.range.to) && !composing && !prev.composing) {
               next.active = false;
@@ -62047,12 +62125,27 @@ ${nextLine.slice(indentLevel + 2)}`;
               text: match.text,
               transaction
             }))) {
-              next.active = true;
-              next.decorationId = prev.decorationId ? prev.decorationId : decorationId;
-              next.range = match.range;
-              next.query = match.query;
-              next.text = match.text;
+              if (next.dismissedRange !== null && !shouldKeepDismissed({
+                match,
+                dismissedRange: next.dismissedRange,
+                state,
+                transaction
+              })) {
+                next.dismissedRange = null;
+              }
+              if (next.dismissedRange === null) {
+                next.active = true;
+                next.decorationId = prev.decorationId ? prev.decorationId : decorationId;
+                next.range = match.range;
+                next.query = match.query;
+                next.text = match.text;
+              } else {
+                next.active = false;
+              }
             } else {
+              if (!match) {
+                next.dismissedRange = null;
+              }
               next.active = false;
             }
           } else {
@@ -62070,41 +62163,18 @@ ${nextLine.slice(indentLevel + 2)}`;
       props: {
         // Call the keydown hook if suggestion is active.
         handleKeyDown(view, event) {
-          var _a, _b, _c, _d;
+          var _a, _b;
           const { active, range } = plugin.getState(view.state);
           if (!active) {
             return false;
           }
           if (event.key === "Escape" || event.key === "Esc") {
             const state = plugin.getState(view.state);
-            const cachedNode = (_a = props == null ? void 0 : props.decorationNode) != null ? _a : null;
-            const decorationNode = cachedNode != null ? cachedNode : (state == null ? void 0 : state.decorationId) ? view.dom.querySelector(`[data-decoration-id="${state.decorationId}"]`) : null;
-            const handledByKeyDown = ((_b = renderer == null ? void 0 : renderer.onKeyDown) == null ? void 0 : _b.call(renderer, { view, event, range: state.range })) || false;
-            if (handledByKeyDown) {
-              return true;
-            }
-            const exitProps = {
-              editor,
-              range: state.range,
-              query: state.query,
-              text: state.text,
-              items: [],
-              command: (commandProps) => {
-                return command({ editor, range: state.range, props: commandProps });
-              },
-              decorationNode,
-              // If we have a cached decoration node, use it for the clientRect
-              // to avoid another DOM lookup. If not, leave clientRect null and
-              // let consumer decide if they want to query.
-              clientRect: decorationNode ? () => {
-                return decorationNode.getBoundingClientRect() || null;
-              } : null
-            };
-            (_c = renderer == null ? void 0 : renderer.onExit) == null ? void 0 : _c.call(renderer, exitProps);
+            (_a = renderer == null ? void 0 : renderer.onKeyDown) == null ? void 0 : _a.call(renderer, { view, event, range: state.range });
             dispatchExit(view, pluginKey);
             return true;
           }
-          const handled = ((_d = renderer == null ? void 0 : renderer.onKeyDown) == null ? void 0 : _d.call(renderer, { view, event, range })) || false;
+          const handled = ((_b = renderer == null ? void 0 : renderer.onKeyDown) == null ? void 0 : _b.call(renderer, { view, event, range })) || false;
           return handled;
         },
         // Setup decorator on the currently active suggestion.
@@ -62397,7 +62467,8 @@ ${nextLine.slice(indentLevel + 2)}`;
         return helpers.parseChildren([tokens[0]]);
       }
       const content = helpers.parseInline(tokens);
-      if (content.length === 1 && content[0].type === "text" && (content[0].text === EMPTY_PARAGRAPH_MARKDOWN || content[0].text === NBSP_CHAR)) {
+      const hasExplicitEmptyParagraphMarker = tokens.length === 1 && tokens[0].type === "text" && (tokens[0].raw === EMPTY_PARAGRAPH_MARKDOWN || tokens[0].text === EMPTY_PARAGRAPH_MARKDOWN || tokens[0].raw === NBSP_CHAR || tokens[0].text === NBSP_CHAR);
+      if (hasExplicitEmptyParagraphMarker && content.length === 1 && content[0].type === "text" && (content[0].text === EMPTY_PARAGRAPH_MARKDOWN || content[0].text === NBSP_CHAR)) {
         return helpers.createNode("paragraph", void 0, []);
       }
       return helpers.createNode("paragraph", void 0, content);
@@ -63714,6 +63785,7 @@ ${nextLine.slice(indentLevel + 2)}`;
       ];
     }
   });
+  var skipTrailingNodeMeta = "skipTrailingNode";
   function nodeEqualsType({ types, node }) {
     return node && Array.isArray(types) && types.includes(node.type) || (node == null ? void 0 : node.type) === types;
   }
@@ -63733,11 +63805,14 @@ ${nextLine.slice(indentLevel + 2)}`;
       return [
         new Plugin({
           key: plugin,
-          appendTransaction: (_, __, state) => {
+          appendTransaction: (transactions, __, state) => {
             const { doc, tr, schema } = state;
             const shouldInsertNodeAtEnd = plugin.getState(state);
             const endPosition = doc.content.size;
             const type = schema.nodes[defaultNode];
+            if (transactions.some((transaction) => transaction.getMeta(skipTrailingNodeMeta))) {
+              return;
+            }
             if (!shouldInsertNodeAtEnd) {
               return;
             }