@portabletext/editor 3.0.6 → 3.0.7

package/lib/_chunks-dts/index.d.ts

@@ -6,7 +6,7 @@ import { ActorRef, ActorRefFrom, EventObject, Snapshot } from "xstate";
 import * as react18 from "react";
 import React$1, { BaseSyntheticEvent, ClipboardEvent, Component, FocusEvent, JSX, KeyboardEvent as KeyboardEvent$1, MutableRefObject, PropsWithChildren, ReactElement, RefObject, TextareaHTMLAttributes } from "react";
 import { Patch, Patch as Patch$1 } from "@portabletext/patches";
-import * as _portabletext_schema6 from "@portabletext/schema";
+import * as _portabletext_schema5 from "@portabletext/schema";
 import { AnnotationDefinition, AnnotationSchemaType, BaseDefinition, BlockObjectDefinition, BlockObjectSchemaType, DecoratorDefinition, DecoratorSchemaType, FieldDefinition, InlineObjectDefinition, InlineObjectSchemaType, ListDefinition, ListSchemaType, PortableTextObject as PortableTextObject$1, PortableTextSpan as PortableTextSpan$1, PortableTextTextBlock as PortableTextTextBlock$1, Schema, SchemaDefinition, SchemaDefinition as SchemaDefinition$1, StyleDefinition, StyleSchemaType, defineSchema } from "@portabletext/schema";
 import { Observable, Subject } from "rxjs";
 import { DOMNode } from "slate-dom";
@@ -1935,7 +1935,7 @@ declare const editorMachine: xstate228.StateMachine<{
     keyGenerator: () => string;
     pendingEvents: never[];
     pendingIncomingPatchesEvents: never[];
-    schema: _portabletext_schema6.Schema;
+    schema: _portabletext_schema5.Schema;
     selection: null;
     initialReadOnly: boolean;
     initialValue: PortableTextBlock[] | undefined;

package/lib/index.js

@@ -93,9 +93,6 @@ function toSlateBlock(block, {
     value: rest
   }, keyMap);
 }
-function fromSlateValue(value, textBlockType, keyMap = {}) {
-  return value.map((block) => fromSlateBlock(block, textBlockType, keyMap));
-}
 function fromSlateBlock(block, textBlockType, keyMap = {}) {
   const {
     _key,
@@ -1849,7 +1846,7 @@ const slateOperationCallback = ({
 });
 function createDecorate(schema, slateEditor) {
   return function([node, path]) {
-    if (isEqualToEmptyEditor(slateEditor.children, schema))
+    if (isEqualToEmptyEditor(slateEditor.value, schema))
       return [{
         anchor: {
           path: [0, 0],
@@ -1955,7 +1952,7 @@ function validateSelection(slateEditor, editorElement) {
     debug$h("Could not resolve selection, selecting top document"), Transforms.deselect(slateEditor), slateEditor.children.length > 0 && Transforms.select(slateEditor, Editor.start(slateEditor, [])), slateEditor.onChange();
   }
 }
-const IS_PROCESSING_REMOTE_CHANGES = /* @__PURE__ */ new WeakMap(), KEY_TO_SLATE_ELEMENT = /* @__PURE__ */ new WeakMap(), KEY_TO_VALUE_ELEMENT = /* @__PURE__ */ new WeakMap(), SLATE_TO_PORTABLE_TEXT_RANGE = /* @__PURE__ */ new WeakMap(), debug$g = debugWithName("component:Editable"), PortableTextEditable = forwardRef(function(props, forwardedRef) {
+const debug$g = debugWithName("component:Editable"), PortableTextEditable = forwardRef(function(props, forwardedRef) {
   const $ = c(176);
   let hotkeys, onBeforeInput, onBlur, onClick, onCopy, onCut, onDrag, onDragEnd, onDragEnter, onDragLeave, onDragOver, onDragStart, onDrop, onFocus, onPaste, propsSelection, rangeDecorations, renderAnnotation, renderBlock, renderChild, renderDecorator, renderListItem, renderPlaceholder, renderStyle, restProps, scrollSelectionIntoView, spellCheck;
   $[0] !== props ? ({
@@ -2045,7 +2042,7 @@ const IS_PROCESSING_REMOTE_CHANGES = /* @__PURE__ */ new WeakMap(), KEY_TO_SLATE
   $[63] !== editorActor || $[64] !== propsSelection || $[65] !== slateEditor ? (t14 = () => {
     if (propsSelection) {
       debug$g(`Selection from props ${JSON.stringify(propsSelection)}`);
-      const normalizedSelection = normalizeSelection(propsSelection, fromSlateValue(slateEditor.children, editorActor.getSnapshot().context.schema.block.name));
+      const normalizedSelection = normalizeSelection(propsSelection, slateEditor.value);
       if (normalizedSelection !== null) {
         debug$g(`Normalized selection from props ${JSON.stringify(normalizedSelection)}`);
         const slateRange = toSlateRange({
@@ -2145,7 +2142,7 @@ const IS_PROCESSING_REMOTE_CHANGES = /* @__PURE__ */ new WeakMap(), KEY_TO_SLATE
   const handleCut = t20;
   let t21;
   $[85] !== editorActor || $[86] !== onPaste || $[87] !== portableTextEditor || $[88] !== relayActor || $[89] !== slateEditor ? (t21 = (event_1) => {
-    const value = fromSlateValue(slateEditor.children, editorActor.getSnapshot().context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(slateEditor)), path = (slateEditor.selection ? slateRangeToSelection({
+    const value = slateEditor.value, path = (slateEditor.selection ? slateRangeToSelection({
       schema: editorActor.getSnapshot().context.schema,
       editor: slateEditor,
       range: slateEditor.selection
@@ -2864,6 +2861,7 @@ function createPlaceholderBlock(context) {
     }]
   };
 }
+const IS_PROCESSING_REMOTE_CHANGES = /* @__PURE__ */ new WeakMap(), KEY_TO_SLATE_ELEMENT = /* @__PURE__ */ new WeakMap(), SLATE_TO_PORTABLE_TEXT_RANGE = /* @__PURE__ */ new WeakMap();
 function withRemoteChanges(editor, fn) {
   const prev = isChangingRemotely(editor) || !1;
   IS_PROCESSING_REMOTE_CHANGES.set(editor, !0), fn(), IS_PROCESSING_REMOTE_CHANGES.set(editor, prev);
@@ -2974,7 +2972,7 @@ function pluginHistory({
 }) {
   return (editor) => {
     const remotePatches = getRemotePatches(editor);
-    let previousSnapshot = fromSlateValue(editor.children, editorActor.getSnapshot().context.schema.block.name), previousUndoStepId = getCurrentUndoStepId(editor);
+    let previousSnapshot = editor.value, previousUndoStepId = getCurrentUndoStepId(editor);
     subscriptions.push(() => {
       const subscription = editorActor.on("patches", ({
         patches,
@@ -4279,37 +4277,16 @@ const debug$c = debugWithName("behavior.operation.history.redo"), historyRedoOpe
   context,
   operation
 }) => {
-  const location = toSlateRange({
-    context: {
-      schema: context.schema,
-      value: operation.editor.value,
-      selection: {
-        anchor: {
-          path: operation.at,
-          offset: 0
-        },
-        focus: {
-          path: operation.at,
-          offset: 0
-        }
-      }
-    },
-    blockIndexMap: operation.editor.blockIndexMap
-  });
-  if (!location)
-    throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
-  const block = Editor.node(operation.editor, location, {
-    depth: 1
-  })?.[0];
+  const blockKey = operation.at[0]._key, blockIndex = operation.editor.blockIndexMap.get(blockKey);
+  if (blockIndex === void 0)
+    throw new Error(`Unable to find block index for block key ${blockKey}`);
+  const block = blockIndex !== void 0 ? operation.editor.value.at(blockIndex) : void 0;
   if (!block)
     throw new Error(`Unable to find block at ${JSON.stringify(operation.at)}`);
-  const parsedBlock = fromSlateBlock(block, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(operation.editor));
-  if (!parsedBlock)
-    throw new Error(`Unable to parse block at ${JSON.stringify(operation.at)}`);
-  if (isTextBlock(context, parsedBlock)) {
+  if (isTextBlock(context, block)) {
     const propsToRemove = operation.props.filter((prop) => prop !== "_type"), updatedTextBlock = parseBlock({
       context,
-      block: omit(parsedBlock, propsToRemove),
+      block: omit(block, propsToRemove),
       options: {
         normalize: !1,
         removeUnusedMarkDefs: !0,
@@ -4322,13 +4299,13 @@ const debug$c = debugWithName("behavior.operation.history.redo"), historyRedoOpe
     for (const prop of propsToRemove)
       prop in updatedTextBlock ? propsToSet[prop] = updatedTextBlock[prop] : propsToSet[prop] = void 0;
     Transforms.setNodes(operation.editor, propsToSet, {
-      at: location
+      at: [blockIndex]
     });
     return;
   }
   const updatedBlockObject = parseBlock({
     context,
-    block: omit(parsedBlock, operation.props.filter((prop) => prop !== "_type")),
+    block: omit(block, operation.props.filter((prop) => prop !== "_type")),
     options: {
       normalize: !1,
       removeUnusedMarkDefs: !0,
@@ -4347,7 +4324,7 @@ const debug$c = debugWithName("behavior.operation.history.redo"), historyRedoOpe
     _key,
     value: props
   }, {
-    at: location
+    at: [blockIndex]
   });
 }, childSetOperationImplementation = ({
   context,
@@ -4429,26 +4406,21 @@ const debug$c = debugWithName("behavior.operation.history.redo"), historyRedoOpe
   context,
   operation
 }) => {
-  const location = toSlateRange({
-    context: {
-      schema: context.schema,
-      value: operation.editor.value,
-      selection: {
-        anchor: {
-          path: operation.at,
-          offset: 0
-        },
-        focus: {
-          path: operation.at,
-          offset: 0
-        }
-      }
-    },
-    blockIndexMap: operation.editor.blockIndexMap
-  });
-  if (!location)
-    throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
-  const childEntry = Editor.node(operation.editor, location, {
+  const blockKey = operation.at[0]._key, blockIndex = operation.editor.blockIndexMap.get(blockKey);
+  if (blockIndex === void 0)
+    throw new Error(`Unable to find block index for block key ${blockKey}`);
+  const block = blockIndex !== void 0 ? operation.editor.value.at(blockIndex) : void 0;
+  if (!block)
+    throw new Error(`Unable to find block at ${JSON.stringify(operation.at)}`);
+  if (!isTextBlock(context, block))
+    throw new Error(`Block ${JSON.stringify(blockKey)} is not a text block`);
+  const childKey = operation.at[2]._key;
+  if (!childKey)
+    throw new Error(`Unable to find child key at ${JSON.stringify(operation.at)}`);
+  const childIndex = block.children.findIndex((child2) => child2._key === childKey);
+  if (childIndex === -1)
+    throw new Error(`Unable to find child at ${JSON.stringify(operation.at)}`);
+  const childEntry = Editor.node(operation.editor, [blockIndex, childIndex], {
     depth: 2
   }), child = childEntry?.[0], childPath = childEntry?.[1];
   if (!child || !childPath)
@@ -5637,7 +5609,7 @@ function insertPatch(editor, patch, schema) {
       position: position2
     } = patch, blocksToInsert = items2.map((item) => toSlateBlock(item, {
       schemaTypes: schema
-    }, KEY_TO_SLATE_ELEMENT.get(editor))), targetBlockIndex = block.index, normalizedIdx2 = position2 === "after" ? targetBlockIndex + 1 : targetBlockIndex, editorWasEmptyBefore = isEqualToEmptyEditor(editor.children, schema);
+    }, KEY_TO_SLATE_ELEMENT.get(editor))), targetBlockIndex = block.index, normalizedIdx2 = position2 === "after" ? targetBlockIndex + 1 : targetBlockIndex, editorWasEmptyBefore = isEqualToEmptyEditor(editor.value, schema);
     return Transforms.insertNodes(editor, blocksToInsert, {
       at: [normalizedIdx2]
     }), editorWasEmptyBefore && typeof patch.path[0] == "number" && patch.path[0] === 0 && Transforms.removeNodes(editor, {
@@ -6204,7 +6176,7 @@ function moveNodePatch(schema, beforeValue, operation) {
     const position = operation.path[0] > operation.newPath[0] ? "before" : "after";
     patches.push(unset([{
       _key: block._key
-    }])), patches.push(insert([fromSlateBlock(block, schema.block.name)], position, [{
+    }])), patches.push(insert([block], position, [{
       _key: targetBlock._key
     }]));
   } else if (operation.path.length === 2 && isTextBlock({
@@ -6212,7 +6184,7 @@ function moveNodePatch(schema, beforeValue, operation) {
   }, block) && isTextBlock({
     schema
   }, targetBlock)) {
-    const child = block.children[operation.path[1]], targetChild = targetBlock.children[operation.newPath[1]], position = operation.newPath[1] === targetBlock.children.length ? "after" : "before", childToInsert = fromSlateBlock(block, schema.block.name).children[operation.path[1]];
+    const child = block.children[operation.path[1]], targetChild = targetBlock.children[operation.newPath[1]], position = operation.newPath[1] === targetBlock.children.length ? "after" : "before", childToInsert = block.children[operation.path[1]];
     patches.push(unset([{
       _key: block._key
     }, "children", {
@@ -6239,10 +6211,10 @@ function createWithPatches({
   relayActor,
   subscriptions
 }) {
-  let previousChildren;
+  let previousValue;
   const applyPatch = createApplyPatch(editorActor.getSnapshot().context.schema);
   return function(editor) {
-    IS_PROCESSING_REMOTE_CHANGES.set(editor, !1), PATCHING.set(editor, !0), previousChildren = [...editor.children];
+    IS_PROCESSING_REMOTE_CHANGES.set(editor, !1), PATCHING.set(editor, !0), previousValue = [...editor.value];
     const {
       apply: apply2
     } = editor;
@@ -6283,41 +6255,41 @@ function createWithPatches({
       };
     }), editor.apply = (operation) => {
       let patches = [];
-      previousChildren = editor.children;
-      const editorWasEmpty = isEqualToEmptyEditor(previousChildren, editorActor.getSnapshot().context.schema);
+      previousValue = editor.value;
+      const editorWasEmpty = isEqualToEmptyEditor(previousValue, editorActor.getSnapshot().context.schema);
       apply2(operation);
-      const editorIsEmpty = isEqualToEmptyEditor(editor.children, editorActor.getSnapshot().context.schema);
+      const editorIsEmpty = isEqualToEmptyEditor(editor.value, editorActor.getSnapshot().context.schema);
       if (!isPatching(editor))
         return editor;
-      switch (editorWasEmpty && !editorIsEmpty && operation.type !== "set_selection" && patches.push(insert(previousChildren, "before", [0])), operation.type) {
+      switch (editorWasEmpty && !editorIsEmpty && operation.type !== "set_selection" && patches.push(insert(previousValue, "before", [0])), operation.type) {
         case "insert_text":
-          patches = [...patches, ...insertTextPatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousChildren)];
+          patches = [...patches, ...insertTextPatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousValue)];
           break;
         case "remove_text":
-          patches = [...patches, ...removeTextPatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousChildren)];
+          patches = [...patches, ...removeTextPatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousValue)];
           break;
         case "remove_node":
-          patches = [...patches, ...removeNodePatch(editorActor.getSnapshot().context.schema, previousChildren, operation)];
+          patches = [...patches, ...removeNodePatch(editorActor.getSnapshot().context.schema, previousValue, operation)];
           break;
         case "split_node":
-          patches = [...patches, ...splitNodePatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousChildren)];
+          patches = [...patches, ...splitNodePatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousValue)];
           break;
         case "insert_node":
-          patches = [...patches, ...insertNodePatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousChildren)];
+          patches = [...patches, ...insertNodePatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousValue)];
           break;
         case "set_node":
           patches = [...patches, ...setNodePatch(editorActor.getSnapshot().context.schema, editor.children, operation)];
           break;
         case "merge_node":
-          patches = [...patches, ...mergeNodePatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousChildren)];
+          patches = [...patches, ...mergeNodePatch(editorActor.getSnapshot().context.schema, editor.children, operation, previousValue)];
           break;
         case "move_node":
-          patches = [...patches, ...moveNodePatch(editorActor.getSnapshot().context.schema, previousChildren, operation)];
+          patches = [...patches, ...moveNodePatch(editorActor.getSnapshot().context.schema, previousValue, operation)];
           break;
       }
       if (!editorWasEmpty && editorIsEmpty && ["merge_node", "set_node", "remove_text", "remove_node"].includes(operation.type) && (patches = [...patches, unset([])], relayActor.send({
         type: "unset",
-        previousValue: fromSlateValue(previousChildren, editorActor.getSnapshot().context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor))
+        previousValue
       })), editorWasEmpty && patches.length > 0 && (patches = [setIfMissing([], []), ...patches]), patches.length > 0)
         for (const patch of patches)
           editorActor.send({
@@ -6785,14 +6757,14 @@ const withPlugins = (editor, options) => {
 }, debug$7 = debugWithName("setup");
 function createSlateEditor(config) {
   debug$7("Creating new Slate editor instance");
-  const instance = withPlugins(withReact(createEditor()), {
+  const placeholderBlock = createPlaceholderBlock(config.editorActor.getSnapshot().context), editor = createEditor();
+  editor.decoratedRanges = [], editor.decoratorState = {}, editor.value = [placeholderBlock], editor.blockIndexMap = /* @__PURE__ */ new Map(), editor.listIndexMap = /* @__PURE__ */ new Map();
+  const instance = withPlugins(withReact(editor), {
     editorActor: config.editorActor,
     relayActor: config.relayActor,
     subscriptions: config.subscriptions
   });
-  KEY_TO_VALUE_ELEMENT.set(instance, {}), KEY_TO_SLATE_ELEMENT.set(instance, {}), instance.decoratedRanges = [], instance.decoratorState = {};
-  const placeholderBlock = createPlaceholderBlock(config.editorActor.getSnapshot().context);
-  instance.value = [placeholderBlock], instance.blockIndexMap = /* @__PURE__ */ new Map(), instance.listIndexMap = /* @__PURE__ */ new Map(), buildIndexMaps({
+  KEY_TO_SLATE_ELEMENT.set(instance, {}), buildIndexMaps({
     schema: config.editorActor.getSnapshot().context.schema,
     value: instance.value
   }, {
@@ -10926,18 +10898,18 @@ function createEditableAPI(editor, editorActor) {
       slateSelection ? Transforms.select(editor, slateSelection) : Transforms.deselect(editor), editor.onChange();
     },
     focusBlock: () => {
-      if (editor.selection) {
-        const block = Node.descendant(editor, editor.selection.focus.path.slice(0, 1));
-        if (block)
-          return fromSlateBlock(block, types.block.name, KEY_TO_VALUE_ELEMENT.get(editor));
-      }
+      if (!editor.selection)
+        return;
+      const focusBlockIndex = editor.selection.focus.path.at(0);
+      if (focusBlockIndex !== void 0)
+        return editor.value.at(focusBlockIndex);
     },
     focusChild: () => {
-      if (editor.selection) {
-        const block = Node.descendant(editor, editor.selection.focus.path.slice(0, 1));
-        if (block && editor.isTextBlock(block))
-          return fromSlateBlock(block, types.block.name, KEY_TO_VALUE_ELEMENT.get(editor)).children[editor.selection.focus.path[1]];
-      }
+      if (!editor.selection)
+        return;
+      const focusBlockIndex = editor.selection.focus.path.at(0), focusChildIndex = editor.selection.focus.path.at(1), block = focusBlockIndex !== void 0 ? editor.value.at(focusBlockIndex) : void 0;
+      if (block && isTextBlock(editorActor.getSnapshot().context, block))
+        return focusChildIndex === void 0 ? void 0 : block.children.at(focusChildIndex);
     },
     insertChild: (type, value) => (editorActor.send({
       type: "behavior event",
@@ -10992,41 +10964,32 @@ function createEditableAPI(editor, editorActor) {
     },
     isVoid: (element) => ![types.block.name, types.span.name].includes(element._type),
     findByPath: (path) => {
-      const slatePath = toSlateRange({
-        context: {
-          schema: editorActor.getSnapshot().context.schema,
-          value: editor.value,
-          selection: {
-            focus: {
-              path,
-              offset: 0
-            },
-            anchor: {
-              path,
-              offset: 0
-            }
-          }
-        },
-        blockIndexMap: editor.blockIndexMap
+      const blockKey = getBlockKeyFromSelectionPoint({
+        path
       });
-      if (slatePath) {
-        const [block, blockPath] = Editor.node(editor, slatePath.focus.path.slice(0, 1));
-        if (block && blockPath && typeof block._key == "string") {
-          if (path.length === 1 && slatePath.focus.path.length === 1)
-            return [fromSlateBlock(block, types.block.name), [{
-              _key: block._key
-            }]];
-          const ptBlock = fromSlateBlock(block, types.block.name, KEY_TO_VALUE_ELEMENT.get(editor));
-          if (editor.isTextBlock(ptBlock)) {
-            const ptChild = ptBlock.children[slatePath.focus.path[1]];
-            if (ptChild)
-              return [ptChild, [{
-                _key: block._key
-              }, "children", {
-                _key: ptChild._key
-              }]];
-          }
-        }
+      if (!blockKey)
+        return [void 0, void 0];
+      const blockIndex = editor.blockIndexMap.get(blockKey);
+      if (blockIndex === void 0)
+        return [void 0, void 0];
+      const block = editor.value.at(blockIndex);
+      if (!block)
+        return [void 0, void 0];
+      const childKey = getChildKeyFromSelectionPoint({
+        path
+      });
+      if (path.length === 1 && !childKey)
+        return [block, [{
+          _key: block._key
+        }]];
+      if (isTextBlock(editorActor.getSnapshot().context, block) && childKey) {
+        const child = block.children.find((child2) => child2._key === childKey);
+        if (child)
+          return [child, [{
+            _key: block._key
+          }, "children", {
+            _key: child._key
+          }]];
       }
       return [void 0, void 0];
     },
@@ -11174,7 +11137,7 @@ function createEditableAPI(editor, editorActor) {
       }
       return ptRange;
     },
-    getValue: () => fromSlateValue(editor.children, types.block.name, KEY_TO_VALUE_ELEMENT.get(editor)),
+    getValue: () => editor.value,
     isCollapsedSelection: () => !!editor.selection && Range.isCollapsed(editor.selection),
     isExpandedSelection: () => !!editor.selection && Range.isExpanded(editor.selection),
     insertBreak: () => {
@@ -12327,7 +12290,7 @@ function createActors(config) {
           config.editorActor.send({
             ...event,
             type: "internal.patch",
-            value: fromSlateValue(config.slateEditor.children, config.editorActor.getSnapshot().context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(config.slateEditor))
+            value: config.slateEditor.value
           });
           break;
         default: