@smartspace/chat-ui 1.13.1-pr.417.eca5649 → 1.13.1-pr.419.f58f7bb

package/dist/index.js

@@ -1600,6 +1600,21 @@ function getSchemaNodeType(view, name) {
     return null;
   return t;
 }
+function findMentionTriggerPos(doc, windowStart, from) {
+  let triggerPos = null;
+  doc.nodesBetween(windowStart, from, (node2, pos) => {
+    if (!node2.isText || !node2.text) {
+      triggerPos = null;
+      return;
+    }
+    for (let i = 0; i < node2.text.length; i++) {
+      const charPos = pos + i;
+      if (charPos < windowStart || charPos >= from) continue;
+      if (node2.text[i] === "@") triggerPos = charPos;
+    }
+  });
+  return triggerPos;
+}
 function EditorInner({
   value,
   onChange: _onChange,
@@ -1773,7 +1788,7 @@ function EditorInner({
                     bottom: coords.bottom
                   });
                   setMentionPlacement(getMentionPlacement(coords.top));
-                  setMentionFromPos(Math.max(0, pos - 1));
+                  setMentionFromPos(pos);
                   setMentionQuery("");
                   setMentionIndex(0);
                   setMentionOpen(true);
@@ -2267,7 +2282,8 @@ function EditorInner({
       const view = viewRef.current;
       if (!view) return;
       const to = view.state.selection.from;
-      const start = mentionFromPos != null ? mentionFromPos : to - 1;
+      if (mentionFromPos == null) return;
+      const start = mentionFromPos;
       const type = view.state.schema.nodes["mention"];
       if (!type) return;
       const node2 = type.create({ id: user.id, label: user.displayName });
@@ -2292,13 +2308,21 @@ function EditorInner({
     if (!isEditable || !view) return;
     const { from } = view.state.selection;
     const windowStart = Math.max(0, from - 200);
-    const text6 = view.state.doc.textBetween(windowStart, from, "\n", "\n");
-    const at = text6.lastIndexOf("@");
-    if (at === -1) {
+    const absoluteFrom = findMentionTriggerPos(
+      view.state.doc,
+      windowStart,
+      from
+    );
+    if (absoluteFrom === null) {
       if (mentionOpen) setMentionOpen(false);
       return;
     }
-    const after = text6.slice(at + 1);
+    const after = view.state.doc.textBetween(
+      absoluteFrom + 1,
+      from,
+      "\n",
+      "\n"
+    );
     if (/[\t\r\n]/.test(after)) {
       if (mentionOpen) setMentionOpen(false);
       return;
@@ -2308,7 +2332,6 @@ function EditorInner({
       if (mentionOpen) setMentionOpen(false);
       return;
     }
-    const absoluteFrom = windowStart + at;
     if (mentionDismissedAtRef.current === absoluteFrom) {
       return;
     }