@portabletext/editor 1.52.1 → 1.52.3

package/lib/index.js

@@ -7,7 +7,7 @@ import { useSelector, useActorRef } from "@xstate/react";
 import noop from "lodash/noop.js";
 import { Element as Element$1, Text, Range, Editor, Node, Point, Transforms, Path, Operation, createEditor } from "slate";
 import { useSlateStatic, useSelected, withReact, ReactEditor, Slate, useSlate, Editable } from "slate-react";
-import debug$h from "debug";
+import debug$g from "debug";
 import { DOMEditor, isDOMNode } from "slate-dom";
 import { getBlockStartPoint, getBlockKeyFromSelectionPoint, isTextBlock, parseBlock, sliceBlocks, parseAnnotation, blockOffsetToSpanSelectionPoint, parseInlineObject, isKeyedSegment, isSpan$1 as isSpan, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText, parseBlocks } from "./_chunks-es/selection-point.js";
 import { getBlockEndPoint, isEmptyTextBlock, isEqualSelectionPoints } from "./_chunks-es/util.is-equal-selection-points.js";
@@ -47,10 +47,10 @@ function EditorEventListener(props) {
   return $[3] !== editor ? (t1 = [editor], $[3] = editor, $[4] = t1) : t1 = $[4], useEffect(t0, t1), null;
 }
 const rootName = "sanity-pte:";
-debug$h(rootName);
+debug$g(rootName);
 function debugWithName(name) {
   const namespace = `${rootName}${name}`;
-  return debug$h && debug$h.enabled(namespace) ? debug$h(namespace) : debug$h(rootName);
+  return debug$g && debug$g.enabled(namespace) ? debug$g(namespace) : debug$g(rootName);
 }
 const VOID_CHILD_KEY = "void-child";
 function keepObjectEquality(object, keyMap) {
@@ -1512,7 +1512,7 @@ function getEditorSnapshot({
     }
   };
 }
-const debug$g = debugWithName("plugin:withPortableTextMarkModel");
+const debug$f = debugWithName("plugin:withPortableTextMarkModel");
 function createWithPortableTextMarkModel(editorActor) {
   return function(editor) {
     const {
@@ -1526,7 +1526,7 @@ function createWithPortableTextMarkModel(editorActor) {
         for (const [child, childPath] of children) {
           const nextNode = node.children[childPath[1] + 1];
           if (editor.isTextSpan(child) && editor.isTextSpan(nextNode) && child.marks?.every((mark) => nextNode.marks?.includes(mark)) && nextNode.marks?.every((mark) => child.marks?.includes(mark))) {
-            debug$g("Merging spans", JSON.stringify(child, null, 2), JSON.stringify(nextNode, null, 2)), editorActor.send({
+            debug$f("Merging spans", JSON.stringify(child, null, 2), JSON.stringify(nextNode, null, 2)), editorActor.send({
               type: "normalizing"
             }), Transforms.mergeNodes(editor, {
               at: [childPath[0], childPath[1] + 1],
@@ -1539,7 +1539,7 @@ function createWithPortableTextMarkModel(editorActor) {
         }
       }
       if (editor.isTextBlock(node) && !Array.isArray(node.markDefs)) {
-        debug$g("Adding .markDefs to block node"), editorActor.send({
+        debug$f("Adding .markDefs to block node"), editorActor.send({
           type: "normalizing"
         }), Transforms.setNodes(editor, {
           markDefs: []
@@ -1551,7 +1551,7 @@ function createWithPortableTextMarkModel(editorActor) {
         return;
       }
       if (editor.isTextSpan(node) && !Array.isArray(node.marks)) {
-        debug$g("Adding .marks to span node"), editorActor.send({
+        debug$f("Adding .marks to span node"), editorActor.send({
           type: "normalizing"
         }), Transforms.setNodes(editor, {
           marks: []
@@ -1565,7 +1565,7 @@ function createWithPortableTextMarkModel(editorActor) {
       if (editor.isTextSpan(node)) {
         const blockPath = Path.parent(path), [block] = Editor.node(editor, blockPath), decorators2 = editorActor.getSnapshot().context.schema.decorators.map((decorator) => decorator.name), annotations = node.marks?.filter((mark) => !decorators2.includes(mark));
         if (editor.isTextBlock(block) && node.text === "" && annotations && annotations.length > 0) {
-          debug$g("Removing annotations from empty span node"), editorActor.send({
+          debug$f("Removing annotations from empty span node"), editorActor.send({
             type: "normalizing"
           }), Transforms.setNodes(editor, {
             marks: node.marks?.filter((mark) => decorators2.includes(mark))
@@ -1583,7 +1583,7 @@ function createWithPortableTextMarkModel(editorActor) {
           if (editor.isTextSpan(child)) {
             const marks = child.marks ?? [], orphanedAnnotations = marks.filter((mark) => !decorators2.includes(mark) && !node.markDefs?.find((def) => def._key === mark));
             if (orphanedAnnotations.length > 0) {
-              debug$g("Removing orphaned annotations from span node"), editorActor.send({
+              debug$f("Removing orphaned annotations from span node"), editorActor.send({
                 type: "normalizing"
               }), Transforms.setNodes(editor, {
                 marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
@@ -1601,7 +1601,7 @@ function createWithPortableTextMarkModel(editorActor) {
         if (editor.isTextBlock(block)) {
           const decorators2 = editorActor.getSnapshot().context.schema.decorators.map((decorator) => decorator.name), marks = node.marks ?? [], orphanedAnnotations = marks.filter((mark) => !decorators2.includes(mark) && !block.markDefs?.find((def) => def._key === mark));
           if (orphanedAnnotations.length > 0) {
-            debug$g("Removing orphaned annotations from span node"), editorActor.send({
+            debug$f("Removing orphaned annotations from span node"), editorActor.send({
               type: "normalizing"
             }), Transforms.setNodes(editor, {
               marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
@@ -1619,7 +1619,7 @@ function createWithPortableTextMarkModel(editorActor) {
         for (const markDef of markDefs)
           markDefKeys.has(markDef._key) || (markDefKeys.add(markDef._key), newMarkDefs.push(markDef));
         if (markDefs.length !== newMarkDefs.length) {
-          debug$g("Removing duplicate markDefs"), editorActor.send({
+          debug$f("Removing duplicate markDefs"), editorActor.send({
             type: "normalizing"
           }), Transforms.setNodes(editor, {
             markDefs: newMarkDefs
@@ -1634,7 +1634,7 @@ function createWithPortableTextMarkModel(editorActor) {
       if (editor.isTextBlock(node) && !editor.operations.some((op) => op.type === "merge_node" && "markDefs" in op.properties && op.path.length === 1)) {
         const newMarkDefs = (node.markDefs || []).filter((def) => node.children.find((child) => Text.isText(child) && Array.isArray(child.marks) && child.marks.includes(def._key)));
         if (node.markDefs && !isEqual(newMarkDefs, node.markDefs)) {
-          debug$g("Removing markDef not in use"), editorActor.send({
+          debug$f("Removing markDef not in use"), editorActor.send({
             type: "normalizing"
           }), Transforms.setNodes(editor, {
             markDefs: newMarkDefs
@@ -1787,7 +1787,7 @@ function createWithPortableTextMarkModel(editorActor) {
         const [targetBlock, targetPath] = Editor.node(editor, [op.path[0] - 1]);
         if (editor.isTextBlock(targetBlock)) {
           const oldDefs = Array.isArray(targetBlock.markDefs) && targetBlock.markDefs || [], newMarkDefs = uniq([...oldDefs, ...op.properties.markDefs]);
-          debug$g("Copying markDefs over to merged block", op), Transforms.setNodes(editor, {
+          debug$f("Copying markDefs over to merged block", op), Transforms.setNodes(editor, {
             markDefs: newMarkDefs
           }, {
             at: targetPath,
@@ -2497,7 +2497,7 @@ function withUndoStep(editor, fn) {
 function getCurrentUndoStepId(editor) {
   return CURRENT_UNDO_STEP.get(editor)?.undoStepId;
 }
-const debug$f = debugWithName("plugin:withUndoRedo"), SAVING = /* @__PURE__ */ new WeakMap(), REMOTE_PATCHES = /* @__PURE__ */ new WeakMap(), UNDO_STEP_LIMIT = 1e3, isSaving = (editor) => {
+const debug$e = debugWithName("plugin:withUndoRedo"), SAVING = /* @__PURE__ */ new WeakMap(), REMOTE_PATCHES = /* @__PURE__ */ new WeakMap(), UNDO_STEP_LIMIT = 1e3, isSaving = (editor) => {
   const state = SAVING.get(editor);
   return state === void 0 ? !0 : state;
 }, getRemotePatches = (editor) => (REMOTE_PATCHES.get(editor) || REMOTE_PATCHES.set(editor, []), REMOTE_PATCHES.get(editor) || []);
@@ -2510,7 +2510,7 @@ function createWithUndoRedo(options) {
     const remotePatches = getRemotePatches(editor);
     let previousUndoStepId = getCurrentUndoStepId(editor);
     options.subscriptions.push(() => {
-      debug$f("Subscribing to patches");
+      debug$e("Subscribing to patches");
       const sub = editorActor.on("patches", ({
         patches,
         snapshot
@@ -2519,7 +2519,7 @@ function createWithUndoRedo(options) {
         patches.forEach((patch) => {
           if (!reset && patch.origin !== "local" && remotePatches) {
             if (patch.type === "unset" && patch.path.length === 0) {
-              debug$f("Someone else cleared the content, resetting undo/redo history"), editor.history = {
+              debug$e("Someone else cleared the content, resetting undo/redo history"), editor.history = {
                 undos: [],
                 redos: []
               }, remotePatches.splice(0, remotePatches.length), SAVING.set(editor, !0), reset = !0;
@@ -2535,7 +2535,7 @@ function createWithUndoRedo(options) {
         }), previousSnapshot = snapshot;
       });
       return () => {
-        debug$f("Unsubscribing to patches"), sub.unsubscribe();
+        debug$e("Unsubscribing to patches"), sub.unsubscribe();
       };
     }), editor.history = {
       undos: [],
@@ -2574,7 +2574,7 @@ function createWithUndoRedo(options) {
             operations: [...editor.selection === null ? [] : [createSelectOperation(editor)], op],
             timestamp: /* @__PURE__ */ new Date()
           };
-          undos.push(newStep), debug$f("Created new undo step", step);
+          undos.push(newStep), debug$e("Created new undo step", step);
         }
         for (; undos.length > UNDO_STEP_LIMIT; )
           undos.shift();
@@ -2592,7 +2592,7 @@ const historyUndoOperationImplementation = ({
   } = editor.history, remotePatches = getRemotePatches(editor);
   if (undos.length > 0) {
     const step = undos[undos.length - 1];
-    if (debug$f("Undoing", step), step.operations.length > 0) {
+    if (debug$e("Undoing", step), step.operations.length > 0) {
       const otherPatches = remotePatches.filter((item) => item.time >= step.timestamp);
       let transformedOperations = step.operations;
       otherPatches.forEach((item) => {
@@ -2610,7 +2610,7 @@ const historyUndoOperationImplementation = ({
           });
         });
       } catch (err) {
-        debug$f("Could not perform undo step", err), remotePatches.splice(0, remotePatches.length), Transforms.deselect(editor), editor.history = {
+        debug$e("Could not perform undo step", err), remotePatches.splice(0, remotePatches.length), Transforms.deselect(editor), editor.history = {
           undos: [],
           redos: []
         }, SAVING.set(editor, !0), setIsUndoing(editor, !1), editor.onChange();
@@ -2627,7 +2627,7 @@ const historyUndoOperationImplementation = ({
   } = editor.history, remotePatches = getRemotePatches(editor);
   if (redos.length > 0) {
     const step = redos[redos.length - 1];
-    if (debug$f("Redoing", step), step.operations.length > 0) {
+    if (debug$e("Redoing", step), step.operations.length > 0) {
       const otherPatches = remotePatches.filter((item) => item.time >= step.timestamp);
       let transformedOperations = step.operations;
       otherPatches.forEach((item) => {
@@ -2644,7 +2644,7 @@ const historyUndoOperationImplementation = ({
           });
         });
       } catch (err) {
-        debug$f("Could not perform redo step", err), remotePatches.splice(0, remotePatches.length), Transforms.deselect(editor), editor.history = {
+        debug$e("Could not perform redo step", err), remotePatches.splice(0, remotePatches.length), Transforms.deselect(editor), editor.history = {
           undos: [],
           redos: []
         }, SAVING.set(editor, !0), setIsRedoing(editor, !1), editor.onChange();
@@ -2662,16 +2662,16 @@ function transformOperation(editor, patch, operation, snapshot, previousSnapshot
     const insertBlockIndex = (snapshot || []).findIndex((blk) => isEqual({
       _key: blk._key
     }, patch.path[0]));
-    return debug$f(`Adjusting block path (+${patch.items.length}) for '${transformedOperation.type}' operation and patch '${patch.type}'`), [adjustBlockPath(transformedOperation, patch.items.length, insertBlockIndex)];
+    return debug$e(`Adjusting block path (+${patch.items.length}) for '${transformedOperation.type}' operation and patch '${patch.type}'`), [adjustBlockPath(transformedOperation, patch.items.length, insertBlockIndex)];
   }
   if (patch.type === "unset" && patch.path.length === 1) {
     const unsetBlockIndex = (previousSnapshot || []).findIndex((blk) => isEqual({
       _key: blk._key
     }, patch.path[0]));
-    return "path" in transformedOperation && Array.isArray(transformedOperation.path) && transformedOperation.path[0] === unsetBlockIndex ? (debug$f("Skipping transformation that targeted removed block"), []) : [adjustBlockPath(transformedOperation, -1, unsetBlockIndex)];
+    return "path" in transformedOperation && Array.isArray(transformedOperation.path) && transformedOperation.path[0] === unsetBlockIndex ? (debug$e("Skipping transformation that targeted removed block"), []) : [adjustBlockPath(transformedOperation, -1, unsetBlockIndex)];
   }
   if (patch.type === "unset" && patch.path.length === 0)
-    return debug$f(`Adjusting selection for unset everything patch and ${operation.type} operation`), [];
+    return debug$e(`Adjusting selection for unset everything patch and ${operation.type} operation`), [];
   if (patch.type === "diffMatchPatch") {
     const operationTargetBlock = findOperationTargetBlock(editor, transformedOperation);
     return !operationTargetBlock || !isEqual({
@@ -3121,6 +3121,7 @@ const addAnnotationOperationImplementation = ({
     };
   }
 }, deleteOperationImplementation = ({
+  context,
   operation
 }) => {
   const anchorBlockKey = getBlockKeyFromSelectionPoint(operation.at.anchor), focusBlockKey = getBlockKeyFromSelectionPoint(operation.at.focus), anchorBlockPath = anchorBlockKey !== void 0 ? getBlockPath({
@@ -3133,7 +3134,7 @@ const addAnnotationOperationImplementation = ({
   if (operation.at.anchor.path.length === 1 && operation.at.focus.path.length === 1 && anchorBlockPath && focusBlockPath && anchorBlockPath[0] === focusBlockPath[0]) {
     Transforms.removeNodes(operation.editor, {
       at: [anchorBlockPath[0]]
-    });
+    }), operation.editor.children.length === 0 && Transforms.insertNodes(operation.editor, createPlaceholderBlock(context));
     return;
   }
   const range = toSlateRange(operation.at, operation.editor);
@@ -4436,7 +4437,7 @@ function withoutPatching(editor, fn) {
 function isPatching(editor) {
   return PATCHING.get(editor);
 }
-const debug$e = debugWithName("plugin:withPatches");
+const debug$d = debugWithName("plugin:withPatches");
 function createWithPatches({
   editorActor,
   relayActor,
@@ -4461,7 +4462,7 @@ function createWithPatches({
           withoutPatching(editor, () => {
             withoutSaving(editor, () => {
               for (const patch of patches) {
-                debug$e.enabled && debug$e(`Handling remote patch ${JSON.stringify(patch)}`);
+                debug$d.enabled && debug$d(`Handling remote patch ${JSON.stringify(patch)}`);
                 try {
                   changed = applyPatch(editor, patch);
                 } catch (error) {
@@ -4479,10 +4480,10 @@ function createWithPatches({
       remotePatches.length !== 0 && (bufferedPatches = bufferedPatches.concat(remotePatches), handleBufferedRemotePatches());
     };
     return subscriptions.push(() => {
-      debug$e("Subscribing to remote patches");
+      debug$d("Subscribing to remote patches");
       const sub = editorActor.on("patches", handlePatches);
       return () => {
-        debug$e("Unsubscribing to remote patches"), sub.unsubscribe();
+        debug$d("Unsubscribing to remote patches"), sub.unsubscribe();
       };
     }), editor.apply = (operation) => {
       let patches = [];
@@ -4536,7 +4537,7 @@ function createWithPatches({
     }, editor;
   };
 }
-const debug$d = debugWithName("plugin:withPlaceholderBlock");
+const debug$c = debugWithName("plugin:withPlaceholderBlock");
 function createWithPlaceholderBlock(editorActor) {
   return function(editor) {
     const {
@@ -4561,7 +4562,7 @@ function createWithPlaceholderBlock(editorActor) {
         const node = op.node;
         if (op.path[0] === 0 && Editor.isVoid(editor, node)) {
           const nextPath = Path.next(op.path);
-          editor.children[nextPath[0]] || (debug$d("Adding placeholder block"), Editor.insertNode(editor, editor.pteCreateTextBlock({
+          editor.children[nextPath[0]] || (debug$c("Adding placeholder block"), Editor.insertNode(editor, editor.pteCreateTextBlock({
             decorators: []
           })));
         }
@@ -4570,36 +4571,6 @@ function createWithPlaceholderBlock(editorActor) {
     }, editor;
   };
 }
-const debug$c = debugWithName("plugin:withPortableTextBlockStyle");
-function createWithPortableTextBlockStyle(editorActor) {
-  const defaultStyle = editorActor.getSnapshot().context.schema.styles[0].name;
-  return function(editor) {
-    const {
-      normalizeNode
-    } = editor;
-    return editor.normalizeNode = (nodeEntry) => {
-      const [, path] = nodeEntry;
-      for (const op of editor.operations)
-        if (op.type === "split_node" && op.path.length === 1 && editor.isTextBlock(op.properties) && op.properties.style !== defaultStyle && op.path[0] === path[0] && !Path.equals(path, op.path)) {
-          const [child] = Editor.node(editor, [op.path[0] + 1, 0]);
-          if (Text.isText(child) && child.text === "") {
-            debug$c(`Normalizing split node to ${defaultStyle} style`, op), editorActor.send({
-              type: "normalizing"
-            }), Transforms.setNodes(editor, {
-              style: defaultStyle
-            }, {
-              at: [op.path[0] + 1],
-              voids: !1
-            }), editorActor.send({
-              type: "done normalizing"
-            });
-            return;
-          }
-        }
-      normalizeNode(nodeEntry);
-    }, editor;
-  };
-}
 debugWithName("plugin:withPortableTextSelections");
 function createWithPortableTextSelections(editorActor) {
   let prevSelection = null;
@@ -5092,10 +5063,10 @@ const withPlugins = (editor, options) => {
   }), withMaxBlocks = createWithMaxBlocks(editorActor), withUndoRedo = createWithUndoRedo({
     editorActor,
     subscriptions: options.subscriptions
-  }), withPortableTextMarkModel = createWithPortableTextMarkModel(editorActor), withPortableTextBlockStyle = createWithPortableTextBlockStyle(editorActor), withPlaceholderBlock = createWithPlaceholderBlock(editorActor), withUtils = createWithUtils({
+  }), withPortableTextMarkModel = createWithPortableTextMarkModel(editorActor), withPlaceholderBlock = createWithPlaceholderBlock(editorActor), withUtils = createWithUtils({
     editorActor
   }), withPortableTextSelections = createWithPortableTextSelections(editorActor);
-  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPortableTextBlockStyle(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(withPortableTextSelections(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateMarkState(editorActor.getSnapshot().context, e)))))))))))));
+  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(withPortableTextSelections(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateMarkState(editorActor.getSnapshot().context, e))))))))))));
 }, debug$a = debugWithName("setup");
 function createSlateEditor(config) {
   debug$a("Creating new Slate editor instance");
@@ -10778,18 +10749,21 @@ const debug = debugWithName("component:Editable"), PortableTextEditable = forwar
     debug("No result from custom paste handler, pasting normally");
   }, [editorActor, onPaste, portableTextEditor, relayActor, slateEditor]), handleOnFocus = useCallback((event_2) => {
     if (onFocus && onFocus(event_2), !event_2.isDefaultPrevented()) {
-      const selection_3 = PortableTextEditor.getSelection(portableTextEditor);
-      selection_3 === null && (Transforms.select(slateEditor, Editor.start(slateEditor, [])), slateEditor.onChange()), relayActor.send({
+      relayActor.send({
         type: "focused",
         event: event_2
       });
-      const newSelection = PortableTextEditor.getSelection(portableTextEditor);
-      selection_3 === newSelection && editorActor.send({
+      const selection_3 = slateEditor.selection ? slateRangeToSelection({
+        schema: editorActor.getSnapshot().context.schema,
+        editor: slateEditor,
+        range: slateEditor.selection
+      }) : null;
+      selection_3 && editorActor.send({
         type: "update selection",
         selection: selection_3
       });
     }
-  }, [editorActor, onFocus, slateEditor, portableTextEditor, relayActor]), handleClick = useCallback((event_3) => {
+  }, [editorActor, onFocus, slateEditor, relayActor]), handleClick = useCallback((event_3) => {
     if (onClick && onClick(event_3), event_3.isDefaultPrevented() || event_3.isPropagationStopped())
       return;
     const position_3 = getEventPosition({