@liveblocks/react-ui 2.18.2-test1 → 2.18.3

package/dist/slate/plugins/mentions.js

@@ -4,6 +4,7 @@ var slate = require('slate');
 var getCharacter = require('../utils/get-character.js');
 var getMatchRange = require('../utils/get-match-range.js');
 var isEmptyString = require('../utils/is-empty-string.js');
+var isWhitespaceCharacter = require('../utils/is-whitespace-character.js');
 
 const MENTION_CHARACTER = "@";
 function getMentionDraftAtSelection(editor) {
@@ -11,12 +12,29 @@ function getMentionDraftAtSelection(editor) {
   if (!selection || !slate.Range.isCollapsed(selection)) {
     return;
   }
-  const match = getMatchRange.getMatchRange(editor, selection);
+  const match = getMatchRange.getMatchRange(editor, selection, ["@"], {
+    include: true,
+    allowConsecutiveWhitespace: false,
+    ignoreTerminator: (_, point) => {
+      const characterBefore = getCharacter.getCharacterBefore(editor, point);
+      if (characterBefore && !isWhitespaceCharacter.isWhitespaceCharacter(characterBefore.text)) {
+        return true;
+      }
+      const after = slate.Editor.after(editor, point, { unit: "character" });
+      if (after) {
+        const characterAfter = getCharacter.getCharacterAfter(editor, after);
+        if (isWhitespaceCharacter.isWhitespaceCharacter(characterAfter?.text)) {
+          return true;
+        }
+      }
+      return false;
+    }
+  });
   if (!match) {
     return;
   }
   const matchText = slate.Editor.string(editor, match);
-  if (!matchText.startsWith(MENTION_CHARACTER)) {
+  if (!matchText.startsWith(MENTION_CHARACTER) || isWhitespaceCharacter.isWhitespaceCharacter(matchText[1])) {
     return;
   }
   return {

package/dist/slate/plugins/mentions.js.map

@@ -1 +1 @@
-{"version":3,"file":"mentions.js","sources":["../../../src/slate/plugins/mentions.ts"],"sourcesContent":["import type { Node as SlateNode } from \"slate\";\nimport {\n  Editor as SlateEditor,\n  Element as SlateElement,\n  Range as SlateRange,\n  Transforms as SlateTransforms,\n} from \"slate\";\n\nimport type { ComposerBodyMention } from \"../../types\";\nimport { getCharacterAfter, getCharacterBefore } from \"../utils/get-character\";\nimport { getMatchRange } from \"../utils/get-match-range\";\nimport { isEmptyString } from \"../utils/is-empty-string\";\n\nexport const MENTION_CHARACTER = \"@\";\n\nexport type MentionDraft = {\n  range: SlateRange;\n  text: string;\n};\n\nexport function getMentionDraftAtSelection(\n  editor: SlateEditor\n): MentionDraft | undefined {\n  const { selection } = editor;\n\n  if (!selection || !SlateRange.isCollapsed(selection)) {\n    return;\n  }\n\n  // Match the word at the current selection by walking back\n  // until a whitespace character is found\n  const match = getMatchRange(editor, selection);\n\n  if (!match) {\n    return;\n  }\n\n  const matchText = SlateEditor.string(editor, match);\n\n  // Check if the match starts with the mention character\n  if (!matchText.startsWith(MENTION_CHARACTER)) {\n    return;\n  }\n\n  return {\n    range: match,\n    // Exclude the mention character from the text\n    text: matchText.substring(1),\n  };\n}\n\nexport function isComposerBodyMention(\n  node: SlateNode\n): node is ComposerBodyMention {\n  return SlateElement.isElement(node) && node.type === \"mention\";\n}\n\nexport function insertMention(editor: SlateEditor, userId: string) {\n  const mention: ComposerBodyMention = {\n    type: \"mention\",\n    id: userId,\n    children: [{ text: \"\" }],\n  };\n\n  // Insert the mention\n  SlateTransforms.insertNodes(editor, mention);\n  SlateTransforms.move(editor);\n\n  const afterCharacter = editor.selection\n    ? getCharacterAfter(editor, editor.selection)\n    : undefined;\n\n  if (!afterCharacter || afterCharacter.void) {\n    // Insert a following space if needed\n    SlateTransforms.insertText(editor, \" \");\n  } else if (isEmptyString(afterCharacter.text)) {\n    // Move the selection if it's already followed by a space\n    SlateTransforms.move(editor);\n  }\n}\n\nexport function insertMentionCharacter(editor: SlateEditor) {\n  if (!editor.selection) {\n    return;\n  }\n\n  // Check if the selection is preceded or followed by a non-whitespace character\n  const beforeCharacter = getCharacterBefore(editor, editor.selection, {\n    filterVoids: true,\n  });\n  const afterCharacter = getCharacterAfter(editor, editor.selection, {\n    filterVoids: true,\n  });\n  const shouldInsertSpaceBefore =\n    beforeCharacter && !isEmptyString(beforeCharacter.text);\n  const shouldInsertSpaceAfter =\n    afterCharacter && !isEmptyString(afterCharacter.text);\n\n  if (!SlateRange.isCollapsed(editor.selection)) {\n    const text =\n      (shouldInsertSpaceBefore ? \" \" : \"\") +\n      MENTION_CHARACTER +\n      (shouldInsertSpaceAfter ? \" \" : \"\");\n\n    // If the selection is collapsed, insert the mention character at the current selection\n    editor.insertText(text);\n\n    // If a following space was inserted, move the selection back by one\n    if (shouldInsertSpaceAfter) {\n      SlateTransforms.move(editor, {\n        distance: 1,\n        unit: \"character\",\n        reverse: true,\n      });\n    }\n  } else {\n    const beforeText = (shouldInsertSpaceBefore ? \" \" : \"\") + MENTION_CHARACTER;\n\n    // If the selection is not collapsed, insert the mention character before the selection\n    editor.insertText(beforeText, { at: SlateRange.start(editor.selection) });\n\n    if (shouldInsertSpaceAfter) {\n      editor.insertText(\" \", { at: SlateRange.end(editor.selection) });\n    }\n\n    // Collapse the selection at its end\n    SlateTransforms.collapse(editor, { edge: \"end\" });\n  }\n}\n\nexport function withMentions<T extends SlateEditor>(editor: T): T {\n  const { isInline, isVoid, markableVoid, deleteBackward } = editor;\n\n  editor.isInline = (element) => {\n    return isComposerBodyMention(element) || isInline(element);\n  };\n\n  editor.isVoid = (element) => {\n    return isComposerBodyMention(element) || isVoid(element);\n  };\n\n  editor.markableVoid = (element) => {\n    return isComposerBodyMention(element) || markableVoid(element);\n  };\n\n  editor.deleteBackward = (unit) => {\n    const { selection } = editor;\n\n    if (selection && SlateRange.isCollapsed(selection)) {\n      const [mention] = SlateEditor.nodes(editor, {\n        at:\n          unit === \"character\"\n            ? SlateEditor.before(editor, selection, { unit: \"character\" })\n            : selection,\n        match: isComposerBodyMention,\n      });\n\n      deleteBackward(unit);\n\n      if (mention) {\n        SlateTransforms.insertText(editor, MENTION_CHARACTER);\n      }\n    } else {\n      deleteBackward(unit);\n    }\n  };\n\n  return editor;\n}\n"],"names":["SlateRange","getMatchRange","SlateEditor","SlateElement","SlateTransforms","getCharacterAfter","isEmptyString","getCharacterBefore"],"mappings":"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"}
+{"version":3,"file":"mentions.js","sources":["../../../src/slate/plugins/mentions.ts"],"sourcesContent":["import type { Node as SlateNode } from \"slate\";\nimport {\n  Editor as SlateEditor,\n  Element as SlateElement,\n  Range as SlateRange,\n  Transforms as SlateTransforms,\n} from \"slate\";\n\nimport type { ComposerBodyMention } from \"../../types\";\nimport { getCharacterAfter, getCharacterBefore } from \"../utils/get-character\";\nimport { getMatchRange } from \"../utils/get-match-range\";\nimport { isEmptyString } from \"../utils/is-empty-string\";\nimport { isWhitespaceCharacter } from \"../utils/is-whitespace-character\";\n\nexport const MENTION_CHARACTER = \"@\";\n\nexport type MentionDraft = {\n  range: SlateRange;\n  text: string;\n};\n\nexport function getMentionDraftAtSelection(\n  editor: SlateEditor\n): MentionDraft | undefined {\n  const { selection } = editor;\n\n  if (!selection || !SlateRange.isCollapsed(selection)) {\n    return;\n  }\n\n  // Walk backwards from the selection until \"@\" is found, unless the character\n  // before isn't whitespace (or \"@\" is the block's first character)\n  const match = getMatchRange(editor, selection, [\"@\"], {\n    include: true,\n    allowConsecutiveWhitespace: false,\n    ignoreTerminator: (_, point) => {\n      const characterBefore = getCharacterBefore(editor, point);\n\n      // Ignore \"@\" if it's preceded by a non-whitespace character\n      if (characterBefore && !isWhitespaceCharacter(characterBefore.text)) {\n        return true;\n      }\n\n      const after = SlateEditor.after(editor, point, { unit: \"character\" });\n\n      if (after) {\n        const characterAfter = getCharacterAfter(editor, after);\n\n        // Ignore \"@\" if it's followed by a whitespace character\n        if (isWhitespaceCharacter(characterAfter?.text)) {\n          return true;\n        }\n      }\n\n      return false;\n    },\n  });\n\n  if (!match) {\n    return;\n  }\n\n  const matchText = SlateEditor.string(editor, match);\n\n  // Check if the match starts with the mention character (not followed by a whitespace character)\n  if (\n    !matchText.startsWith(MENTION_CHARACTER) ||\n    isWhitespaceCharacter(matchText[1])\n  ) {\n    return;\n  }\n\n  return {\n    range: match,\n    // Exclude the mention character from the text\n    text: matchText.substring(1),\n  };\n}\n\nexport function isComposerBodyMention(\n  node: SlateNode\n): node is ComposerBodyMention {\n  return SlateElement.isElement(node) && node.type === \"mention\";\n}\n\nexport function insertMention(editor: SlateEditor, userId: string) {\n  const mention: ComposerBodyMention = {\n    type: \"mention\",\n    id: userId,\n    children: [{ text: \"\" }],\n  };\n\n  // Insert the mention\n  SlateTransforms.insertNodes(editor, mention);\n  SlateTransforms.move(editor);\n\n  const afterCharacter = editor.selection\n    ? getCharacterAfter(editor, editor.selection)\n    : undefined;\n\n  if (!afterCharacter || afterCharacter.void) {\n    // Insert a following space if needed\n    SlateTransforms.insertText(editor, \" \");\n  } else if (isEmptyString(afterCharacter.text)) {\n    // Move the selection if it's already followed by a space\n    SlateTransforms.move(editor);\n  }\n}\n\nexport function insertMentionCharacter(editor: SlateEditor) {\n  if (!editor.selection) {\n    return;\n  }\n\n  // Check if the selection is preceded or followed by a non-whitespace character\n  const beforeCharacter = getCharacterBefore(editor, editor.selection, {\n    filterVoids: true,\n  });\n  const afterCharacter = getCharacterAfter(editor, editor.selection, {\n    filterVoids: true,\n  });\n  const shouldInsertSpaceBefore =\n    beforeCharacter && !isEmptyString(beforeCharacter.text);\n  const shouldInsertSpaceAfter =\n    afterCharacter && !isEmptyString(afterCharacter.text);\n\n  if (!SlateRange.isCollapsed(editor.selection)) {\n    const text =\n      (shouldInsertSpaceBefore ? \" \" : \"\") +\n      MENTION_CHARACTER +\n      (shouldInsertSpaceAfter ? \" \" : \"\");\n\n    // If the selection is collapsed, insert the mention character at the current selection\n    editor.insertText(text);\n\n    // If a following space was inserted, move the selection back by one\n    if (shouldInsertSpaceAfter) {\n      SlateTransforms.move(editor, {\n        distance: 1,\n        unit: \"character\",\n        reverse: true,\n      });\n    }\n  } else {\n    const beforeText = (shouldInsertSpaceBefore ? \" \" : \"\") + MENTION_CHARACTER;\n\n    // If the selection is not collapsed, insert the mention character before the selection\n    editor.insertText(beforeText, { at: SlateRange.start(editor.selection) });\n\n    if (shouldInsertSpaceAfter) {\n      editor.insertText(\" \", { at: SlateRange.end(editor.selection) });\n    }\n\n    // Collapse the selection at its end\n    SlateTransforms.collapse(editor, { edge: \"end\" });\n  }\n}\n\nexport function withMentions<T extends SlateEditor>(editor: T): T {\n  const { isInline, isVoid, markableVoid, deleteBackward } = editor;\n\n  editor.isInline = (element) => {\n    return isComposerBodyMention(element) || isInline(element);\n  };\n\n  editor.isVoid = (element) => {\n    return isComposerBodyMention(element) || isVoid(element);\n  };\n\n  editor.markableVoid = (element) => {\n    return isComposerBodyMention(element) || markableVoid(element);\n  };\n\n  editor.deleteBackward = (unit) => {\n    const { selection } = editor;\n\n    if (selection && SlateRange.isCollapsed(selection)) {\n      const [mention] = SlateEditor.nodes(editor, {\n        at:\n          unit === \"character\"\n            ? SlateEditor.before(editor, selection, { unit: \"character\" })\n            : selection,\n        match: isComposerBodyMention,\n      });\n\n      deleteBackward(unit);\n\n      if (mention) {\n        SlateTransforms.insertText(editor, MENTION_CHARACTER);\n      }\n    } else {\n      deleteBackward(unit);\n    }\n  };\n\n  return editor;\n}\n"],"names":["SlateRange","getMatchRange","getCharacterBefore","isWhitespaceCharacter","SlateEditor","getCharacterAfter","SlateElement","SlateTransforms","isEmptyString"],"mappings":"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"}

package/dist/slate/plugins/mentions.mjs

@@ -1,7 +1,8 @@
 import { Range, Editor, Element, Transforms } from 'slate';
-import { getCharacterAfter, getCharacterBefore } from '../utils/get-character.mjs';
+import { getCharacterBefore, getCharacterAfter } from '../utils/get-character.mjs';
 import { getMatchRange } from '../utils/get-match-range.mjs';
 import { isEmptyString } from '../utils/is-empty-string.mjs';
+import { isWhitespaceCharacter } from '../utils/is-whitespace-character.mjs';
 
 const MENTION_CHARACTER = "@";
 function getMentionDraftAtSelection(editor) {
@@ -9,12 +10,29 @@ function getMentionDraftAtSelection(editor) {
   if (!selection || !Range.isCollapsed(selection)) {
     return;
   }
-  const match = getMatchRange(editor, selection);
+  const match = getMatchRange(editor, selection, ["@"], {
+    include: true,
+    allowConsecutiveWhitespace: false,
+    ignoreTerminator: (_, point) => {
+      const characterBefore = getCharacterBefore(editor, point);
+      if (characterBefore && !isWhitespaceCharacter(characterBefore.text)) {
+        return true;
+      }
+      const after = Editor.after(editor, point, { unit: "character" });
+      if (after) {
+        const characterAfter = getCharacterAfter(editor, after);
+        if (isWhitespaceCharacter(characterAfter?.text)) {
+          return true;
+        }
+      }
+      return false;
+    }
+  });
   if (!match) {
     return;
   }
   const matchText = Editor.string(editor, match);
-  if (!matchText.startsWith(MENTION_CHARACTER)) {
+  if (!matchText.startsWith(MENTION_CHARACTER) || isWhitespaceCharacter(matchText[1])) {
     return;
   }
   return {

package/dist/slate/plugins/mentions.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"mentions.mjs","sources":["../../../src/slate/plugins/mentions.ts"],"sourcesContent":["import type { Node as SlateNode } from \"slate\";\nimport {\n  Editor as SlateEditor,\n  Element as SlateElement,\n  Range as SlateRange,\n  Transforms as SlateTransforms,\n} from \"slate\";\n\nimport type { ComposerBodyMention } from \"../../types\";\nimport { getCharacterAfter, getCharacterBefore } from \"../utils/get-character\";\nimport { getMatchRange } from \"../utils/get-match-range\";\nimport { isEmptyString } from \"../utils/is-empty-string\";\n\nexport const MENTION_CHARACTER = \"@\";\n\nexport type MentionDraft = {\n  range: SlateRange;\n  text: string;\n};\n\nexport function getMentionDraftAtSelection(\n  editor: SlateEditor\n): MentionDraft | undefined {\n  const { selection } = editor;\n\n  if (!selection || !SlateRange.isCollapsed(selection)) {\n    return;\n  }\n\n  // Match the word at the current selection by walking back\n  // until a whitespace character is found\n  const match = getMatchRange(editor, selection);\n\n  if (!match) {\n    return;\n  }\n\n  const matchText = SlateEditor.string(editor, match);\n\n  // Check if the match starts with the mention character\n  if (!matchText.startsWith(MENTION_CHARACTER)) {\n    return;\n  }\n\n  return {\n    range: match,\n    // Exclude the mention character from the text\n    text: matchText.substring(1),\n  };\n}\n\nexport function isComposerBodyMention(\n  node: SlateNode\n): node is ComposerBodyMention {\n  return SlateElement.isElement(node) && node.type === \"mention\";\n}\n\nexport function insertMention(editor: SlateEditor, userId: string) {\n  const mention: ComposerBodyMention = {\n    type: \"mention\",\n    id: userId,\n    children: [{ text: \"\" }],\n  };\n\n  // Insert the mention\n  SlateTransforms.insertNodes(editor, mention);\n  SlateTransforms.move(editor);\n\n  const afterCharacter = editor.selection\n    ? getCharacterAfter(editor, editor.selection)\n    : undefined;\n\n  if (!afterCharacter || afterCharacter.void) {\n    // Insert a following space if needed\n    SlateTransforms.insertText(editor, \" \");\n  } else if (isEmptyString(afterCharacter.text)) {\n    // Move the selection if it's already followed by a space\n    SlateTransforms.move(editor);\n  }\n}\n\nexport function insertMentionCharacter(editor: SlateEditor) {\n  if (!editor.selection) {\n    return;\n  }\n\n  // Check if the selection is preceded or followed by a non-whitespace character\n  const beforeCharacter = getCharacterBefore(editor, editor.selection, {\n    filterVoids: true,\n  });\n  const afterCharacter = getCharacterAfter(editor, editor.selection, {\n    filterVoids: true,\n  });\n  const shouldInsertSpaceBefore =\n    beforeCharacter && !isEmptyString(beforeCharacter.text);\n  const shouldInsertSpaceAfter =\n    afterCharacter && !isEmptyString(afterCharacter.text);\n\n  if (!SlateRange.isCollapsed(editor.selection)) {\n    const text =\n      (shouldInsertSpaceBefore ? \" \" : \"\") +\n      MENTION_CHARACTER +\n      (shouldInsertSpaceAfter ? \" \" : \"\");\n\n    // If the selection is collapsed, insert the mention character at the current selection\n    editor.insertText(text);\n\n    // If a following space was inserted, move the selection back by one\n    if (shouldInsertSpaceAfter) {\n      SlateTransforms.move(editor, {\n        distance: 1,\n        unit: \"character\",\n        reverse: true,\n      });\n    }\n  } else {\n    const beforeText = (shouldInsertSpaceBefore ? \" \" : \"\") + MENTION_CHARACTER;\n\n    // If the selection is not collapsed, insert the mention character before the selection\n    editor.insertText(beforeText, { at: SlateRange.start(editor.selection) });\n\n    if (shouldInsertSpaceAfter) {\n      editor.insertText(\" \", { at: SlateRange.end(editor.selection) });\n    }\n\n    // Collapse the selection at its end\n    SlateTransforms.collapse(editor, { edge: \"end\" });\n  }\n}\n\nexport function withMentions<T extends SlateEditor>(editor: T): T {\n  const { isInline, isVoid, markableVoid, deleteBackward } = editor;\n\n  editor.isInline = (element) => {\n    return isComposerBodyMention(element) || isInline(element);\n  };\n\n  editor.isVoid = (element) => {\n    return isComposerBodyMention(element) || isVoid(element);\n  };\n\n  editor.markableVoid = (element) => {\n    return isComposerBodyMention(element) || markableVoid(element);\n  };\n\n  editor.deleteBackward = (unit) => {\n    const { selection } = editor;\n\n    if (selection && SlateRange.isCollapsed(selection)) {\n      const [mention] = SlateEditor.nodes(editor, {\n        at:\n          unit === \"character\"\n            ? SlateEditor.before(editor, selection, { unit: \"character\" })\n            : selection,\n        match: isComposerBodyMention,\n      });\n\n      deleteBackward(unit);\n\n      if (mention) {\n        SlateTransforms.insertText(editor, MENTION_CHARACTER);\n      }\n    } else {\n      deleteBackward(unit);\n    }\n  };\n\n  return editor;\n}\n"],"names":["SlateRange","SlateEditor","SlateElement","SlateTransforms"],"mappings":"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"}
+{"version":3,"file":"mentions.mjs","sources":["../../../src/slate/plugins/mentions.ts"],"sourcesContent":["import type { Node as SlateNode } from \"slate\";\nimport {\n  Editor as SlateEditor,\n  Element as SlateElement,\n  Range as SlateRange,\n  Transforms as SlateTransforms,\n} from \"slate\";\n\nimport type { ComposerBodyMention } from \"../../types\";\nimport { getCharacterAfter, getCharacterBefore } from \"../utils/get-character\";\nimport { getMatchRange } from \"../utils/get-match-range\";\nimport { isEmptyString } from \"../utils/is-empty-string\";\nimport { isWhitespaceCharacter } from \"../utils/is-whitespace-character\";\n\nexport const MENTION_CHARACTER = \"@\";\n\nexport type MentionDraft = {\n  range: SlateRange;\n  text: string;\n};\n\nexport function getMentionDraftAtSelection(\n  editor: SlateEditor\n): MentionDraft | undefined {\n  const { selection } = editor;\n\n  if (!selection || !SlateRange.isCollapsed(selection)) {\n    return;\n  }\n\n  // Walk backwards from the selection until \"@\" is found, unless the character\n  // before isn't whitespace (or \"@\" is the block's first character)\n  const match = getMatchRange(editor, selection, [\"@\"], {\n    include: true,\n    allowConsecutiveWhitespace: false,\n    ignoreTerminator: (_, point) => {\n      const characterBefore = getCharacterBefore(editor, point);\n\n      // Ignore \"@\" if it's preceded by a non-whitespace character\n      if (characterBefore && !isWhitespaceCharacter(characterBefore.text)) {\n        return true;\n      }\n\n      const after = SlateEditor.after(editor, point, { unit: \"character\" });\n\n      if (after) {\n        const characterAfter = getCharacterAfter(editor, after);\n\n        // Ignore \"@\" if it's followed by a whitespace character\n        if (isWhitespaceCharacter(characterAfter?.text)) {\n          return true;\n        }\n      }\n\n      return false;\n    },\n  });\n\n  if (!match) {\n    return;\n  }\n\n  const matchText = SlateEditor.string(editor, match);\n\n  // Check if the match starts with the mention character (not followed by a whitespace character)\n  if (\n    !matchText.startsWith(MENTION_CHARACTER) ||\n    isWhitespaceCharacter(matchText[1])\n  ) {\n    return;\n  }\n\n  return {\n    range: match,\n    // Exclude the mention character from the text\n    text: matchText.substring(1),\n  };\n}\n\nexport function isComposerBodyMention(\n  node: SlateNode\n): node is ComposerBodyMention {\n  return SlateElement.isElement(node) && node.type === \"mention\";\n}\n\nexport function insertMention(editor: SlateEditor, userId: string) {\n  const mention: ComposerBodyMention = {\n    type: \"mention\",\n    id: userId,\n    children: [{ text: \"\" }],\n  };\n\n  // Insert the mention\n  SlateTransforms.insertNodes(editor, mention);\n  SlateTransforms.move(editor);\n\n  const afterCharacter = editor.selection\n    ? getCharacterAfter(editor, editor.selection)\n    : undefined;\n\n  if (!afterCharacter || afterCharacter.void) {\n    // Insert a following space if needed\n    SlateTransforms.insertText(editor, \" \");\n  } else if (isEmptyString(afterCharacter.text)) {\n    // Move the selection if it's already followed by a space\n    SlateTransforms.move(editor);\n  }\n}\n\nexport function insertMentionCharacter(editor: SlateEditor) {\n  if (!editor.selection) {\n    return;\n  }\n\n  // Check if the selection is preceded or followed by a non-whitespace character\n  const beforeCharacter = getCharacterBefore(editor, editor.selection, {\n    filterVoids: true,\n  });\n  const afterCharacter = getCharacterAfter(editor, editor.selection, {\n    filterVoids: true,\n  });\n  const shouldInsertSpaceBefore =\n    beforeCharacter && !isEmptyString(beforeCharacter.text);\n  const shouldInsertSpaceAfter =\n    afterCharacter && !isEmptyString(afterCharacter.text);\n\n  if (!SlateRange.isCollapsed(editor.selection)) {\n    const text =\n      (shouldInsertSpaceBefore ? \" \" : \"\") +\n      MENTION_CHARACTER +\n      (shouldInsertSpaceAfter ? \" \" : \"\");\n\n    // If the selection is collapsed, insert the mention character at the current selection\n    editor.insertText(text);\n\n    // If a following space was inserted, move the selection back by one\n    if (shouldInsertSpaceAfter) {\n      SlateTransforms.move(editor, {\n        distance: 1,\n        unit: \"character\",\n        reverse: true,\n      });\n    }\n  } else {\n    const beforeText = (shouldInsertSpaceBefore ? \" \" : \"\") + MENTION_CHARACTER;\n\n    // If the selection is not collapsed, insert the mention character before the selection\n    editor.insertText(beforeText, { at: SlateRange.start(editor.selection) });\n\n    if (shouldInsertSpaceAfter) {\n      editor.insertText(\" \", { at: SlateRange.end(editor.selection) });\n    }\n\n    // Collapse the selection at its end\n    SlateTransforms.collapse(editor, { edge: \"end\" });\n  }\n}\n\nexport function withMentions<T extends SlateEditor>(editor: T): T {\n  const { isInline, isVoid, markableVoid, deleteBackward } = editor;\n\n  editor.isInline = (element) => {\n    return isComposerBodyMention(element) || isInline(element);\n  };\n\n  editor.isVoid = (element) => {\n    return isComposerBodyMention(element) || isVoid(element);\n  };\n\n  editor.markableVoid = (element) => {\n    return isComposerBodyMention(element) || markableVoid(element);\n  };\n\n  editor.deleteBackward = (unit) => {\n    const { selection } = editor;\n\n    if (selection && SlateRange.isCollapsed(selection)) {\n      const [mention] = SlateEditor.nodes(editor, {\n        at:\n          unit === \"character\"\n            ? SlateEditor.before(editor, selection, { unit: \"character\" })\n            : selection,\n        match: isComposerBodyMention,\n      });\n\n      deleteBackward(unit);\n\n      if (mention) {\n        SlateTransforms.insertText(editor, MENTION_CHARACTER);\n      }\n    } else {\n      deleteBackward(unit);\n    }\n  };\n\n  return editor;\n}\n"],"names":["SlateRange","SlateEditor","SlateElement","SlateTransforms"],"mappings":"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"}

package/dist/slate/utils/get-match-range.js

@@ -1,25 +1,36 @@
 'use strict';
 
 var slate = require('slate');
+var isWhitespaceCharacter = require('./is-whitespace-character.js');
 
 const defaultOptions = {
-  direction: "before"
+  direction: "before",
+  allowConsecutiveWhitespace: true
 };
 function getMatchRange(editor, at, terminators = [" "], options = defaultOptions) {
-  const { include, direction } = { ...defaultOptions, ...options };
+  const { include, direction, ignoreTerminator, allowConsecutiveWhitespace } = {
+    ...defaultOptions,
+    ...options
+  };
   let [start, end] = slate.Range.edges(at);
   let point = start;
+  let previousCharacterWasWhitespace = false;
   function move(direction2) {
-    const next = direction2 === "after" ? slate.Editor.after(editor, point, {
-      unit: "character"
-    }) : slate.Editor.before(editor, point, { unit: "character" });
-    const nextWord = next && slate.Editor.string(
+    const nextPoint = direction2 === "after" ? slate.Editor.after(editor, point, { unit: "character" }) : slate.Editor.before(editor, point, { unit: "character" });
+    if (!nextPoint || slate.Path.compare(nextPoint.path, point.path) !== 0) {
+      return false;
+    }
+    const nextCharacter = nextPoint && slate.Editor.string(
       editor,
-      direction2 === "after" ? { anchor: point, focus: next } : { anchor: next, focus: point }
+      direction2 === "after" ? { anchor: point, focus: nextPoint } : { anchor: nextPoint, focus: point }
     );
-    const lastWord = nextWord && nextWord[direction2 === "after" ? 0 : nextWord.length - 1];
-    if (next && lastWord && !terminators.includes(lastWord)) {
-      point = next;
+    const lastCharacter = nextCharacter && nextCharacter[direction2 === "after" ? 0 : nextCharacter.length - 1];
+    if (!allowConsecutiveWhitespace && previousCharacterWasWhitespace && isWhitespaceCharacter.isWhitespaceCharacter(lastCharacter)) {
+      return false;
+    }
+    if (nextPoint && lastCharacter && (!terminators.includes(lastCharacter) || ignoreTerminator?.(lastCharacter, nextPoint, direction2))) {
+      previousCharacterWasWhitespace = isWhitespaceCharacter.isWhitespaceCharacter(lastCharacter);
+      point = nextPoint;
       if (point.offset === 0) {
         return false;
       }

package/dist/slate/utils/get-match-range.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-match-range.js","sources":["../../../src/slate/utils/get-match-range.ts"],"sourcesContent":["import type { Point as SlatePoint } from \"slate\";\nimport { Editor as SlateEditor, Range as SlateRange } from \"slate\";\n\ninterface Options {\n  include?: boolean;\n  direction?: \"before\" | \"after\" | \"both\";\n}\n\nconst defaultOptions: Options = {\n  direction: \"before\",\n};\n\nexport function getMatchRange(\n  editor: SlateEditor,\n  at: SlateRange,\n  terminators: string[] = [\" \"],\n  options: Options = defaultOptions\n): SlateRange | undefined {\n  const { include, direction } = { ...defaultOptions, ...options };\n  let [start, end] = SlateRange.edges(at);\n  let point: SlatePoint = start;\n\n  function move(direction: \"before\" | \"after\"): boolean {\n    const next =\n      direction === \"after\"\n        ? SlateEditor.after(editor, point, {\n            unit: \"character\",\n          })\n        : SlateEditor.before(editor, point, { unit: \"character\" });\n    const nextWord =\n      next &&\n      SlateEditor.string(\n        editor,\n        direction === \"after\"\n          ? { anchor: point, focus: next }\n          : { anchor: next, focus: point }\n      );\n    const lastWord =\n      nextWord && nextWord[direction === \"after\" ? 0 : nextWord.length - 1];\n\n    if (next && lastWord && !terminators.includes(lastWord)) {\n      point = next;\n\n      if (point.offset === 0) {\n        return false;\n      }\n    } else {\n      return false;\n    }\n\n    return true;\n  }\n\n  if (direction !== \"before\") {\n    point = end;\n\n    while (move(\"after\"));\n\n    end = point;\n  }\n\n  if (direction !== \"after\") {\n    point = start;\n\n    while (move(\"before\"));\n\n    start = point;\n  }\n\n  if (include) {\n    return {\n      anchor: SlateEditor.before(editor, start, { unit: \"offset\" }) ?? start,\n      focus: SlateEditor.after(editor, end, { unit: \"offset\" }) ?? end,\n    };\n  }\n\n  return { anchor: start, focus: end };\n}\n"],"names":["SlateRange","direction","SlateEditor"],"mappings":";;;;AAQA,MAAM,cAA0B,GAAA;AAAA,EAC9B,SAAW,EAAA,QAAA;AACb,CAAA,CAAA;AAEgB,SAAA,aAAA,CACd,QACA,EACA,EAAA,WAAA,GAAwB,CAAC,GAAG,CAAA,EAC5B,UAAmB,cACK,EAAA;AACxB,EAAM,MAAA,EAAE,SAAS,SAAU,EAAA,GAAI,EAAE,GAAG,cAAA,EAAgB,GAAG,OAAQ,EAAA,CAAA;AAC/D,EAAA,IAAI,CAAC,KAAO,EAAA,GAAG,CAAI,GAAAA,WAAA,CAAW,MAAM,EAAE,CAAA,CAAA;AACtC,EAAA,IAAI,KAAoB,GAAA,KAAA,CAAA;AAExB,EAAA,SAAS,KAAKC,UAAwC,EAAA;AACpD,IAAA,MAAM,OACJA,UAAc,KAAA,OAAA,GACVC,YAAY,CAAA,KAAA,CAAM,QAAQ,KAAO,EAAA;AAAA,MAC/B,IAAM,EAAA,WAAA;AAAA,KACP,IACDA,YAAY,CAAA,MAAA,CAAO,QAAQ,KAAO,EAAA,EAAE,IAAM,EAAA,WAAA,EAAa,CAAA,CAAA;AAC7D,IAAM,MAAA,QAAA,GACJ,QACAA,YAAY,CAAA,MAAA;AAAA,MACV,MAAA;AAAA,MACAD,UAAc,KAAA,OAAA,GACV,EAAE,MAAA,EAAQ,KAAO,EAAA,KAAA,EAAO,IAAK,EAAA,GAC7B,EAAE,MAAA,EAAQ,IAAM,EAAA,KAAA,EAAO,KAAM,EAAA;AAAA,KACnC,CAAA;AACF,IAAA,MAAM,WACJ,QAAY,IAAA,QAAA,CAASA,eAAc,OAAU,GAAA,CAAA,GAAI,SAAS,MAAS,GAAA,CAAA,CAAA,CAAA;AAErE,IAAA,IAAI,QAAQ,QAAY,IAAA,CAAC,WAAY,CAAA,QAAA,CAAS,QAAQ,CAAG,EAAA;AACvD,MAAQ,KAAA,GAAA,IAAA,CAAA;AAER,MAAI,IAAA,KAAA,CAAM,WAAW,CAAG,EAAA;AACtB,QAAO,OAAA,KAAA,CAAA;AAAA,OACT;AAAA,KACK,MAAA;AACL,MAAO,OAAA,KAAA,CAAA;AAAA,KACT;AAEA,IAAO,OAAA,IAAA,CAAA;AAAA,GACT;AAEA,EAAA,IAAI,cAAc,QAAU,EAAA;AAC1B,IAAQ,KAAA,GAAA,GAAA,CAAA;AAER,IAAA,OAAO,KAAK,OAAO,CAAA;AAAE,MAAA,CAAA;AAErB,IAAM,GAAA,GAAA,KAAA,CAAA;AAAA,GACR;AAEA,EAAA,IAAI,cAAc,OAAS,EAAA;AACzB,IAAQ,KAAA,GAAA,KAAA,CAAA;AAER,IAAA,OAAO,KAAK,QAAQ,CAAA;AAAE,MAAA,CAAA;AAEtB,IAAQ,KAAA,GAAA,KAAA,CAAA;AAAA,GACV;AAEA,EAAA,IAAI,OAAS,EAAA;AACX,IAAO,OAAA;AAAA,MACL,MAAA,EAAQC,aAAY,MAAO,CAAA,MAAA,EAAQ,OAAO,EAAE,IAAA,EAAM,QAAS,EAAC,CAAK,IAAA,KAAA;AAAA,MACjE,KAAA,EAAOA,aAAY,KAAM,CAAA,MAAA,EAAQ,KAAK,EAAE,IAAA,EAAM,QAAS,EAAC,CAAK,IAAA,GAAA;AAAA,KAC/D,CAAA;AAAA,GACF;AAEA,EAAA,OAAO,EAAE,MAAA,EAAQ,KAAO,EAAA,KAAA,EAAO,GAAI,EAAA,CAAA;AACrC;;;;"}
+{"version":3,"file":"get-match-range.js","sources":["../../../src/slate/utils/get-match-range.ts"],"sourcesContent":["import type { Point as SlatePoint } from \"slate\";\nimport {\n  Editor as SlateEditor,\n  Path as SlatePath,\n  Range as SlateRange,\n} from \"slate\";\n\nimport { isWhitespaceCharacter } from \"./is-whitespace-character\";\n\ninterface Options {\n  include?: boolean;\n  direction?: \"before\" | \"after\" | \"both\";\n  allowConsecutiveWhitespace?: boolean;\n  ignoreTerminator?: (\n    character: string,\n    point: SlatePoint,\n    direction: \"before\" | \"after\"\n  ) => boolean;\n}\n\nconst defaultOptions: Options = {\n  direction: \"before\",\n  allowConsecutiveWhitespace: true,\n};\n\nexport function getMatchRange(\n  editor: SlateEditor,\n  at: SlateRange,\n  terminators: string[] = [\" \"],\n  options: Options = defaultOptions\n): SlateRange | undefined {\n  const { include, direction, ignoreTerminator, allowConsecutiveWhitespace } = {\n    ...defaultOptions,\n    ...options,\n  };\n\n  let [start, end] = SlateRange.edges(at);\n  let point: SlatePoint = start;\n  let previousCharacterWasWhitespace = false;\n\n  function move(direction: \"before\" | \"after\"): boolean {\n    const nextPoint =\n      direction === \"after\"\n        ? SlateEditor.after(editor, point, { unit: \"character\" })\n        : SlateEditor.before(editor, point, { unit: \"character\" });\n\n    // Stop if we reached the end of a block\n    if (!nextPoint || SlatePath.compare(nextPoint.path, point.path) !== 0) {\n      return false;\n    }\n\n    const nextCharacter =\n      nextPoint &&\n      SlateEditor.string(\n        editor,\n        direction === \"after\"\n          ? { anchor: point, focus: nextPoint }\n          : { anchor: nextPoint, focus: point }\n      );\n    const lastCharacter =\n      nextCharacter &&\n      nextCharacter[direction === \"after\" ? 0 : nextCharacter.length - 1];\n\n    if (\n      !allowConsecutiveWhitespace &&\n      previousCharacterWasWhitespace &&\n      isWhitespaceCharacter(lastCharacter)\n    ) {\n      return false;\n    }\n\n    if (\n      nextPoint &&\n      lastCharacter &&\n      (!terminators.includes(lastCharacter) ||\n        ignoreTerminator?.(lastCharacter, nextPoint, direction))\n    ) {\n      previousCharacterWasWhitespace = isWhitespaceCharacter(lastCharacter);\n      point = nextPoint;\n\n      if (point.offset === 0) {\n        return false;\n      }\n    } else {\n      return false;\n    }\n\n    return true;\n  }\n\n  if (direction !== \"before\") {\n    point = end;\n    while (move(\"after\"));\n    end = point;\n  }\n\n  if (direction !== \"after\") {\n    point = start;\n    while (move(\"before\"));\n    start = point;\n  }\n\n  if (include) {\n    return {\n      anchor: SlateEditor.before(editor, start, { unit: \"offset\" }) ?? start,\n      focus: SlateEditor.after(editor, end, { unit: \"offset\" }) ?? end,\n    };\n  }\n\n  return { anchor: start, focus: end };\n}\n"],"names":["SlateRange","direction","SlateEditor","SlatePath","isWhitespaceCharacter"],"mappings":";;;;;AAoBA,MAAM,cAA0B,GAAA;AAAA,EAC9B,SAAW,EAAA,QAAA;AAAA,EACX,0BAA4B,EAAA,IAAA;AAC9B,CAAA,CAAA;AAEgB,SAAA,aAAA,CACd,QACA,EACA,EAAA,WAAA,GAAwB,CAAC,GAAG,CAAA,EAC5B,UAAmB,cACK,EAAA;AACxB,EAAA,MAAM,EAAE,OAAA,EAAS,SAAW,EAAA,gBAAA,EAAkB,4BAA+B,GAAA;AAAA,IAC3E,GAAG,cAAA;AAAA,IACH,GAAG,OAAA;AAAA,GACL,CAAA;AAEA,EAAA,IAAI,CAAC,KAAO,EAAA,GAAG,CAAI,GAAAA,WAAA,CAAW,MAAM,EAAE,CAAA,CAAA;AACtC,EAAA,IAAI,KAAoB,GAAA,KAAA,CAAA;AACxB,EAAA,IAAI,8BAAiC,GAAA,KAAA,CAAA;AAErC,EAAA,SAAS,KAAKC,UAAwC,EAAA;AACpD,IAAA,MAAM,YACJA,UAAc,KAAA,OAAA,GACVC,aAAY,KAAM,CAAA,MAAA,EAAQ,OAAO,EAAE,IAAA,EAAM,aAAa,CAAA,GACtDA,aAAY,MAAO,CAAA,MAAA,EAAQ,OAAO,EAAE,IAAA,EAAM,aAAa,CAAA,CAAA;AAG7D,IAAI,IAAA,CAAC,aAAaC,UAAU,CAAA,OAAA,CAAQ,UAAU,IAAM,EAAA,KAAA,CAAM,IAAI,CAAA,KAAM,CAAG,EAAA;AACrE,MAAO,OAAA,KAAA,CAAA;AAAA,KACT;AAEA,IAAM,MAAA,aAAA,GACJ,aACAD,YAAY,CAAA,MAAA;AAAA,MACV,MAAA;AAAA,MACAD,UAAc,KAAA,OAAA,GACV,EAAE,MAAA,EAAQ,KAAO,EAAA,KAAA,EAAO,SAAU,EAAA,GAClC,EAAE,MAAA,EAAQ,SAAW,EAAA,KAAA,EAAO,KAAM,EAAA;AAAA,KACxC,CAAA;AACF,IAAA,MAAM,gBACJ,aACA,IAAA,aAAA,CAAcA,eAAc,OAAU,GAAA,CAAA,GAAI,cAAc,MAAS,GAAA,CAAA,CAAA,CAAA;AAEnE,IAAA,IACE,CAAC,0BAAA,IACD,8BACA,IAAAG,2CAAA,CAAsB,aAAa,CACnC,EAAA;AACA,MAAO,OAAA,KAAA,CAAA;AAAA,KACT;AAEA,IACE,IAAA,SAAA,IACA,aACC,KAAA,CAAC,WAAY,CAAA,QAAA,CAAS,aAAa,CAAA,IAClC,gBAAmB,GAAA,aAAA,EAAe,SAAWH,EAAAA,UAAS,CACxD,CAAA,EAAA;AACA,MAAA,8BAAA,GAAiCG,4CAAsB,aAAa,CAAA,CAAA;AACpE,MAAQ,KAAA,GAAA,SAAA,CAAA;AAER,MAAI,IAAA,KAAA,CAAM,WAAW,CAAG,EAAA;AACtB,QAAO,OAAA,KAAA,CAAA;AAAA,OACT;AAAA,KACK,MAAA;AACL,MAAO,OAAA,KAAA,CAAA;AAAA,KACT;AAEA,IAAO,OAAA,IAAA,CAAA;AAAA,GACT;AAEA,EAAA,IAAI,cAAc,QAAU,EAAA;AAC1B,IAAQ,KAAA,GAAA,GAAA,CAAA;AACR,IAAA,OAAO,KAAK,OAAO,CAAA;AAAE,MAAA,CAAA;AACrB,IAAM,GAAA,GAAA,KAAA,CAAA;AAAA,GACR;AAEA,EAAA,IAAI,cAAc,OAAS,EAAA;AACzB,IAAQ,KAAA,GAAA,KAAA,CAAA;AACR,IAAA,OAAO,KAAK,QAAQ,CAAA;AAAE,MAAA,CAAA;AACtB,IAAQ,KAAA,GAAA,KAAA,CAAA;AAAA,GACV;AAEA,EAAA,IAAI,OAAS,EAAA;AACX,IAAO,OAAA;AAAA,MACL,MAAA,EAAQF,aAAY,MAAO,CAAA,MAAA,EAAQ,OAAO,EAAE,IAAA,EAAM,QAAS,EAAC,CAAK,IAAA,KAAA;AAAA,MACjE,KAAA,EAAOA,aAAY,KAAM,CAAA,MAAA,EAAQ,KAAK,EAAE,IAAA,EAAM,QAAS,EAAC,CAAK,IAAA,GAAA;AAAA,KAC/D,CAAA;AAAA,GACF;AAEA,EAAA,OAAO,EAAE,MAAA,EAAQ,KAAO,EAAA,KAAA,EAAO,GAAI,EAAA,CAAA;AACrC;;;;"}

package/dist/slate/utils/get-match-range.mjs

@@ -1,23 +1,34 @@
-import { Range, Editor } from 'slate';
+import { Range, Editor, Path } from 'slate';
+import { isWhitespaceCharacter } from './is-whitespace-character.mjs';
 
 const defaultOptions = {
-  direction: "before"
+  direction: "before",
+  allowConsecutiveWhitespace: true
 };
 function getMatchRange(editor, at, terminators = [" "], options = defaultOptions) {
-  const { include, direction } = { ...defaultOptions, ...options };
+  const { include, direction, ignoreTerminator, allowConsecutiveWhitespace } = {
+    ...defaultOptions,
+    ...options
+  };
   let [start, end] = Range.edges(at);
   let point = start;
+  let previousCharacterWasWhitespace = false;
   function move(direction2) {
-    const next = direction2 === "after" ? Editor.after(editor, point, {
-      unit: "character"
-    }) : Editor.before(editor, point, { unit: "character" });
-    const nextWord = next && Editor.string(
+    const nextPoint = direction2 === "after" ? Editor.after(editor, point, { unit: "character" }) : Editor.before(editor, point, { unit: "character" });
+    if (!nextPoint || Path.compare(nextPoint.path, point.path) !== 0) {
+      return false;
+    }
+    const nextCharacter = nextPoint && Editor.string(
       editor,
-      direction2 === "after" ? { anchor: point, focus: next } : { anchor: next, focus: point }
+      direction2 === "after" ? { anchor: point, focus: nextPoint } : { anchor: nextPoint, focus: point }
     );
-    const lastWord = nextWord && nextWord[direction2 === "after" ? 0 : nextWord.length - 1];
-    if (next && lastWord && !terminators.includes(lastWord)) {
-      point = next;
+    const lastCharacter = nextCharacter && nextCharacter[direction2 === "after" ? 0 : nextCharacter.length - 1];
+    if (!allowConsecutiveWhitespace && previousCharacterWasWhitespace && isWhitespaceCharacter(lastCharacter)) {
+      return false;
+    }
+    if (nextPoint && lastCharacter && (!terminators.includes(lastCharacter) || ignoreTerminator?.(lastCharacter, nextPoint, direction2))) {
+      previousCharacterWasWhitespace = isWhitespaceCharacter(lastCharacter);
+      point = nextPoint;
       if (point.offset === 0) {
         return false;
       }

package/dist/slate/utils/get-match-range.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"get-match-range.mjs","sources":["../../../src/slate/utils/get-match-range.ts"],"sourcesContent":["import type { Point as SlatePoint } from \"slate\";\nimport { Editor as SlateEditor, Range as SlateRange } from \"slate\";\n\ninterface Options {\n  include?: boolean;\n  direction?: \"before\" | \"after\" | \"both\";\n}\n\nconst defaultOptions: Options = {\n  direction: \"before\",\n};\n\nexport function getMatchRange(\n  editor: SlateEditor,\n  at: SlateRange,\n  terminators: string[] = [\" \"],\n  options: Options = defaultOptions\n): SlateRange | undefined {\n  const { include, direction } = { ...defaultOptions, ...options };\n  let [start, end] = SlateRange.edges(at);\n  let point: SlatePoint = start;\n\n  function move(direction: \"before\" | \"after\"): boolean {\n    const next =\n      direction === \"after\"\n        ? SlateEditor.after(editor, point, {\n            unit: \"character\",\n          })\n        : SlateEditor.before(editor, point, { unit: \"character\" });\n    const nextWord =\n      next &&\n      SlateEditor.string(\n        editor,\n        direction === \"after\"\n          ? { anchor: point, focus: next }\n          : { anchor: next, focus: point }\n      );\n    const lastWord =\n      nextWord && nextWord[direction === \"after\" ? 0 : nextWord.length - 1];\n\n    if (next && lastWord && !terminators.includes(lastWord)) {\n      point = next;\n\n      if (point.offset === 0) {\n        return false;\n      }\n    } else {\n      return false;\n    }\n\n    return true;\n  }\n\n  if (direction !== \"before\") {\n    point = end;\n\n    while (move(\"after\"));\n\n    end = point;\n  }\n\n  if (direction !== \"after\") {\n    point = start;\n\n    while (move(\"before\"));\n\n    start = point;\n  }\n\n  if (include) {\n    return {\n      anchor: SlateEditor.before(editor, start, { unit: \"offset\" }) ?? start,\n      focus: SlateEditor.after(editor, end, { unit: \"offset\" }) ?? end,\n    };\n  }\n\n  return { anchor: start, focus: end };\n}\n"],"names":["SlateRange","direction","SlateEditor"],"mappings":";;AAQA,MAAM,cAA0B,GAAA;AAAA,EAC9B,SAAW,EAAA,QAAA;AACb,CAAA,CAAA;AAEgB,SAAA,aAAA,CACd,QACA,EACA,EAAA,WAAA,GAAwB,CAAC,GAAG,CAAA,EAC5B,UAAmB,cACK,EAAA;AACxB,EAAM,MAAA,EAAE,SAAS,SAAU,EAAA,GAAI,EAAE,GAAG,cAAA,EAAgB,GAAG,OAAQ,EAAA,CAAA;AAC/D,EAAA,IAAI,CAAC,KAAO,EAAA,GAAG,CAAI,GAAAA,KAAA,CAAW,MAAM,EAAE,CAAA,CAAA;AACtC,EAAA,IAAI,KAAoB,GAAA,KAAA,CAAA;AAExB,EAAA,SAAS,KAAKC,UAAwC,EAAA;AACpD,IAAA,MAAM,OACJA,UAAc,KAAA,OAAA,GACVC,MAAY,CAAA,KAAA,CAAM,QAAQ,KAAO,EAAA;AAAA,MAC/B,IAAM,EAAA,WAAA;AAAA,KACP,IACDA,MAAY,CAAA,MAAA,CAAO,QAAQ,KAAO,EAAA,EAAE,IAAM,EAAA,WAAA,EAAa,CAAA,CAAA;AAC7D,IAAM,MAAA,QAAA,GACJ,QACAA,MAAY,CAAA,MAAA;AAAA,MACV,MAAA;AAAA,MACAD,UAAc,KAAA,OAAA,GACV,EAAE,MAAA,EAAQ,KAAO,EAAA,KAAA,EAAO,IAAK,EAAA,GAC7B,EAAE,MAAA,EAAQ,IAAM,EAAA,KAAA,EAAO,KAAM,EAAA;AAAA,KACnC,CAAA;AACF,IAAA,MAAM,WACJ,QAAY,IAAA,QAAA,CAASA,eAAc,OAAU,GAAA,CAAA,GAAI,SAAS,MAAS,GAAA,CAAA,CAAA,CAAA;AAErE,IAAA,IAAI,QAAQ,QAAY,IAAA,CAAC,WAAY,CAAA,QAAA,CAAS,QAAQ,CAAG,EAAA;AACvD,MAAQ,KAAA,GAAA,IAAA,CAAA;AAER,MAAI,IAAA,KAAA,CAAM,WAAW,CAAG,EAAA;AACtB,QAAO,OAAA,KAAA,CAAA;AAAA,OACT;AAAA,KACK,MAAA;AACL,MAAO,OAAA,KAAA,CAAA;AAAA,KACT;AAEA,IAAO,OAAA,IAAA,CAAA;AAAA,GACT;AAEA,EAAA,IAAI,cAAc,QAAU,EAAA;AAC1B,IAAQ,KAAA,GAAA,GAAA,CAAA;AAER,IAAA,OAAO,KAAK,OAAO,CAAA;AAAE,MAAA,CAAA;AAErB,IAAM,GAAA,GAAA,KAAA,CAAA;AAAA,GACR;AAEA,EAAA,IAAI,cAAc,OAAS,EAAA;AACzB,IAAQ,KAAA,GAAA,KAAA,CAAA;AAER,IAAA,OAAO,KAAK,QAAQ,CAAA;AAAE,MAAA,CAAA;AAEtB,IAAQ,KAAA,GAAA,KAAA,CAAA;AAAA,GACV;AAEA,EAAA,IAAI,OAAS,EAAA;AACX,IAAO,OAAA;AAAA,MACL,MAAA,EAAQC,OAAY,MAAO,CAAA,MAAA,EAAQ,OAAO,EAAE,IAAA,EAAM,QAAS,EAAC,CAAK,IAAA,KAAA;AAAA,MACjE,KAAA,EAAOA,OAAY,KAAM,CAAA,MAAA,EAAQ,KAAK,EAAE,IAAA,EAAM,QAAS,EAAC,CAAK,IAAA,GAAA;AAAA,KAC/D,CAAA;AAAA,GACF;AAEA,EAAA,OAAO,EAAE,MAAA,EAAQ,KAAO,EAAA,KAAA,EAAO,GAAI,EAAA,CAAA;AACrC;;;;"}
+{"version":3,"file":"get-match-range.mjs","sources":["../../../src/slate/utils/get-match-range.ts"],"sourcesContent":["import type { Point as SlatePoint } from \"slate\";\nimport {\n  Editor as SlateEditor,\n  Path as SlatePath,\n  Range as SlateRange,\n} from \"slate\";\n\nimport { isWhitespaceCharacter } from \"./is-whitespace-character\";\n\ninterface Options {\n  include?: boolean;\n  direction?: \"before\" | \"after\" | \"both\";\n  allowConsecutiveWhitespace?: boolean;\n  ignoreTerminator?: (\n    character: string,\n    point: SlatePoint,\n    direction: \"before\" | \"after\"\n  ) => boolean;\n}\n\nconst defaultOptions: Options = {\n  direction: \"before\",\n  allowConsecutiveWhitespace: true,\n};\n\nexport function getMatchRange(\n  editor: SlateEditor,\n  at: SlateRange,\n  terminators: string[] = [\" \"],\n  options: Options = defaultOptions\n): SlateRange | undefined {\n  const { include, direction, ignoreTerminator, allowConsecutiveWhitespace } = {\n    ...defaultOptions,\n    ...options,\n  };\n\n  let [start, end] = SlateRange.edges(at);\n  let point: SlatePoint = start;\n  let previousCharacterWasWhitespace = false;\n\n  function move(direction: \"before\" | \"after\"): boolean {\n    const nextPoint =\n      direction === \"after\"\n        ? SlateEditor.after(editor, point, { unit: \"character\" })\n        : SlateEditor.before(editor, point, { unit: \"character\" });\n\n    // Stop if we reached the end of a block\n    if (!nextPoint || SlatePath.compare(nextPoint.path, point.path) !== 0) {\n      return false;\n    }\n\n    const nextCharacter =\n      nextPoint &&\n      SlateEditor.string(\n        editor,\n        direction === \"after\"\n          ? { anchor: point, focus: nextPoint }\n          : { anchor: nextPoint, focus: point }\n      );\n    const lastCharacter =\n      nextCharacter &&\n      nextCharacter[direction === \"after\" ? 0 : nextCharacter.length - 1];\n\n    if (\n      !allowConsecutiveWhitespace &&\n      previousCharacterWasWhitespace &&\n      isWhitespaceCharacter(lastCharacter)\n    ) {\n      return false;\n    }\n\n    if (\n      nextPoint &&\n      lastCharacter &&\n      (!terminators.includes(lastCharacter) ||\n        ignoreTerminator?.(lastCharacter, nextPoint, direction))\n    ) {\n      previousCharacterWasWhitespace = isWhitespaceCharacter(lastCharacter);\n      point = nextPoint;\n\n      if (point.offset === 0) {\n        return false;\n      }\n    } else {\n      return false;\n    }\n\n    return true;\n  }\n\n  if (direction !== \"before\") {\n    point = end;\n    while (move(\"after\"));\n    end = point;\n  }\n\n  if (direction !== \"after\") {\n    point = start;\n    while (move(\"before\"));\n    start = point;\n  }\n\n  if (include) {\n    return {\n      anchor: SlateEditor.before(editor, start, { unit: \"offset\" }) ?? start,\n      focus: SlateEditor.after(editor, end, { unit: \"offset\" }) ?? end,\n    };\n  }\n\n  return { anchor: start, focus: end };\n}\n"],"names":["SlateRange","direction","SlateEditor","SlatePath"],"mappings":"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"}

package/dist/slate/utils/is-whitespace-character.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const WHITESPACE_REGEX = /\s/;
+function isWhitespaceCharacter(character) {
+  return character ? WHITESPACE_REGEX.test(character) : false;
+}
+
+exports.isWhitespaceCharacter = isWhitespaceCharacter;
+//# sourceMappingURL=is-whitespace-character.js.map

package/dist/slate/utils/is-whitespace-character.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-whitespace-character.js","sources":["../../../src/slate/utils/is-whitespace-character.ts"],"sourcesContent":["const WHITESPACE_REGEX = /\\s/;\n\nexport function isWhitespaceCharacter(character?: string): boolean {\n  return character ? WHITESPACE_REGEX.test(character) : false;\n}\n"],"names":[],"mappings":";;AAAA,MAAM,gBAAmB,GAAA,IAAA,CAAA;AAElB,SAAS,sBAAsB,SAA6B,EAAA;AACjE,EAAA,OAAO,SAAY,GAAA,gBAAA,CAAiB,IAAK,CAAA,SAAS,CAAI,GAAA,KAAA,CAAA;AACxD;;;;"}

package/dist/slate/utils/is-whitespace-character.mjs

@@ -0,0 +1,7 @@
+const WHITESPACE_REGEX = /\s/;
+function isWhitespaceCharacter(character) {
+  return character ? WHITESPACE_REGEX.test(character) : false;
+}
+
+export { isWhitespaceCharacter };
+//# sourceMappingURL=is-whitespace-character.mjs.map

package/dist/slate/utils/is-whitespace-character.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-whitespace-character.mjs","sources":["../../../src/slate/utils/is-whitespace-character.ts"],"sourcesContent":["const WHITESPACE_REGEX = /\\s/;\n\nexport function isWhitespaceCharacter(character?: string): boolean {\n  return character ? WHITESPACE_REGEX.test(character) : false;\n}\n"],"names":[],"mappings":"AAAA,MAAM,gBAAmB,GAAA,IAAA,CAAA;AAElB,SAAS,sBAAsB,SAA6B,EAAA;AACjE,EAAA,OAAO,SAAY,GAAA,gBAAA,CAAiB,IAAK,CAAA,SAAS,CAAI,GAAA,KAAA,CAAA;AACxD;;;;"}

package/dist/utils/memoize.js

@@ -5,7 +5,7 @@ var core = require('@liveblocks/core');
 function memoize(fn) {
   const cache = /* @__PURE__ */ new Map();
   return (...args) => {
-    const key = JSON.stringify(args.map((arg) => core.stringify(arg)));
+    const key = JSON.stringify(args.map((arg) => core.stableStringify(arg)));
     const cached = cache.get(key);
     if (cached !== void 0) {
       return cached;

package/dist/utils/memoize.js.map

@@ -1 +1 @@
-{"version":3,"file":"memoize.js","sources":["../../src/utils/memoize.ts"],"sourcesContent":["import { stringify } from \"@liveblocks/core\";\n\nexport function memoize<TArgs extends unknown[], TReturn>(\n  fn: (...args: TArgs) => TReturn\n): (...args: TArgs) => TReturn {\n  const cache = new Map<string, TReturn>();\n\n  return (...args: TArgs): TReturn => {\n    const key = JSON.stringify(args.map((arg) => stringify(arg)));\n    const cached = cache.get(key);\n\n    if (cached !== undefined) {\n      return cached;\n    }\n\n    const result = fn(...args);\n    cache.set(key, result);\n\n    return result;\n  };\n}\n"],"names":["stringify"],"mappings":";;;;AAEO,SAAS,QACd,EAC6B,EAAA;AAC7B,EAAM,MAAA,KAAA,uBAAY,GAAqB,EAAA,CAAA;AAEvC,EAAA,OAAO,IAAI,IAAyB,KAAA;AAClC,IAAM,MAAA,GAAA,GAAM,IAAK,CAAA,SAAA,CAAU,IAAK,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAAA,cAAA,CAAU,GAAG,CAAC,CAAC,CAAA,CAAA;AAC5D,IAAM,MAAA,MAAA,GAAS,KAAM,CAAA,GAAA,CAAI,GAAG,CAAA,CAAA;AAE5B,IAAA,IAAI,WAAW,KAAW,CAAA,EAAA;AACxB,MAAO,OAAA,MAAA,CAAA;AAAA,KACT;AAEA,IAAM,MAAA,MAAA,GAAS,EAAG,CAAA,GAAG,IAAI,CAAA,CAAA;AACzB,IAAM,KAAA,CAAA,GAAA,CAAI,KAAK,MAAM,CAAA,CAAA;AAErB,IAAO,OAAA,MAAA,CAAA;AAAA,GACT,CAAA;AACF;;;;"}
+{"version":3,"file":"memoize.js","sources":["../../src/utils/memoize.ts"],"sourcesContent":["import { stableStringify } from \"@liveblocks/core\";\n\nexport function memoize<TArgs extends unknown[], TReturn>(\n  fn: (...args: TArgs) => TReturn\n): (...args: TArgs) => TReturn {\n  const cache = new Map<string, TReturn>();\n\n  return (...args: TArgs): TReturn => {\n    const key = JSON.stringify(args.map((arg) => stableStringify(arg)));\n    const cached = cache.get(key);\n\n    if (cached !== undefined) {\n      return cached;\n    }\n\n    const result = fn(...args);\n    cache.set(key, result);\n\n    return result;\n  };\n}\n"],"names":["stableStringify"],"mappings":";;;;AAEO,SAAS,QACd,EAC6B,EAAA;AAC7B,EAAM,MAAA,KAAA,uBAAY,GAAqB,EAAA,CAAA;AAEvC,EAAA,OAAO,IAAI,IAAyB,KAAA;AAClC,IAAM,MAAA,GAAA,GAAM,IAAK,CAAA,SAAA,CAAU,IAAK,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAAA,oBAAA,CAAgB,GAAG,CAAC,CAAC,CAAA,CAAA;AAClE,IAAM,MAAA,MAAA,GAAS,KAAM,CAAA,GAAA,CAAI,GAAG,CAAA,CAAA;AAE5B,IAAA,IAAI,WAAW,KAAW,CAAA,EAAA;AACxB,MAAO,OAAA,MAAA,CAAA;AAAA,KACT;AAEA,IAAM,MAAA,MAAA,GAAS,EAAG,CAAA,GAAG,IAAI,CAAA,CAAA;AACzB,IAAM,KAAA,CAAA,GAAA,CAAI,KAAK,MAAM,CAAA,CAAA;AAErB,IAAO,OAAA,MAAA,CAAA;AAAA,GACT,CAAA;AACF;;;;"}

package/dist/utils/memoize.mjs

@@ -1,9 +1,9 @@
-import { stringify } from '@liveblocks/core';
+import { stableStringify } from '@liveblocks/core';
 
 function memoize(fn) {
   const cache = /* @__PURE__ */ new Map();
   return (...args) => {
-    const key = JSON.stringify(args.map((arg) => stringify(arg)));
+    const key = JSON.stringify(args.map((arg) => stableStringify(arg)));
     const cached = cache.get(key);
     if (cached !== void 0) {
       return cached;

package/dist/utils/memoize.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"memoize.mjs","sources":["../../src/utils/memoize.ts"],"sourcesContent":["import { stringify } from \"@liveblocks/core\";\n\nexport function memoize<TArgs extends unknown[], TReturn>(\n  fn: (...args: TArgs) => TReturn\n): (...args: TArgs) => TReturn {\n  const cache = new Map<string, TReturn>();\n\n  return (...args: TArgs): TReturn => {\n    const key = JSON.stringify(args.map((arg) => stringify(arg)));\n    const cached = cache.get(key);\n\n    if (cached !== undefined) {\n      return cached;\n    }\n\n    const result = fn(...args);\n    cache.set(key, result);\n\n    return result;\n  };\n}\n"],"names":[],"mappings":";;AAEO,SAAS,QACd,EAC6B,EAAA;AAC7B,EAAM,MAAA,KAAA,uBAAY,GAAqB,EAAA,CAAA;AAEvC,EAAA,OAAO,IAAI,IAAyB,KAAA;AAClC,IAAM,MAAA,GAAA,GAAM,IAAK,CAAA,SAAA,CAAU,IAAK,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAA,SAAA,CAAU,GAAG,CAAC,CAAC,CAAA,CAAA;AAC5D,IAAM,MAAA,MAAA,GAAS,KAAM,CAAA,GAAA,CAAI,GAAG,CAAA,CAAA;AAE5B,IAAA,IAAI,WAAW,KAAW,CAAA,EAAA;AACxB,MAAO,OAAA,MAAA,CAAA;AAAA,KACT;AAEA,IAAM,MAAA,MAAA,GAAS,EAAG,CAAA,GAAG,IAAI,CAAA,CAAA;AACzB,IAAM,KAAA,CAAA,GAAA,CAAI,KAAK,MAAM,CAAA,CAAA;AAErB,IAAO,OAAA,MAAA,CAAA;AAAA,GACT,CAAA;AACF;;;;"}
+{"version":3,"file":"memoize.mjs","sources":["../../src/utils/memoize.ts"],"sourcesContent":["import { stableStringify } from \"@liveblocks/core\";\n\nexport function memoize<TArgs extends unknown[], TReturn>(\n  fn: (...args: TArgs) => TReturn\n): (...args: TArgs) => TReturn {\n  const cache = new Map<string, TReturn>();\n\n  return (...args: TArgs): TReturn => {\n    const key = JSON.stringify(args.map((arg) => stableStringify(arg)));\n    const cached = cache.get(key);\n\n    if (cached !== undefined) {\n      return cached;\n    }\n\n    const result = fn(...args);\n    cache.set(key, result);\n\n    return result;\n  };\n}\n"],"names":[],"mappings":";;AAEO,SAAS,QACd,EAC6B,EAAA;AAC7B,EAAM,MAAA,KAAA,uBAAY,GAAqB,EAAA,CAAA;AAEvC,EAAA,OAAO,IAAI,IAAyB,KAAA;AAClC,IAAM,MAAA,GAAA,GAAM,IAAK,CAAA,SAAA,CAAU,IAAK,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAA,eAAA,CAAgB,GAAG,CAAC,CAAC,CAAA,CAAA;AAClE,IAAM,MAAA,MAAA,GAAS,KAAM,CAAA,GAAA,CAAI,GAAG,CAAA,CAAA;AAE5B,IAAA,IAAI,WAAW,KAAW,CAAA,EAAA;AACxB,MAAO,OAAA,MAAA,CAAA;AAAA,KACT;AAEA,IAAM,MAAA,MAAA,GAAS,EAAG,CAAA,GAAG,IAAI,CAAA,CAAA;AACzB,IAAM,KAAA,CAAA,GAAA,CAAI,KAAK,MAAM,CAAA,CAAA;AAErB,IAAO,OAAA,MAAA,CAAA;AAAA,GACT,CAAA;AACF;;;;"}

package/dist/version.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const PKG_NAME = "@liveblocks/react-ui";
-const PKG_VERSION = typeof "2.18.2-test1" === "string" && "2.18.2-test1";
+const PKG_VERSION = typeof "2.18.3" === "string" && "2.18.3";
 const PKG_FORMAT = typeof "cjs" === "string" && "cjs";
 
 exports.PKG_FORMAT = PKG_FORMAT;

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sources":["../src/version.ts"],"sourcesContent":["declare const __VERSION__: string;\ndeclare const ROLLUP_FORMAT: string;\n\nexport const PKG_NAME = \"@liveblocks/react-ui\";\nexport const PKG_VERSION = typeof __VERSION__ === \"string\" && __VERSION__;\nexport const PKG_FORMAT = typeof ROLLUP_FORMAT === \"string\" && ROLLUP_FORMAT;\n"],"names":[],"mappings":";;AAGO,MAAM,QAAW,GAAA,uBAAA;AACX,MAAA,WAAA,GAAc,OAAO,cAAA,KAAgB,QAAY,IAAA,eAAA;AACjD,MAAA,UAAA,GAAa,OAAO,KAAA,KAAkB,QAAY,IAAA;;;;;;"}
+{"version":3,"file":"version.js","sources":["../src/version.ts"],"sourcesContent":["declare const __VERSION__: string;\ndeclare const ROLLUP_FORMAT: string;\n\nexport const PKG_NAME = \"@liveblocks/react-ui\";\nexport const PKG_VERSION = typeof __VERSION__ === \"string\" && __VERSION__;\nexport const PKG_FORMAT = typeof ROLLUP_FORMAT === \"string\" && ROLLUP_FORMAT;\n"],"names":[],"mappings":";;AAGO,MAAM,QAAW,GAAA,uBAAA;AACX,MAAA,WAAA,GAAc,OAAO,QAAA,KAAgB,QAAY,IAAA,SAAA;AACjD,MAAA,UAAA,GAAa,OAAO,KAAA,KAAkB,QAAY,IAAA;;;;;;"}

package/dist/version.mjs

@@ -1,5 +1,5 @@
 const PKG_NAME = "@liveblocks/react-ui";
-const PKG_VERSION = typeof "2.18.2-test1" === "string" && "2.18.2-test1";
+const PKG_VERSION = typeof "2.18.3" === "string" && "2.18.3";
 const PKG_FORMAT = typeof "esm" === "string" && "esm";
 
 export { PKG_FORMAT, PKG_NAME, PKG_VERSION };

package/dist/version.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"version.mjs","sources":["../src/version.ts"],"sourcesContent":["declare const __VERSION__: string;\ndeclare const ROLLUP_FORMAT: string;\n\nexport const PKG_NAME = \"@liveblocks/react-ui\";\nexport const PKG_VERSION = typeof __VERSION__ === \"string\" && __VERSION__;\nexport const PKG_FORMAT = typeof ROLLUP_FORMAT === \"string\" && ROLLUP_FORMAT;\n"],"names":[],"mappings":"AAGO,MAAM,QAAW,GAAA,uBAAA;AACX,MAAA,WAAA,GAAc,OAAO,cAAA,KAAgB,QAAY,IAAA,eAAA;AACjD,MAAA,UAAA,GAAa,OAAO,KAAA,KAAkB,QAAY,IAAA;;;;"}
+{"version":3,"file":"version.mjs","sources":["../src/version.ts"],"sourcesContent":["declare const __VERSION__: string;\ndeclare const ROLLUP_FORMAT: string;\n\nexport const PKG_NAME = \"@liveblocks/react-ui\";\nexport const PKG_VERSION = typeof __VERSION__ === \"string\" && __VERSION__;\nexport const PKG_FORMAT = typeof ROLLUP_FORMAT === \"string\" && ROLLUP_FORMAT;\n"],"names":[],"mappings":"AAGO,MAAM,QAAW,GAAA,uBAAA;AACX,MAAA,WAAA,GAAc,OAAO,QAAA,KAAgB,QAAY,IAAA,SAAA;AACjD,MAAA,UAAA,GAAa,OAAO,KAAA,KAAkB,QAAY,IAAA;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/react-ui",
-  "version": "2.18.2-test1",
+  "version": "2.18.3",
   "description": "A set of React pre-built components for the Liveblocks products. Liveblocks is the all-in-one toolkit to build collaborative products like Figma, Notion, and more.",
   "license": "Apache-2.0",
   "type": "commonjs",
@@ -75,9 +75,9 @@
   },
   "dependencies": {
     "@floating-ui/react-dom": "^2.1.2",
-    "@liveblocks/client": "2.18.2-test1",
-    "@liveblocks/core": "2.18.2-test1",
-    "@liveblocks/react": "2.18.2-test1",
+    "@liveblocks/client": "2.18.3",
+    "@liveblocks/core": "2.18.3",
+    "@liveblocks/react": "2.18.3",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
     "@radix-ui/react-popover": "^1.1.2",
     "@radix-ui/react-slot": "^1.1.0",