@portabletext/editor 1.55.14 → 1.55.16

package/lib/index.cjs

@@ -519,47 +519,78 @@ function getSlateRangeFromEvent(editor, event) {
   }
   return range;
 }
-function toSlatePath(path, editor) {
+function toSlatePath(snapshot, path) {
   const blockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint({
     path
   });
   if (!blockKey)
-    return [];
-  const blockIndex = editor.blockIndexMap.get(blockKey);
+    return {
+      block: void 0,
+      child: void 0,
+      path: []
+    };
+  const blockIndex = snapshot.blockIndexMap.get(blockKey);
   if (blockIndex === void 0)
-    return [];
-  const block = editor.children.at(blockIndex);
-  if (!block || !slate.Element.isElement(block))
-    return [];
-  if (editor.isVoid(block))
-    return [blockIndex, 0];
+    return {
+      block: void 0,
+      child: void 0,
+      path: []
+    };
+  const block = snapshot.context.value.at(blockIndex);
+  if (!block)
+    return {
+      block: void 0,
+      child: void 0,
+      path: []
+    };
+  if (!util_sliceBlocks.isTextBlock(snapshot.context, block))
+    return {
+      block,
+      child: void 0,
+      path: [blockIndex, 0]
+    };
   const childKey = util_sliceBlocks.getChildKeyFromSelectionPoint({
     path
   });
   if (!childKey)
-    return [blockIndex, 0];
-  let childPath = [], childIndex = -1;
+    return {
+      block,
+      child: void 0,
+      path: [blockIndex, 0]
+    };
+  let childPath = [], childIndex = -1, pathChild;
   for (const child of block.children)
     if (childIndex++, child._key === childKey) {
-      slate.Element.isElement(child) && editor.isVoid(child) ? childPath = [childIndex, 0] : childPath = [childIndex];
+      pathChild = child, util_sliceBlocks.isSpan(snapshot.context, child) ? childPath = [childIndex] : childPath = [childIndex, 0];
       break;
     }
-  return [blockIndex].concat(childPath);
+  return childPath.length === 0 ? {
+    block,
+    child: void 0,
+    path: [blockIndex, 0]
+  } : {
+    block,
+    child: pathChild,
+    path: [blockIndex].concat(childPath)
+  };
 }
-function toSlateRange(selection, editor) {
-  if (!selection || !editor)
+function toSlateRange(snapshot) {
+  if (!snapshot.context.selection)
+    return null;
+  const anchorPath = toSlatePath(snapshot, snapshot.context.selection.anchor.path), focusPath = toSlatePath(snapshot, snapshot.context.selection.focus.path);
+  if (anchorPath.path.length === 0 || focusPath.path.length === 0)
     return null;
-  const anchor = {
-    path: toSlatePath(selection.anchor.path, editor),
-    offset: selection.anchor.offset
-  }, focus = {
-    path: toSlatePath(selection.focus.path, editor),
-    offset: selection.focus.offset
+  const anchorOffset = anchorPath.child && util_sliceBlocks.isSpan(snapshot.context, anchorPath.child) ? Math.min(anchorPath.child.text.length, snapshot.context.selection.anchor.offset) : 0, focusOffset = focusPath.child && util_sliceBlocks.isSpan(snapshot.context, focusPath.child) ? Math.min(focusPath.child.text.length, snapshot.context.selection.focus.offset) : 0;
+  return {
+    anchor: {
+      path: anchorPath.path,
+      offset: anchorOffset
+    },
+    focus: {
+      path: focusPath.path,
+      offset: focusOffset
+    }
   };
-  return focus.path.length === 0 || anchor.path.length === 0 ? null : anchor && focus ? {
-    anchor,
-    focus
-  } : null;
 }
 function moveRangeByOperation(range, operation) {
   const anchor = slate.Point.transform(range.anchor, operation), focus = slate.Point.transform(range.focus, operation);
@@ -2875,15 +2906,22 @@ const addAnnotationOperationImplementation = ({
   operation
 }) => {
   const location = toSlateRange({
-    anchor: {
-      path: operation.at,
-      offset: 0
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: {
+        anchor: {
+          path: operation.at,
+          offset: 0
+        },
+        focus: {
+          path: operation.at,
+          offset: 0
+        }
+      }
     },
-    focus: {
-      path: operation.at,
-      offset: 0
-    }
-  }, operation.editor);
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!location)
     throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
   const block = slate.Editor.node(operation.editor, location, {
@@ -2923,15 +2961,22 @@ const addAnnotationOperationImplementation = ({
   operation
 }) => {
   const location = toSlateRange({
-    anchor: {
-      path: operation.at,
-      offset: 0
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: {
+        anchor: {
+          path: operation.at,
+          offset: 0
+        },
+        focus: {
+          path: operation.at,
+          offset: 0
+        }
+      }
     },
-    focus: {
-      path: operation.at,
-      offset: 0
-    }
-  }, operation.editor);
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!location)
     throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
   const block = slate.Editor.node(operation.editor, location, {
@@ -2988,15 +3033,22 @@ const addAnnotationOperationImplementation = ({
   operation
 }) => {
   const location = toSlateRange({
-    anchor: {
-      path: operation.at,
-      offset: 0
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: {
+        anchor: {
+          path: operation.at,
+          offset: 0
+        },
+        focus: {
+          path: operation.at,
+          offset: 0
+        }
+      }
     },
-    focus: {
-      path: operation.at,
-      offset: 0
-    }
-  }, operation.editor);
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!location)
     throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
   const childEntry = slate.Editor.node(operation.editor, location, {
@@ -3057,15 +3109,22 @@ const addAnnotationOperationImplementation = ({
   operation
 }) => {
   const location = toSlateRange({
-    anchor: {
-      path: operation.at,
-      offset: 0
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: {
+        anchor: {
+          path: operation.at,
+          offset: 0
+        },
+        focus: {
+          path: operation.at,
+          offset: 0
+        }
+      }
     },
-    focus: {
-      path: operation.at,
-      offset: 0
-    }
-  }, operation.editor);
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!location)
     throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
   const childEntry = slate.Editor.node(operation.editor, location, {
@@ -3130,7 +3189,14 @@ const addAnnotationOperationImplementation = ({
   }) : void 0, manualSelection = manualAnchor && manualFocus ? {
     anchor: manualAnchor,
     focus: manualFocus
-  } : void 0, selection = manualSelection ? toSlateRange(manualSelection, operation.editor) ?? editor.selection : editor.selection;
+  } : void 0, selection = manualSelection ? toSlateRange({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: manualSelection
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  }) ?? editor.selection : editor.selection;
   if (!selection)
     return;
   const editorSelection = slateRangeToSelection({
@@ -3183,7 +3249,14 @@ const addAnnotationOperationImplementation = ({
     });
     if (!trimmedSelection)
       throw new Error("Unable to find trimmed selection");
-    const newRange = toSlateRange(trimmedSelection, editor);
+    const newRange = toSlateRange({
+      context: {
+        schema: context.schema,
+        value: operation.editor.value,
+        selection: trimmedSelection
+      },
+      blockIndexMap: operation.editor.blockIndexMap
+    });
     if (!newRange)
       throw new Error("Unable to find new selection");
     const splitTextNodes = slate.Range.isRange(newRange) ? [...slate.Editor.nodes(editor, {
@@ -3244,7 +3317,14 @@ const addAnnotationOperationImplementation = ({
     }), operation.editor.children.length === 0 && slate.Transforms.insertNodes(operation.editor, createPlaceholderBlock(context));
     return;
   }
-  const range = toSlateRange(operation.at, operation.editor);
+  const range = toSlateRange({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: operation.at
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!range)
     throw new Error(`Failed to get Slate Range for selection ${JSON.stringify(operation.at)}`);
   operation.editor.delete({
@@ -3517,9 +3597,22 @@ const moveBackwardOperationImplementation = ({
     reverse: !0
   });
 }, moveBlockOperationImplementation = ({
+  context,
   operation
 }) => {
-  const at = [toSlatePath(operation.at, operation.editor)[0]], to = [toSlatePath(operation.to, operation.editor)[0]];
+  const at = [toSlatePath({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  }, operation.at).path[0]], to = [toSlatePath({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  }, operation.to).path[0]];
   slate.Transforms.moveNodes(operation.editor, {
     at,
     to,
@@ -3533,9 +3626,17 @@ const moveBackwardOperationImplementation = ({
     distance: operation.distance
   });
 }, selectOperationImplementation = ({
+  context,
   operation
 }) => {
-  const newSelection = toSlateRange(operation.at, operation.editor);
+  const newSelection = toSlateRange({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: operation.at
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   newSelection ? slate.Transforms.select(operation.editor, newSelection) : slate.Transforms.deselect(operation.editor);
 }, behaviorOperationImplementations = {
   "annotation.add": addAnnotationOperationImplementation,
@@ -5171,7 +5272,7 @@ function createEditorDom(sendBack, slateEditor) {
 function getBlockNodes(slateEditor, snapshot) {
   if (!snapshot.context.selection)
     return [];
-  const range = toSlateRange(snapshot.context.selection, slateEditor);
+  const range = toSlateRange(snapshot);
   if (!range)
     return [];
   try {
@@ -5187,7 +5288,7 @@ function getBlockNodes(slateEditor, snapshot) {
 function getChildNodes(slateEditor, snapshot) {
   if (!snapshot.context.selection)
     return [];
-  const range = toSlateRange(snapshot.context.selection, slateEditor);
+  const range = toSlateRange(snapshot);
   if (!range)
     return [];
   try {
@@ -5931,16 +6032,16 @@ const coreDndBehaviors = [
       dragOrigin,
       dropPosition,
       originEvent
-    }) => [...draggingEntireBlocks ? draggedBlocks.map((block) => behaviors_index.raise({
+    }) => [behaviors_index.raise({
+      type: "select",
+      at: dropPosition
+    }), ...draggingEntireBlocks ? draggedBlocks.map((block) => behaviors_index.raise({
       type: "delete.block",
       at: block.path
     })) : [behaviors_index.raise({
       type: "delete",
       at: dragOrigin.selection
     })], behaviors_index.raise({
-      type: "select",
-      at: dropPosition
-    }), behaviors_index.raise({
       type: "insert.blocks",
       blocks: event.data,
       placement: draggingEntireBlocks ? originEvent.position.block === "start" ? "before" : originEvent.position.block === "end" ? "after" : "auto" : "auto"
@@ -8502,7 +8603,14 @@ function createEditableAPI(editor, editorActor) {
       });
     },
     select: (selection) => {
-      const slateSelection = toSlateRange(selection, editor);
+      const slateSelection = toSlateRange({
+        context: {
+          schema: editorActor.getSnapshot().context.schema,
+          value: editor.value,
+          selection
+        },
+        blockIndexMap: editor.blockIndexMap
+      });
       slateSelection ? slate.Transforms.select(editor, slateSelection) : slate.Transforms.deselect(editor), editor.onChange();
     },
     focusBlock: () => {
@@ -8608,15 +8716,22 @@ function createEditableAPI(editor, editorActor) {
     isVoid: (element) => ![types2.block.name, types2.span.name].includes(element._type),
     findByPath: (path) => {
       const slatePath = toSlateRange({
-        focus: {
-          path,
-          offset: 0
+        context: {
+          schema: editorActor.getSnapshot().context.schema,
+          value: editor.value,
+          selection: {
+            focus: {
+              path,
+              offset: 0
+            },
+            anchor: {
+              path,
+              offset: 0
+            }
+          }
         },
-        anchor: {
-          path,
-          offset: 0
-        }
-      }, editor);
+        blockIndexMap: editor.blockIndexMap
+      });
       if (slatePath) {
         const [block, blockPath] = slate.Editor.node(editor, slatePath.focus.path.slice(0, 1));
         if (block && blockPath && typeof block._key == "string") {
@@ -8698,7 +8813,14 @@ function createEditableAPI(editor, editorActor) {
     },
     delete: (selection, options) => {
       if (selection) {
-        const range = toSlateRange(selection, editor);
+        const range = toSlateRange({
+          context: {
+            schema: editorActor.getSnapshot().context.schema,
+            value: editor.value,
+            selection
+          },
+          blockIndexMap: editor.blockIndexMap
+        });
         if (!(range && range.anchor.path.length > 0 && range.focus.path.length > 0))
           throw new Error("Invalid range");
         if (range) {
@@ -8710,7 +8832,7 @@ function createEditableAPI(editor, editorActor) {
             }), editor.onChange();
             return;
           }
-          options?.mode === "blocks" && (debug$5("Deleting blocks touched by selection"), slate.Transforms.removeNodes(editor, {
+          if (options?.mode === "blocks" && (debug$5("Deleting blocks touched by selection"), slate.Transforms.removeNodes(editor, {
             at: range,
             voids: !0,
             match: (node) => editor.isTextBlock(node) || !editor.isTextBlock(node) && slate.Element.isElement(node)
@@ -8719,9 +8841,17 @@ function createEditableAPI(editor, editorActor) {
             voids: !0,
             match: (node) => node._type === types2.span.name || // Text children
             !editor.isTextBlock(node) && slate.Element.isElement(node)
-          })), editor.children.length === 0 && (editor.children = [editor.pteCreateTextBlock({
-            decorators: []
-          })]), editor.onChange();
+          })), editor.children.length === 0) {
+            const placeholderBlock = createPlaceholderBlock(editorActor.getSnapshot().context);
+            editor.children = [placeholderBlock], editor.value = [placeholderBlock], buildIndexMaps({
+              schema: editorActor.getSnapshot().context.schema,
+              value: editor.value
+            }, {
+              blockIndexMap: editor.blockIndexMap,
+              listIndexMap: editor.listIndexMap
+            });
+          }
+          editor.onChange();
         }
       }
     },
@@ -8759,7 +8889,21 @@ function createEditableAPI(editor, editorActor) {
     },
     getFragment: () => fromSlateValue(editor.getFragment(), types2.block.name),
     isSelectionsOverlapping: (selectionA, selectionB) => {
-      const rangeA = toSlateRange(selectionA, editor), rangeB = toSlateRange(selectionB, editor);
+      const rangeA = toSlateRange({
+        context: {
+          schema: editorActor.getSnapshot().context.schema,
+          value: editor.value,
+          selection: selectionA
+        },
+        blockIndexMap: editor.blockIndexMap
+      }), rangeB = toSlateRange({
+        context: {
+          schema: editorActor.getSnapshot().context.schema,
+          value: editor.value,
+          selection: selectionB
+        },
+        blockIndexMap: editor.blockIndexMap
+      });
       return slate.Range.isRange(rangeA) && slate.Range.isRange(rangeB) && slate.Range.includes(rangeA, rangeB);
     }
   };
@@ -10727,7 +10871,14 @@ const slateOperationCallback = ({
     }) => {
       const rangeDecorationState = [];
       for (const rangeDecoration of context.pendingRangeDecorations) {
-        const slateRange = toSlateRange(rangeDecoration.selection, context.slateEditor);
+        const slateRange = toSlateRange({
+          context: {
+            schema: context.schema,
+            value: context.slateEditor.value,
+            selection: rangeDecoration.selection
+          },
+          blockIndexMap: context.slateEditor.blockIndexMap
+        });
         if (!slate.Range.isRange(slateRange)) {
           rangeDecoration.onMoved?.({
             newSelection: null,
@@ -10751,7 +10902,14 @@ const slateOperationCallback = ({
         return;
       const rangeDecorationState = [];
       for (const rangeDecoration of event.rangeDecorations) {
-        const slateRange = toSlateRange(rangeDecoration.selection, context.slateEditor);
+        const slateRange = toSlateRange({
+          context: {
+            schema: context.schema,
+            value: context.slateEditor.value,
+            selection: rangeDecoration.selection
+          },
+          blockIndexMap: context.slateEditor.blockIndexMap
+        });
         if (!slate.Range.isRange(slateRange)) {
           rangeDecoration.onMoved?.({
             newSelection: null,
@@ -10775,7 +10933,14 @@ const slateOperationCallback = ({
         return;
       const rangeDecorationState = [];
       for (const decoratedRange of context.slateEditor.decoratedRanges) {
-        const slateRange = toSlateRange(decoratedRange.rangeDecoration.selection, context.slateEditor);
+        const slateRange = toSlateRange({
+          context: {
+            schema: context.schema,
+            value: context.slateEditor.value,
+            selection: decoratedRange.rangeDecoration.selection
+          },
+          blockIndexMap: context.slateEditor.blockIndexMap
+        });
         if (!slate.Range.isRange(slateRange)) {
           decoratedRange.rangeDecoration.onMoved?.({
             newSelection: null,
@@ -11029,7 +11194,14 @@ const debug = debugWithName("component:Editable"), PortableTextEditable = React.
       const normalizedSelection = normalizeSelection(propsSelection, fromSlateValue(slateEditor.children, editorActor.getSnapshot().context.schema.block.name));
       if (normalizedSelection !== null) {
         debug(`Normalized selection from props ${JSON.stringify(normalizedSelection)}`);
-        const slateRange = toSlateRange(normalizedSelection, slateEditor);
+        const slateRange = toSlateRange({
+          context: {
+            schema: editorActor.getSnapshot().context.schema,
+            value: slateEditor.value,
+            selection: normalizedSelection
+          },
+          blockIndexMap: slateEditor.blockIndexMap
+        });
         slateRange && (slate.Transforms.select(slateEditor, slateRange), slateEditor.operations.some((o) => o.type === "set_selection") || editorActor.send({
           type: "update selection",
           selection: normalizedSelection