@portabletext/editor 1.12.0 → 1.12.2

package/lib/index.js

@@ -343,21 +343,6 @@ function looksLikeUrl(text) {
   }
   return looksLikeUrl2;
 }
-function isPortableTextSpan(node) {
-  return node._type === "span" && "text" in node && typeof node.text == "string" && (typeof node.marks > "u" || Array.isArray(node.marks) && node.marks.every((mark) => typeof mark == "string"));
-}
-function isPortableTextBlock(node) {
-  return (
-    // A block doesn't _have_ to be named 'block' - to differentiate between
-    // allowed child types and marks, one might name them differently
-    typeof node._type == "string" && // Toolkit-types like nested spans are @-prefixed
-    node._type[0] !== "@" && // `markDefs` isn't _required_ per say, but if it's there, it needs to be an array
-    (!("markDefs" in node) || !node.markDefs || Array.isArray(node.markDefs) && // Every mark definition needs to have an `_key` to be mappable in child spans
-    node.markDefs.every((def) => typeof def._key == "string")) && // `children` is required and needs to be an array
-    "children" in node && Array.isArray(node.children) && // All children are objects with `_type` (usually spans, but can contain other stuff)
-    node.children.every((child) => typeof child == "object" && "_type" in child)
-  );
-}
 function blockOffsetToSpanSelectionPoint({
   value,
   blockOffset
@@ -410,6 +395,87 @@ function spanSelectionPointToBlockOffset({
         }
     }
 }
+function isKeyedSegment$1(segment) {
+  return typeof segment == "object" && segment !== null && "_key" in segment;
+}
+function reverseSelection(selection) {
+  return selection && (selection.backward ? {
+    anchor: selection.focus,
+    focus: selection.anchor,
+    backward: !1
+  } : {
+    anchor: selection.focus,
+    focus: selection.anchor,
+    backward: !0
+  });
+}
+function getSelectionText({
+  value,
+  selection
+}) {
+  let text = "";
+  if (!value || !selection)
+    return text;
+  const forwardSelection = selection.backward ? reverseSelection(selection) : selection;
+  if (!forwardSelection)
+    return text;
+  for (const block of value)
+    if (!(isKeyedSegment$1(forwardSelection.anchor.path[0]) && block._key !== forwardSelection.anchor.path[0]._key) && types.isPortableTextTextBlock(block)) {
+      for (const child of block.children)
+        if (types.isPortableTextSpan(child)) {
+          if (isKeyedSegment$1(forwardSelection.anchor.path[2]) && child._key === forwardSelection.anchor.path[2]._key && isKeyedSegment$1(forwardSelection.focus.path[2]) && child._key === forwardSelection.focus.path[2]._key) {
+            text = text + child.text.slice(forwardSelection.anchor.offset, forwardSelection.focus.offset);
+            break;
+          }
+          if (isKeyedSegment$1(forwardSelection.anchor.path[2]) && child._key === forwardSelection.anchor.path[2]._key) {
+            text = text + child.text.slice(forwardSelection.anchor.offset);
+            continue;
+          }
+          if (isKeyedSegment$1(forwardSelection.focus.path[2]) && child._key === forwardSelection.focus.path[2]._key) {
+            text = text + child.text.slice(0, forwardSelection.focus.offset);
+            break;
+          }
+        }
+      if (isKeyedSegment$1(forwardSelection.focus.path[0]) && block._key === forwardSelection.focus.path[0]._key)
+        break;
+    }
+  return text;
+}
+function getStartPoint({
+  node,
+  path
+}) {
+  return types.isPortableTextTextBlock(node) ? {
+    path: [...path, "children", {
+      _key: node.children[0]._key
+    }],
+    offset: 0
+  } : {
+    path,
+    offset: 0
+  };
+}
+function getBlockTextBefore({
+  value,
+  point
+}) {
+  const key = isKeyedSegment$1(point.path[0]) ? point.path[0]._key : void 0, block = key ? value.find((block2) => block2._key === key) : void 0;
+  if (!block)
+    return "";
+  const startPoint = getStartPoint({
+    node: block,
+    path: [{
+      _key: block._key
+    }]
+  });
+  return getSelectionText({
+    value,
+    selection: {
+      anchor: startPoint,
+      focus: point
+    }
+  });
+}
 function createMarkdownBehaviors(config) {
   const automaticBlockquoteOnSpace = {
     on: "insert text",
@@ -482,11 +548,24 @@ function createMarkdownBehaviors(config) {
       }), focusBlock = getFocusTextBlock(context), selectionCollapsed = selectionIsCollapsed(context);
       if (!hrObject || !focusBlock || !selectionCollapsed)
         return !1;
-      const onlyText = focusBlock.node.children.every(isPortableTextSpan), blockText = focusBlock.node.children.map((child) => child.text ?? "").join("");
-      return onlyText && blockText === `${hrCharacter}${hrCharacter}` ? {
+      const textBefore = getBlockTextBefore({
+        value: context.value,
+        point: context.selection.focus
+      }), hrBlockOffsets = {
+        anchor: {
+          path: focusBlock.path,
+          offset: 0
+        },
+        focus: {
+          path: focusBlock.path,
+          offset: 3
+        }
+      };
+      return textBefore === `${hrCharacter}${hrCharacter}` ? {
         hrObject,
         focusBlock,
-        hrCharacter
+        hrCharacter,
+        hrBlockOffsets
       } : !1;
     },
     actions: [(_, {
@@ -496,17 +575,14 @@ function createMarkdownBehaviors(config) {
       text: hrCharacter
     }], (_, {
       hrObject,
-      focusBlock
+      hrBlockOffsets
     }) => [{
       type: "insert block object",
-      placement: "after",
+      placement: "before",
       blockObject: hrObject
     }, {
-      type: "delete block",
-      blockPath: focusBlock.path
-    }, {
-      type: "insert text block",
-      placement: "after"
+      type: "delete text",
+      ...hrBlockOffsets
     }]]
   }, automaticHrOnPaste = {
     on: "paste",
@@ -672,9 +748,9 @@ function createMarkdownBehaviors(config) {
           listItemLength: 1,
           style: defaultStyle
         };
-      const looksLikeOrderedList = /^1./.test(focusSpan.node.text), orderedListStyle = config.orderedListStyle?.({
+      const looksLikeOrderedList = /^1\./.test(blockText), orderedListStyle = config.orderedListStyle?.({
         schema: context.schema
-      }), caretAtTheEndOfOrderedList = context.selection.focus.offset === 2;
+      }), caretAtTheEndOfOrderedList = blockOffset.offset === 2;
       return defaultStyle && caretAtTheEndOfOrderedList && looksLikeOrderedList && orderedListStyle !== void 0 ? {
         focusTextBlock,
         listItem: orderedListStyle,
@@ -4106,6 +4182,21 @@ function createWithPortableTextLists(types2) {
     }, editor;
   };
 }
+function isPortableTextSpan(node) {
+  return node._type === "span" && "text" in node && typeof node.text == "string" && (typeof node.marks > "u" || Array.isArray(node.marks) && node.marks.every((mark) => typeof mark == "string"));
+}
+function isPortableTextBlock(node) {
+  return (
+    // A block doesn't _have_ to be named 'block' - to differentiate between
+    // allowed child types and marks, one might name them differently
+    typeof node._type == "string" && // Toolkit-types like nested spans are @-prefixed
+    node._type[0] !== "@" && // `markDefs` isn't _required_ per say, but if it's there, it needs to be an array
+    (!("markDefs" in node) || !node.markDefs || Array.isArray(node.markDefs) && // Every mark definition needs to have an `_key` to be mappable in child spans
+    node.markDefs.every((def) => typeof def._key == "string")) && // `children` is required and needs to be an array
+    "children" in node && Array.isArray(node.children) && // All children are objects with `_type` (usually spans, but can contain other stuff)
+    node.children.every((child) => typeof child == "object" && "_type" in child)
+  );
+}
 function getPreviousSpan({
   editor,
   blockPath,
@@ -4831,8 +4922,9 @@ function insertBlock({
           offset: 0
         }
       });
-    } else
-      slate.Editor.insertNode(editor, block);
+    } else placement === "before" ? slate.Transforms.insertNodes(editor, block, {
+      at: focusBlockPath
+    }) : slate.Editor.insertNode(editor, block);
     focusBlock && isEqualToEmptyEditor([focusBlock], schema2) && slate.Transforms.removeNodes(editor, {
       at: focusBlockPath
     });