@portabletext/editor 1.44.1 → 1.44.2

package/lib/_chunks-es/editor-provider.js

@@ -14,7 +14,7 @@ import isPlainObject from "lodash/isPlainObject.js";
 import uniq from "lodash/uniq.js";
 import getRandomValues from "get-random-values-esm";
 import { parseBlock, isTextBlock } from "./parse-blocks.js";
-import { sliceBlocks, blockOffsetToSpanSelectionPoint, isKeyedSegment as isKeyedSegment$1, getBlockEndPoint, getBlockStartPoint, getTextBlockText } from "./util.slice-blocks.js";
+import { sliceBlocks, blockOffsetToSpanSelectionPoint, getBlockEndPoint, getBlockStartPoint, getTextBlockText } from "./util.slice-blocks.js";
 import { htmlToBlocks } from "@portabletext/block-tools";
 import { toHTML } from "@portabletext/to-html";
 import { Schema } from "@sanity/schema";
@@ -341,10 +341,7 @@ function isEqualToEmptyEditor(children, schemaTypes) {
 function getFocusBlock({
   editor
 }) {
-  return editor.selection ? Array.from(Editor.nodes(editor, {
-    at: editor.selection.focus.path.slice(0, 1),
-    match: (n) => !Editor.isEditor(n)
-  })).at(0) ?? [void 0, void 0] : [void 0, void 0];
+  return editor.selection ? Editor.node(editor, editor.selection.focus.path.slice(0, 1)) ?? [void 0, void 0] : [void 0, void 0];
 }
 function getFocusChild({
   editor
@@ -4452,63 +4449,6 @@ const insertTextActionImplementation = ({
     to,
     mode: "highest"
   });
-}, moveBlockDownActionImplementation = ({
-  context,
-  action
-}) => {
-  const at = [toSlatePath(action.at, action.editor)[0]], to = [Path.next(at)[0]], selection = toPortableTextRange(action.editor.children, {
-    anchor: {
-      path: to,
-      offset: 0
-    },
-    focus: {
-      path: to,
-      offset: 0
-    }
-  }, context.schema), destinationBlockKey = selection && isKeyedSegment$1(selection.focus.path[0]) ? selection.focus.path[0]._key : void 0;
-  if (destinationBlockKey === void 0) {
-    console.error("Could not find destination block key");
-    return;
-  }
-  moveBlockActionImplementation({
-    action: {
-      at: action.at,
-      to: [{
-        _key: destinationBlockKey
-      }],
-      editor: action.editor
-    }
-  });
-}, moveBlockUpActionImplementation = ({
-  context,
-  action
-}) => {
-  const at = [toSlatePath(action.at, action.editor)[0]];
-  if (!Path.hasPrevious(at))
-    return;
-  const to = [Path.previous(at)[0]], selection = toPortableTextRange(action.editor.children, {
-    anchor: {
-      path: to,
-      offset: 0
-    },
-    focus: {
-      path: to,
-      offset: 0
-    }
-  }, context.schema), destinationBlockKey = selection && isKeyedSegment$1(selection.focus.path[0]) ? selection.focus.path[0]._key : void 0;
-  if (destinationBlockKey === void 0) {
-    console.error("Could not find destination block key");
-    return;
-  }
-  moveBlockActionImplementation({
-    action: {
-      at: action.at,
-      to: [{
-        _key: destinationBlockKey
-      }],
-      editor: action.editor
-    }
-  });
 }, noopActionImplementation = () => {
 }, selectActionImplementation = ({
   action
@@ -4539,8 +4479,6 @@ const insertTextActionImplementation = ({
   "insert.text": insertTextActionImplementation,
   effect: effectActionImplementation,
   "move.block": moveBlockActionImplementation,
-  "move.block down": moveBlockDownActionImplementation,
-  "move.block up": moveBlockUpActionImplementation,
   noop: noopActionImplementation,
   select: selectActionImplementation
 };
@@ -4710,20 +4648,6 @@ function performAction({
       });
       break;
     }
-    case "move.block down": {
-      behaviorActionImplementations["move.block down"]({
-        context,
-        action
-      });
-      break;
-    }
-    case "move.block up": {
-      behaviorActionImplementations["move.block up"]({
-        context,
-        action
-      });
-      break;
-    }
     case "noop":
       break;
     default: {
@@ -4735,65 +4659,10 @@ function performAction({
     }
   }
 }
-function createWithEventListeners(editorActor, subscriptions) {
+function createWithEventListeners(editorActor) {
   return function(editor) {
     if (editorActor.getSnapshot().context.maxBlocks !== void 0)
       return editor;
-    subscriptions.push(() => {
-      const subscription = editorActor.on("*", (event) => {
-        switch (event.type) {
-          // These events are not relevant for Behaviors
-          case "blurred":
-          case "done loading":
-          case "editable":
-          case "error":
-          case "focused":
-          case "invalid value":
-          case "loading":
-          case "mutation":
-          case "patch":
-          case "internal.patch":
-          case "patches":
-          case "read only":
-          case "ready":
-          case "selection":
-          case "value changed":
-          case "unset":
-            break;
-          case "custom.*":
-            editorActor.send({
-              type: "custom behavior event",
-              behaviorEvent: event.event,
-              editor
-            });
-            break;
-          case "insert.block object":
-            editorActor.send({
-              type: "behavior event",
-              behaviorEvent: {
-                type: "insert.block",
-                block: {
-                  _type: event.blockObject.name,
-                  ...event.blockObject.value ?? {}
-                },
-                placement: event.placement
-              },
-              editor
-            });
-            break;
-          default:
-            editorActor.send({
-              type: "behavior event",
-              behaviorEvent: event,
-              editor
-            });
-            break;
-        }
-      });
-      return () => {
-        subscription.unsubscribe();
-      };
-    });
     const {
       deleteBackward,
       deleteForward,
@@ -5604,7 +5473,7 @@ const withPlugins = (editor, options) => {
     editorActor,
     schemaTypes
   }), withPortableTextSelections = createWithPortableTextSelections(editorActor, schemaTypes);
-  return createWithEventListeners(editorActor, options.subscriptions)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPortableTextBlockStyle(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(withPortableTextSelections(e)))))))))));
+  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPortableTextBlockStyle(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(withPortableTextSelections(e)))))))))));
 }, debug$3 = debugWithName("component:PortableTextEditor:SlateContainer"), slateEditors = /* @__PURE__ */ new WeakMap();
 function createSlateEditor(config) {
   const existingSlateEditor = slateEditors.get(config.editorActor);
@@ -5626,17 +5495,7 @@ function createSlateEditor(config) {
   };
   return slateEditors.set(config.editorActor, slateEditor), slateEditor;
 }
-const keyIs = {
-  lineBreak: (event) => event.key === "Enter" && event.shiftKey
-}, raiseInsertSoftBreak = defineBehavior({
-  on: "keyboard.keydown",
-  guard: ({
-    event
-  }) => keyIs.lineBreak(event.originEvent),
-  actions: [() => [raise({
-    type: "insert.soft break"
-  })]]
-}), internalAnnotationBehaviors = [defineBehavior({
+const abstractAnnotationBehaviors = [defineBehavior({
   on: "annotation.toggle",
   guard: ({
     snapshot,
@@ -5660,7 +5519,7 @@ const keyIs = {
     type: "annotation.add",
     annotation: event.annotation
   })]]
-})], internalDecoratorBehaviors = [defineBehavior({
+})], abstractDecoratorBehaviors = [defineBehavior({
   on: "decorator.toggle",
   guard: ({
     snapshot,
@@ -5696,7 +5555,7 @@ const keyIs = {
     ...event,
     type: "decorator.add"
   })]]
-})], internalInsertBehaviors = [defineBehavior({
+})], abstractInsertBehaviors = [defineBehavior({
   on: "insert.blocks",
   guard: ({
     event
@@ -5772,7 +5631,7 @@ const keyIs = {
     placement: index === 0 ? "auto" : "after",
     select: "end"
   }))]
-})], internalListItemBehaviors = [defineBehavior({
+})], abstractListItemBehaviors = [defineBehavior({
   on: "list item.add",
   guard: ({
     snapshot
@@ -5829,7 +5688,75 @@ const keyIs = {
     type: "list item.add",
     listItem: event.listItem
   })]]
-})], internalSelectBehaviors = [defineBehavior({
+})], abstractMoveBehaviors = [defineBehavior({
+  on: "move.block up",
+  guard: ({
+    snapshot,
+    event
+  }) => {
+    const previousBlock = getPreviousBlock({
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: {
+            path: event.at,
+            offset: 0
+          },
+          focus: {
+            path: event.at,
+            offset: 0
+          }
+        }
+      }
+    });
+    return previousBlock ? {
+      previousBlock
+    } : !1;
+  },
+  actions: [({
+    event
+  }, {
+    previousBlock
+  }) => [raise({
+    type: "move.block",
+    at: event.at,
+    to: previousBlock.path
+  })]]
+}), defineBehavior({
+  on: "move.block down",
+  guard: ({
+    snapshot,
+    event
+  }) => {
+    const nextBlock = getNextBlock({
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: {
+            path: event.at,
+            offset: 0
+          },
+          focus: {
+            path: event.at,
+            offset: 0
+          }
+        }
+      }
+    });
+    return nextBlock ? {
+      nextBlock
+    } : !1;
+  },
+  actions: [({
+    event
+  }, {
+    nextBlock
+  }) => [raise({
+    type: "move.block",
+    at: event.at,
+    to: nextBlock.path
+  })]]
+})], abstractSelectBehaviors = [defineBehavior({
   on: "select.previous block",
   guard: ({
     snapshot,
@@ -5875,7 +5802,7 @@ const keyIs = {
     type: "select",
     selection
   })]]
-})], internalStyleBehaviors = [defineBehavior({
+})], abstractStyleBehaviors = [defineBehavior({
   on: "style.add",
   guard: ({
     snapshot
@@ -5931,7 +5858,17 @@ const keyIs = {
     type: "style.add",
     style: event.style
   })]]
-})], raiseDeserializationSuccessOrFailure = defineBehavior({
+})], keyIs = {
+  lineBreak: (event) => event.key === "Enter" && event.shiftKey
+}, raiseInsertSoftBreak = defineBehavior({
+  on: "keyboard.keydown",
+  guard: ({
+    event
+  }) => keyIs.lineBreak(event.originEvent),
+  actions: [() => [raise({
+    type: "insert.soft break"
+  })]]
+}), raiseDeserializationSuccessOrFailure = defineBehavior({
   on: "deserialize",
   guard: ({
     snapshot,
@@ -6259,43 +6196,30 @@ const keyIs = {
       originEvent: event
     })]]
   }),
-  ...internalAnnotationBehaviors,
-  ...internalDecoratorBehaviors,
-  ...internalInsertBehaviors,
-  ...internalListItemBehaviors,
-  ...internalStyleBehaviors,
-  ...internalSelectBehaviors,
+  ...abstractAnnotationBehaviors,
+  ...abstractDecoratorBehaviors,
+  ...abstractInsertBehaviors,
+  ...abstractListItemBehaviors,
+  ...abstractMoveBehaviors,
+  ...abstractStyleBehaviors,
+  ...abstractSelectBehaviors,
   raiseDeserializationSuccessOrFailure,
   raiseSerializationSuccessOrFailure,
   raiseInsertSoftBreak
-];
-function isKeyboardBehaviorEvent(event) {
-  return event.type.startsWith("keyboard.");
-}
-function isInternalBehaviorEvent(event) {
-  return event.type === "deserialize" || event.type.startsWith("deserialization.") || event.type === "insert.blocks" || event.type.startsWith("list item.") || event.type === "serialize" || event.type.startsWith("serialization.") || event.type === "select.next block" || event.type === "select.previous block" || event.type.startsWith("style.");
+], abstractBehaviorEventTypes = ["annotation.toggle", "decorator.toggle", "deserialize", "deserialization.success", "deserialization.failure", "insert.blocks", "list item.add", "list item.remove", "list item.toggle", "move.block down", "move.block up", "select.previous block", "select.next block", "serialize", "serialization.success", "serialization.failure", "style.add", "style.remove", "style.toggle"];
+function isAbstractBehaviorEvent(event) {
+  return abstractBehaviorEventTypes.includes(event.type);
 }
+const nativeBehaviorEventTypes = ["clipboard.copy", "clipboard.cut", "clipboard.paste", "drag.dragstart", "drag.drag", "drag.dragend", "drag.dragenter", "drag.dragover", "drag.dragleave", "drag.drop", "input.*", "keyboard.keydown", "keyboard.keyup", "mouse.click"];
 function isNativeBehaviorEvent(event) {
-  return isClipboardBehaviorEvent(event) || isDragBehaviorEvent(event) || isInputBehaviorEvent(event) || isKeyboardBehaviorEvent(event) || isMouseBehaviorEvent(event);
-}
-function isClipboardBehaviorEvent(event) {
-  return event.type.startsWith("clipboard.");
-}
-function isDragBehaviorEvent(event) {
-  return event.type.startsWith("drag.");
-}
-function isInputBehaviorEvent(event) {
-  return event.type.startsWith("input.");
-}
-function isMouseBehaviorEvent(event) {
-  return event.type.startsWith("mouse.");
+  return nativeBehaviorEventTypes.includes(event.type);
 }
 function isCustomBehaviorEvent(event) {
   return event.type.startsWith("custom.");
 }
 const debug$2 = debugWithName("behaviors:event");
 function eventCategory(event) {
-  return isNativeBehaviorEvent(event) ? "native" : isInternalBehaviorEvent(event) ? "internal" : isCustomBehaviorEvent(event) ? "custom" : "synthetic";
+  return isNativeBehaviorEvent(event) ? "native" : isAbstractBehaviorEvent(event) ? "abstract" : isCustomBehaviorEvent(event) ? "custom" : "synthetic";
 }
 function performEvent({
   behaviors,
@@ -6308,7 +6232,7 @@ function performEvent({
   defaultActionCallback
 }) {
   debug$2(`(${eventCategory(event)})`, JSON.stringify(event, null, 2));
-  const defaultAction = isCustomBehaviorEvent(event) || isNativeBehaviorEvent(event) || isInternalBehaviorEvent(event) ? void 0 : {
+  const defaultAction = isCustomBehaviorEvent(event) || isNativeBehaviorEvent(event) || isAbstractBehaviorEvent(event) ? void 0 : {
     ...event,
     editor
   }, eventBehaviors = behaviors.filter((behavior) => {
@@ -6427,6 +6351,34 @@ function performEvent({
     }), editor.onChange();
   }
 }
+function slateChildrenToBlocks(schema, value) {
+  const blocks = new Array(value.length);
+  for (let blockIndex = 0; blockIndex < value.length; blockIndex++) {
+    const descendant = value[blockIndex];
+    if (descendant._type !== schema.block.name) {
+      blocks[blockIndex] = {
+        _key: descendant._key,
+        _type: descendant._type,
+        ..."value" in descendant && typeof descendant.value == "object" ? descendant.value : {}
+      };
+      continue;
+    }
+    const children = "children" in descendant ? descendant.children : [], processedChildren = new Array(children.length);
+    for (let childIndex = 0; childIndex < children.length; childIndex++) {
+      const child = children[childIndex];
+      processedChildren[childIndex] = child._type === schema.span.name ? child : {
+        _key: child._key,
+        _type: child._type,
+        ..."value" in child && typeof child.value == "object" ? child.value : {}
+      };
+    }
+    blocks[blockIndex] = {
+      ...descendant,
+      children: processedChildren
+    };
+  }
+  return blocks;
+}
 function getActiveDecorators({
   schema,
   slateEditorInstance
@@ -6445,7 +6397,7 @@ function createEditorSnapshot({
   hasTag,
   internalDrag
 }) {
-  const value = fromSlateValue(editor.children, schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor)), selection = toPortableTextRange(value, editor.selection, schema);
+  const value = slateChildrenToBlocks(schema, editor.children), selection = toPortableTextRange(value, editor.selection, schema);
   return {
     context: {
       activeDecorators: getActiveDecorators({
@@ -6541,7 +6493,7 @@ const editorMachine = setup({
       event,
       self
     }) => {
-      assertEvent(event, ["behavior event", "custom behavior event"]), performEvent({
+      assertEvent(event, ["behavior event"]), performEvent({
         behaviors: [...context.behaviors.values(), ...defaultBehaviors],
         event: event.behaviorEvent,
         editor: event.editor,
@@ -6740,87 +6692,6 @@ const editorMachine = setup({
             },
             "behavior event": {
               actions: "handle behavior event"
-            },
-            "custom behavior event": {
-              actions: "handle behavior event"
-            },
-            "annotation.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "block.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            blur: {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "custom.*": {
-              actions: emit(({
-                event
-              }) => ({
-                type: "custom.*",
-                event
-              }))
-            },
-            "decorator.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "delete.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            focus: {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "history.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "insert.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "list item.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "move.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            select: {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "select.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "style.*": {
-              actions: emit(({
-                event
-              }) => event)
-            },
-            "text block.*": {
-              actions: emit(({
-                event
-              }) => event)
             }
           },
           initial: "idle",
@@ -6932,12 +6803,6 @@ const editorMachine = setup({
     }
   }
 });
-function getValue({
-  editorActorSnapshot,
-  slateEditorInstance
-}) {
-  return fromSlateValue(slateEditorInstance.children, editorActorSnapshot.context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(slateEditorInstance));
-}
 function defaultCompare(a, b) {
   return a === b;
 }
@@ -6969,10 +6834,7 @@ function getEditorSnapshot({
       }),
       schema: editorActorSnapshot.context.schema,
       selection: editorActorSnapshot.context.selection,
-      value: getValue({
-        editorActorSnapshot,
-        slateEditorInstance
-      })
+      value: slateChildrenToBlocks(editorActorSnapshot.context.schema, slateEditorInstance.children)
     },
     beta: {
       hasTag: (tag) => editorActorSnapshot.hasTag(tag),
@@ -7028,7 +6890,39 @@ function createInternalEditorFromActor(editorActor) {
       });
     }),
     send: (event) => {
-      editorActor.send(event);
+      switch (event.type) {
+        case "add behavior":
+        case "remove behavior":
+        case "update behaviors":
+        case "update key generator":
+        case "update readOnly":
+        case "patches":
+        case "update value":
+        case "update schema":
+        case "update maxBlocks":
+          editorActor.send(event);
+          break;
+        case "insert.block object":
+          editorActor.send({
+            type: "behavior event",
+            behaviorEvent: {
+              type: "insert.block",
+              block: {
+                _type: event.blockObject.name,
+                ...event.blockObject.value ?? {}
+              },
+              placement: event.placement
+            },
+            editor: slateEditor.instance
+          });
+          break;
+        default:
+          editorActor.send({
+            type: "behavior event",
+            behaviorEvent: event,
+            editor: slateEditor.instance
+          });
+      }
     },
     on: (event, listener) => editorActor.on(event, (event2) => {
       switch (event2.type) {