@portabletext/editor 3.2.2 → 3.2.3

package/lib/index.js

@@ -3232,29 +3232,31 @@ function createWithPortableTextMarkModel(editorActor) {
         apply2(op);
         return;
       }
-      if (op.type === "set_selection" && op.properties && op.newProperties && op.properties.anchor && op.properties.focus && op.newProperties.anchor && op.newProperties.focus) {
-        const previousSelectionIsCollapsed = Range.isCollapsed({
-          anchor: op.properties.anchor,
-          focus: op.properties.focus
-        }), newSelectionIsCollapsed = Range.isCollapsed({
-          anchor: op.newProperties.anchor,
-          focus: op.newProperties.focus
-        });
-        if (previousSelectionIsCollapsed && newSelectionIsCollapsed) {
-          const focusSpan = Array.from(Editor.nodes(editor, {
-            mode: "lowest",
-            at: op.properties.focus,
-            match: (n) => editor.isTextSpan(n),
-            voids: !1
-          }))[0]?.[0], newFocusSpan = Array.from(Editor.nodes(editor, {
-            mode: "lowest",
-            at: op.newProperties.focus,
-            match: (n) => editor.isTextSpan(n),
-            voids: !1
-          }))[0]?.[0], movedToNextSpan = focusSpan && newFocusSpan && op.newProperties.focus.path[0] === op.properties.focus.path[0] && op.newProperties.focus.path[1] === op.properties.focus.path[1] + 1 && focusSpan.text.length === op.properties.focus.offset && op.newProperties.focus.offset === 0, movedToPreviousSpan = focusSpan && newFocusSpan && op.newProperties.focus.path[0] === op.properties.focus.path[0] && op.newProperties.focus.path[1] === op.properties.focus.path[1] - 1 && op.properties.focus.offset === 0 && newFocusSpan.text.length === op.newProperties.focus.offset;
-          !movedToNextSpan && !movedToPreviousSpan && (editor.decoratorState = {});
-        }
-      }
+      if (op.type === "set_selection")
+        if (op.properties && op.newProperties && op.properties.anchor && op.properties.focus && op.newProperties.anchor && op.newProperties.focus) {
+          const previousSelectionIsCollapsed = Range.isCollapsed({
+            anchor: op.properties.anchor,
+            focus: op.properties.focus
+          }), newSelectionIsCollapsed = Range.isCollapsed({
+            anchor: op.newProperties.anchor,
+            focus: op.newProperties.focus
+          });
+          if (previousSelectionIsCollapsed && newSelectionIsCollapsed) {
+            const focusSpan = Array.from(Editor.nodes(editor, {
+              mode: "lowest",
+              at: op.properties.focus,
+              match: (n) => editor.isTextSpan(n),
+              voids: !1
+            }))[0]?.[0], newFocusSpan = Array.from(Editor.nodes(editor, {
+              mode: "lowest",
+              at: op.newProperties.focus,
+              match: (n) => editor.isTextSpan(n),
+              voids: !1
+            }))[0]?.[0], movedToNextSpan = focusSpan && newFocusSpan && op.newProperties.focus.path[0] === op.properties.focus.path[0] && op.newProperties.focus.path[1] === op.properties.focus.path[1] + 1 && focusSpan.text.length === op.properties.focus.offset && op.newProperties.focus.offset === 0, movedToPreviousSpan = focusSpan && newFocusSpan && op.newProperties.focus.path[0] === op.properties.focus.path[0] && op.newProperties.focus.path[1] === op.properties.focus.path[1] - 1 && op.properties.focus.offset === 0 && newFocusSpan.text.length === op.newProperties.focus.offset;
+            !movedToNextSpan && !movedToPreviousSpan && (editor.decoratorState = {});
+          }
+        } else
+          editor.decoratorState = {};
       if (op.type === "remove_text") {
         const {
           selection
@@ -4581,12 +4583,12 @@ const debug$a = debugWithName("behavior.operation.history.redo"), historyRedoOpe
       selection: operation.at
     },
     blockIndexMap: operation.editor.blockIndexMap
-  }) : void 0, selection = operation.editor.selection ? slateRangeToSelection({
-    schema: context.schema,
-    editor: operation.editor,
-    range: operation.editor.selection
-  }) : void 0, reverse = operation.direction === "backward", anchorPoint = operation.at?.anchor ?? selection?.anchor, focusPoint = operation.at?.focus ?? selection?.focus, startPoint = reverse ? focusPoint : anchorPoint, endPoint = reverse ? anchorPoint : focusPoint, startBlockKey = startPoint ? getBlockKeyFromSelectionPoint(startPoint) : void 0, endBlockKey = endPoint ? getBlockKeyFromSelectionPoint(endPoint) : void 0, startBlockIndex = startBlockKey ? operation.editor.blockIndexMap.get(startBlockKey) : void 0, endBlockIndex = endBlockKey ? operation.editor.blockIndexMap.get(endBlockKey) : void 0, startBlock = startBlockIndex ? operation.editor.value.at(startBlockIndex) : void 0, endBlock = endBlockIndex ? operation.editor.value.at(endBlockIndex) : void 0;
+  }) : operation.editor.selection;
+  if (!at)
+    throw new Error("Unable to delete without a selection");
+  const [start, end] = Range.edges(at);
   if (operation.unit === "block") {
+    const startBlockIndex = start.path.at(0), endBlockIndex = end.path.at(0);
     if (startBlockIndex === void 0 || endBlockIndex === void 0)
       throw new Error("Failed to get start or end block index");
     Transforms.removeNodes(operation.editor, {
@@ -4605,25 +4607,19 @@ const debug$a = debugWithName("behavior.operation.history.redo"), historyRedoOpe
     return;
   }
   if (operation.unit === "child") {
-    const range = at ?? operation.editor.selection ?? void 0;
-    if (!range)
-      throw new Error("Unable to delete children without a selection");
     Transforms.removeNodes(operation.editor, {
-      at: range,
+      at,
       match: (node) => isSpan(context, node) && node._key !== VOID_CHILD_KEY || "__inline" in node && node.__inline === !0
     });
     return;
   }
   if (operation.direction === "backward" && operation.unit === "line") {
-    const range = at ?? operation.editor.selection ?? void 0;
-    if (!range)
-      throw new Error("Unable to delete line without a selection");
     const parentBlockEntry = Editor.above(operation.editor, {
       match: (n) => Element$1.isElement(n) && Editor.isBlock(operation.editor, n),
-      at: range
+      at
     });
     if (parentBlockEntry) {
-      const [, parentBlockPath] = parentBlockEntry, parentElementRange = Editor.range(operation.editor, parentBlockPath, range.anchor), currentLineRange = findCurrentLineRange(operation.editor, parentElementRange);
+      const [, parentBlockPath] = parentBlockEntry, parentElementRange = Editor.range(operation.editor, parentBlockPath, at.anchor), currentLineRange = findCurrentLineRange(operation.editor, parentElementRange);
       if (!Range.isCollapsed(currentLineRange)) {
         Transforms.delete(operation.editor, {
           at: currentLineRange
@@ -4632,21 +4628,80 @@ const debug$a = debugWithName("behavior.operation.history.redo"), historyRedoOpe
       }
     }
   }
-  if (operation.unit === "word") {
-    const range = at ?? operation.editor.selection ?? void 0;
-    if (!range)
-      throw new Error("Unable to delete word without a selection");
-    if (Range.isCollapsed(range)) {
-      deleteText(operation.editor, {
-        at: range,
-        unit: "word",
-        reverse: operation.direction === "backward"
+  if (operation.unit === "word" && Range.isCollapsed(at)) {
+    deleteText(operation.editor, {
+      at,
+      unit: "word",
+      reverse: operation.direction === "backward"
+    });
+    return;
+  }
+  const startBlock = Editor.above(operation.editor, {
+    match: (n) => Element$1.isElement(n) && Editor.isBlock(operation.editor, n),
+    at: start,
+    voids: !1
+  }), endBlock = Editor.above(operation.editor, {
+    match: (n) => Element$1.isElement(n) && Editor.isBlock(operation.editor, n),
+    at: end,
+    voids: !1
+  }), isAcrossBlocks = startBlock && endBlock && !Path.equals(startBlock[1], endBlock[1]), startNonEditable = Editor.void(operation.editor, {
+    at: start,
+    mode: "highest"
+  }) ?? Editor.elementReadOnly(operation.editor, {
+    at: start,
+    mode: "highest"
+  }), endNonEditable = Editor.void(operation.editor, {
+    at: end,
+    mode: "highest"
+  }) ?? Editor.elementReadOnly(operation.editor, {
+    at: end,
+    mode: "highest"
+  }), matches = [];
+  let lastPath;
+  for (const entry of Editor.nodes(operation.editor, {
+    at,
+    voids: !1
+  })) {
+    const [node, path] = entry;
+    lastPath && Path.compare(path, lastPath) === 0 || (Element$1.isElement(node) && (Editor.isVoid(operation.editor, node) || Editor.isElementReadOnly(operation.editor, node)) || !Path.isCommon(path, start.path) && !Path.isCommon(path, end.path)) && (matches.push(entry), lastPath = path);
+  }
+  const pathRefs = Array.from(matches, ([, path]) => Editor.pathRef(operation.editor, path)), startRef = Editor.pointRef(operation.editor, start), endRef = Editor.pointRef(operation.editor, end);
+  if (startBlock && endBlock && Point.equals(start, Editor.start(operation.editor, startBlock[1])) && Point.equals(end, Editor.end(operation.editor, endBlock[1])) && isAcrossBlocks && !startNonEditable && !endNonEditable) {
+    if (!startNonEditable) {
+      const point = startRef.current, [node] = Editor.leaf(operation.editor, point);
+      node.text.length > 0 && operation.editor.apply({
+        type: "remove_text",
+        path: point.path,
+        offset: 0,
+        text: node.text
       });
-      return;
     }
+    for (const pathRef of pathRefs.reverse()) {
+      const path = pathRef.unref();
+      path && Transforms.removeNodes(operation.editor, {
+        at: path,
+        voids: !1
+      });
+    }
+    if (!endNonEditable) {
+      const point = endRef.current, [node] = Editor.leaf(operation.editor, point), {
+        path
+      } = point, offset = 0, text = node.text.slice(offset, end.offset);
+      text.length > 0 && operation.editor.apply({
+        type: "remove_text",
+        path,
+        offset,
+        text
+      });
+    }
+    endRef.current && startRef.current && Transforms.removeNodes(operation.editor, {
+      at: endRef.current,
+      voids: !1
+    });
+    return;
   }
-  const hanging = reverse ? endPoint ? isTextBlock(context, endBlock) ? endPoint.offset === 0 : !0 : !1 : startPoint ? isTextBlock(context, startBlock) ? startPoint.offset === 0 : !0 : !1;
-  at ? deleteText(operation.editor, {
+  const reverse = operation.direction === "backward", hanging = reverse ? end ? isTextBlock(context, endBlock) ? end.offset === 0 : !0 : !1 : start ? isTextBlock(context, startBlock) ? start.offset === 0 : !0 : !1;
+  operation.at ? deleteText(operation.editor, {
     at,
     hanging,
     reverse