@portabletext/editor 1.1.3 → 1.1.5

package/lib/index.mjs

@@ -20,8 +20,8 @@ import { isHotkey } from "is-hotkey-esm";
 import { htmlToBlocks, normalizeBlock } from "@sanity/block-tools";
 import isPlainObject from "lodash/isPlainObject.js";
 import throttle from "lodash/throttle.js";
-import { randomKey } from "@sanity/util/content";
 import debounce from "lodash/debounce.js";
+import { randomKey } from "@sanity/util/content";
 const rootName = "sanity-pte:";
 debug$m(rootName);
 function debugWithName(name) {
@@ -1084,7 +1084,7 @@ function createOperationToPatches(types) {
   };
 }
 const debug$j = debugWithName("API:editable");
-function createWithEditableAPI(portableTextEditor, types, keyGenerator) {
+function createWithEditableAPI(editorActor, portableTextEditor, types) {
   return function(editor) {
     return portableTextEditor.setEditable({
       focus: () => {
@@ -1164,11 +1164,11 @@ function createWithEditableAPI(portableTextEditor, types, keyGenerator) {
         const child = toSlateValue(
           [
             {
-              _key: keyGenerator(),
+              _key: editorActor.getSnapshot().context.keyGenerator(),
               _type: types.block.name,
               children: [
                 {
-                  _key: keyGenerator(),
+                  _key: editorActor.getSnapshot().context.keyGenerator(),
                   _type: type.name,
                   ...value || {}
                 }
@@ -1196,7 +1196,7 @@ function createWithEditableAPI(portableTextEditor, types, keyGenerator) {
         const block = toSlateValue(
           [
             {
-              _key: keyGenerator(),
+              _key: editorActor.getSnapshot().context.keyGenerator(),
               _type: type.name,
               ...value || {}
             }
@@ -1360,7 +1360,7 @@ function createWithEditableAPI(portableTextEditor, types, keyGenerator) {
             for (const [block, blockPath] of selectedBlocks) {
               if (block.children.length === 0 || block.children.length === 1 && block.children[0].text === "")
                 continue;
-              const annotationKey = keyGenerator(), markDefs = block.markDefs ?? [];
+              const annotationKey = editorActor.getSnapshot().context.keyGenerator(), markDefs = block.markDefs ?? [];
               markDefs.find(
                 (markDef) => markDef._type === type.name && markDef._key === annotationKey
               ) === void 0 && (Transforms.setNodes(
@@ -1569,7 +1569,7 @@ function createWithEditableAPI(portableTextEditor, types, keyGenerator) {
     }), editor;
   };
 }
-function createWithInsertBreak(types, keyGenerator) {
+function createWithInsertBreak(editorActor, types) {
   return function(editor) {
     const { insertBreak } = editor;
     return editor.insertBreak = () => {
@@ -1577,19 +1577,29 @@ function createWithInsertBreak(types, keyGenerator) {
         insertBreak();
         return;
       }
-      const focusBlockPath = editor.selection.focus.path.slice(0, 1), focusBlock = Node.descendant(editor, focusBlockPath);
+      const [focusSpan] = Array.from(
+        Editor.nodes(editor, {
+          mode: "lowest",
+          at: editor.selection.focus,
+          match: (n) => editor.isTextSpan(n),
+          voids: !1
+        })
+      )[0] ?? [void 0], focusDecorators = focusSpan.marks?.filter(
+        (mark) => types.decorators.some((decorator) => decorator.value === mark)
+      ) ?? [], focusAnnotations = focusSpan.marks?.filter(
+        (mark) => !types.decorators.some((decorator) => decorator.value === mark)
+      ) ?? [], focusBlockPath = editor.selection.focus.path.slice(0, 1), focusBlock = Node.descendant(editor, focusBlockPath);
       if (editor.isTextBlock(focusBlock)) {
         const [start, end] = Range.edges(editor.selection), isEndAtStartOfBlock = isEqual(end, {
           path: [...focusBlockPath, 0],
           offset: 0
         });
         if (isEndAtStartOfBlock && Range.isCollapsed(editor.selection)) {
-          const focusDecorators = editor.isTextSpan(focusBlock.children[0]) ? (focusBlock.children[0].marks ?? []).filter(
-            (mark) => types.decorators.some((decorator) => decorator.value === mark)
-          ) : [];
           Editor.insertNode(
             editor,
-            editor.pteCreateTextBlock({ decorators: focusDecorators })
+            editor.pteCreateTextBlock({
+              decorators: focusAnnotations.length === 0 ? focusDecorators : []
+            })
           );
           const [nextBlockPath] = Path.next(focusBlockPath);
           Transforms.select(editor, {
@@ -1602,6 +1612,24 @@ function createWithInsertBreak(types, keyGenerator) {
           path: [...focusBlockPath, focusBlock.children.length - 1],
           offset: editor.isTextSpan(lastFocusBlockChild) ? lastFocusBlockChild.text.length : 0
         });
+        if (isStartAtEndOfBlock && Range.isCollapsed(editor.selection) && focusDecorators.length > 0 && focusAnnotations.length > 0) {
+          Editor.withoutNormalizing(editor, () => {
+            if (!editor.selection)
+              return;
+            Editor.insertNode(
+              editor,
+              editor.pteCreateTextBlock({
+                decorators: []
+              })
+            );
+            const [nextBlockPath] = Path.next(focusBlockPath);
+            Transforms.setSelection(editor, {
+              anchor: { path: [nextBlockPath, 0], offset: 0 },
+              focus: { path: [nextBlockPath, 0], offset: 0 }
+            });
+          }), editor.onChange();
+          return;
+        }
         if (!isEndAtStartOfBlock && !isStartAtEndOfBlock) {
           Editor.withoutNormalizing(editor, () => {
             if (!editor.selection)
@@ -1630,7 +1658,10 @@ function createWithInsertBreak(types, keyGenerator) {
                     (decorator) => decorator.value === mark
                   ) || prevNodeSpans.some(
                     (prevNodeSpan) => prevNodeSpan.marks?.includes(mark)
-                  ) && !newMarkDefKeys.has(mark) && newMarkDefKeys.set(mark, keyGenerator());
+                  ) && !newMarkDefKeys.has(mark) && newMarkDefKeys.set(
+                    mark,
+                    editorActor.getSnapshot().context.keyGenerator()
+                  );
                 const newMarks = marks.map(
                   (mark) => newMarkDefKeys.get(mark) ?? mark
                 );
@@ -1711,7 +1742,7 @@ function createWithMaxBlocks(maxBlocks) {
     }, editor;
   };
 }
-function createWithObjectKeys(editorActor, schemaTypes, keyGenerator) {
+function createWithObjectKeys(editorActor, schemaTypes) {
   return function(editor) {
     const { apply: apply2, normalizeNode } = editor;
     return editor.apply = (operation) => {
@@ -1728,7 +1759,7 @@ function createWithObjectKeys(editorActor, schemaTypes, keyGenerator) {
           ...operation,
           properties: {
             ...operation.properties,
-            _key: keyGenerator()
+            _key: editorActor.getSnapshot().context.keyGenerator()
           }
         });
         return;
@@ -1738,7 +1769,7 @@ function createWithObjectKeys(editorActor, schemaTypes, keyGenerator) {
           ...operation,
           node: {
             ...operation.node,
-            _key: keyGenerator()
+            _key: editorActor.getSnapshot().context.keyGenerator()
           }
         });
         return;
@@ -1748,12 +1779,20 @@ function createWithObjectKeys(editorActor, schemaTypes, keyGenerator) {
       const [node, path] = entry;
       if (Element$1.isElement(node) && node._type === schemaTypes.block.name) {
         if (!node._key) {
-          editorActor.send({ type: "normalizing" }), Transforms.setNodes(editor, { _key: keyGenerator() }, { at: path }), editorActor.send({ type: "done normalizing" });
+          editorActor.send({ type: "normalizing" }), Transforms.setNodes(
+            editor,
+            { _key: editorActor.getSnapshot().context.keyGenerator() },
+            { at: path }
+          ), editorActor.send({ type: "done normalizing" });
           return;
         }
         for (const [child, childPath] of Node.children(editor, path))
           if (!child._key) {
-            editorActor.send({ type: "normalizing" }), Transforms.setNodes(editor, { _key: keyGenerator() }, { at: childPath }), editorActor.send({ type: "done normalizing" });
+            editorActor.send({ type: "normalizing" }), Transforms.setNodes(
+              editor,
+              { _key: editorActor.getSnapshot().context.keyGenerator() },
+              { at: childPath }
+            ), editorActor.send({ type: "done normalizing" });
             return;
           }
       }
@@ -3245,7 +3284,7 @@ function isPortableTextBlock(node) {
   );
 }
 const debug$c = debugWithName("plugin:withPortableTextMarkModel");
-function createWithPortableTextMarkModel(editorActor, types, keyGenerator) {
+function createWithPortableTextMarkModel(editorActor, types) {
   return function(editor) {
     const { apply: apply2, normalizeNode } = editor, decorators = types.decorators.map((t) => t.value), forceNewSelection = () => {
       editor.selection && (Transforms.select(editor, { ...editor.selection }), editor.selection = { ...editor.selection });
@@ -3372,24 +3411,65 @@ function createWithPortableTextMarkModel(editorActor, types, keyGenerator) {
       if (op.type === "insert_text") {
         const { selection } = editor, collapsedSelection = selection ? Range.isCollapsed(selection) : !1;
         if (selection && collapsedSelection) {
-          const [span] = Array.from(
+          const [_block, blockPath] = Editor.node(editor, selection, {
+            depth: 1
+          }), [span, spanPath] = Array.from(
             Editor.nodes(editor, {
               mode: "lowest",
               at: selection.focus,
               match: (n) => editor.isTextSpan(n),
               voids: !1
             })
-          )[0], marks = span.marks ?? [], marksWithoutAnnotations = marks.filter(
+          )[0] ?? [void 0, void 0], marks = span.marks ?? [], marksWithoutAnnotations = marks.filter(
             (mark) => decorators.includes(mark)
-          );
-          if (marks.length > marksWithoutAnnotations.length && (selection.anchor.offset === 0 || span.text.length === selection.focus.offset)) {
-            Transforms.insertNodes(editor, {
-              _type: "span",
-              _key: keyGenerator(),
-              text: op.text,
-              marks: marksWithoutAnnotations
-            }), debug$c("Inserting text at end of annotation");
-            return;
+          ), spanHasAnnotations = marks.length > marksWithoutAnnotations.length, spanIsEmpty = span.text.length === 0, atTheBeginningOfSpan = selection.anchor.offset === 0, atTheEndOfSpan = selection.anchor.offset === span.text.length;
+          let previousSpan, nextSpan;
+          for (const [child, childPath] of Node.children(editor, blockPath, {
+            reverse: !0
+          }))
+            if (editor.isTextSpan(child) && Path.isBefore(childPath, spanPath)) {
+              previousSpan = child;
+              break;
+            }
+          for (const [child, childPath] of Node.children(editor, blockPath))
+            if (editor.isTextSpan(child) && Path.isAfter(childPath, spanPath)) {
+              nextSpan = child;
+              break;
+            }
+          const previousSpanHasSameAnnotation = previousSpan ? previousSpan.marks?.some(
+            (mark) => !decorators.includes(mark) && marks.includes(mark)
+          ) : !1, previousSpanHasSameMarks = previousSpan ? previousSpan.marks?.every((mark) => marks.includes(mark)) : !1, nextSpanHasSameAnnotation = nextSpan ? nextSpan.marks?.some(
+            (mark) => !decorators.includes(mark) && marks.includes(mark)
+          ) : !1, nextSpanHasSameMarks = nextSpan ? nextSpan.marks?.every((mark) => marks.includes(mark)) : !1;
+          if (spanHasAnnotations && !spanIsEmpty) {
+            if (atTheBeginningOfSpan) {
+              previousSpanHasSameMarks ? Transforms.insertNodes(editor, {
+                _type: "span",
+                _key: editorActor.getSnapshot().context.keyGenerator(),
+                text: op.text,
+                marks: previousSpan?.marks ?? []
+              }) : previousSpanHasSameAnnotation ? apply2(op) : Transforms.insertNodes(editor, {
+                _type: "span",
+                _key: editorActor.getSnapshot().context.keyGenerator(),
+                text: op.text,
+                marks: []
+              });
+              return;
+            }
+            if (atTheEndOfSpan) {
+              nextSpanHasSameMarks ? Transforms.insertNodes(editor, {
+                _type: "span",
+                _key: editorActor.getSnapshot().context.keyGenerator(),
+                text: op.text,
+                marks: nextSpan?.marks ?? []
+              }) : nextSpanHasSameAnnotation ? apply2(op) : Transforms.insertNodes(editor, {
+                _type: "span",
+                _key: editorActor.getSnapshot().context.keyGenerator(),
+                text: op.text,
+                marks: []
+              });
+              return;
+            }
           }
         }
       }
@@ -3617,8 +3697,7 @@ function createWithPortableTextSelections(editorActor, types) {
 const debug$a = debugWithName("plugin:withSchemaTypes");
 function createWithSchemaTypes({
   editorActor,
-  schemaTypes,
-  keyGenerator
+  schemaTypes
 }) {
   return function(editor) {
     editor.isTextBlock = (value) => isPortableTextTextBlock(value) && value._type === schemaTypes.block.name, editor.isTextSpan = (value) => isPortableTextSpan$1(value) && value._type === schemaTypes.span.name, editor.isListBlock = (value) => isPortableTextListBlock(value) && value._type === schemaTypes.block.name, editor.isVoid = (element) => schemaTypes.block.name !== element._type && (schemaTypes.blockObjects.map((obj) => obj.name).includes(element._type) || schemaTypes.inlineObjects.map((obj) => obj.name).includes(element._type)), editor.isInline = (element) => schemaTypes.inlineObjects.map((obj) => obj.name).includes(element._type) && "__inline" in element && element.__inline === !0;
@@ -3627,7 +3706,7 @@ function createWithSchemaTypes({
       const [node, path] = entry;
       if (node._type === void 0 && path.length === 2) {
         debug$a("Setting span type on text node without a type");
-        const span = node, key = span._key || keyGenerator();
+        const span = node, key = span._key || editorActor.getSnapshot().context.keyGenerator();
         editorActor.send({ type: "normalizing" }), Transforms.setNodes(
           editor,
           { ...span, _type: schemaTypes.span.name, _key: key },
@@ -3637,7 +3716,7 @@ function createWithSchemaTypes({
       }
       if (node._key === void 0 && (path.length === 1 || path.length === 2)) {
         debug$a("Setting missing key on child node without a key");
-        const key = keyGenerator();
+        const key = editorActor.getSnapshot().context.keyGenerator();
         editorActor.send({ type: "normalizing" }), Transforms.setNodes(editor, { _key: key }, { at: path }), editorActor.send({ type: "done normalizing" });
         return;
       }
@@ -3647,8 +3726,8 @@ function createWithSchemaTypes({
 }
 const debug$9 = debugWithName("plugin:withUtils");
 function createWithUtils({
+  editorActor,
   schemaTypes,
-  keyGenerator,
   portableTextEditor
 }) {
   return function(editor) {
@@ -3674,13 +3753,13 @@ function createWithUtils({
       [
         {
           _type: schemaTypes.block.name,
-          _key: keyGenerator(),
+          _key: editorActor.getSnapshot().context.keyGenerator(),
           style: schemaTypes.styles[0].value || "normal",
           markDefs: [],
           children: [
             {
               _type: "span",
-              _key: keyGenerator(),
+              _key: editorActor.getSnapshot().context.keyGenerator(),
               text: "",
               marks: options.decorators.filter(
                 (decorator) => schemaTypes.decorators.find(({ value }) => value === decorator)
@@ -3748,7 +3827,7 @@ function createWithHotkeys(types, portableTextEditor, hotkeysFromOptions) {
               {
                 at: nextPath
               }
-            ), editor.onChange();
+            ), Transforms.select(editor, { path: [...nextPath, 0], offset: 0 }), editor.onChange();
             return;
           }
         }
@@ -4091,7 +4170,7 @@ function validateValue(value, types, keyGenerator) {
   }) && (valid = !1), { valid, resolution, value });
 }
 const debug$7 = debugWithName("plugin:withInsertData");
-function createWithInsertData(editorActor, schemaTypes, keyGenerator) {
+function createWithInsertData(editorActor, schemaTypes) {
   return function(editor) {
     const blockTypeName = schemaTypes.block.name, spanTypeName = schemaTypes.span.name, whitespaceOnPasteMode = schemaTypes.block.options.unstable_whitespaceOnPasteMode, toPlainText = (blocks) => blocks.map((block) => editor.isTextBlock(block) ? block.children.map((child) => child._type === spanTypeName ? child.text : `[${schemaTypes.inlineObjects.find((t) => t.name === child._type)?.title || "Object"}]`).join("") : `[${schemaTypes.blockObjects.find((t) => t.name === block._type)?.title || "Object"}]`).join(`
 
@@ -4139,10 +4218,14 @@ function createWithInsertData(editorActor, schemaTypes, keyGenerator) {
           const slateValue = _regenerateKeys(
             editor,
             toSlateValue(parsed, { schemaTypes }),
-            keyGenerator,
+            editorActor.getSnapshot().context.keyGenerator,
             spanTypeName,
             schemaTypes
-          ), validation = validateValue(parsed, schemaTypes, keyGenerator);
+          ), validation = validateValue(
+            parsed,
+            schemaTypes,
+            editorActor.getSnapshot().context.keyGenerator
+          );
           if (!validation.valid && !validation.resolution?.autoResolve) {
             const errorDescription = `${validation.resolution?.description}`;
             return editorActor.send({
@@ -4183,7 +4266,7 @@ function createWithInsertData(editorActor, schemaTypes, keyGenerator) {
         const validation = validateValue(
           portableText,
           schemaTypes,
-          keyGenerator
+          editorActor.getSnapshot().context.keyGenerator
         );
         if (!validation.valid) {
           const errorDescription = `Could not validate the resulting portable text to insert.
@@ -4287,27 +4370,21 @@ function _insertFragment(editor, fragment, schemaTypes) {
   }), editor.onChange();
 }
 const originalFnMap = /* @__PURE__ */ new WeakMap(), withPlugins = (editor, options) => {
-  const e = editor, { keyGenerator, portableTextEditor, patches$, readOnly, maxBlocks } = options, { editorActor, schemaTypes } = portableTextEditor;
+  const e = editor, { portableTextEditor, patches$, readOnly, maxBlocks } = options, { editorActor, schemaTypes } = portableTextEditor;
   e.subscriptions = [], e.destroy ? e.destroy() : originalFnMap.set(e, {
     apply: e.apply,
     onChange: e.onChange,
     normalizeNode: e.normalizeNode
   });
-  const operationToPatches = createOperationToPatches(schemaTypes), withObjectKeys = createWithObjectKeys(
+  const operationToPatches = createOperationToPatches(schemaTypes), withObjectKeys = createWithObjectKeys(editorActor, schemaTypes), withSchemaTypes = createWithSchemaTypes({
     editorActor,
-    schemaTypes,
-    keyGenerator
-  ), withSchemaTypes = createWithSchemaTypes({
-    editorActor,
-    schemaTypes,
-    keyGenerator
+    schemaTypes
   }), withEditableAPI = createWithEditableAPI(
+    editorActor,
     portableTextEditor,
-    schemaTypes,
-    keyGenerator
+    schemaTypes
   ), withPatches = createWithPatches({
     editorActor,
-    keyGenerator,
     patches$,
     patchFunctions: operationToPatches,
     readOnly,
@@ -4318,13 +4395,12 @@ const originalFnMap = /* @__PURE__ */ new WeakMap(), withPlugins = (editor, opti
     blockSchemaType: schemaTypes.block
   }), withPortableTextMarkModel = createWithPortableTextMarkModel(
     editorActor,
-    schemaTypes,
-    keyGenerator
+    schemaTypes
   ), withPortableTextBlockStyle = createWithPortableTextBlockStyle(
     editorActor,
     schemaTypes
-  ), withPlaceholderBlock = createWithPlaceholderBlock(), withInsertBreak = createWithInsertBreak(schemaTypes, keyGenerator), withUtils = createWithUtils({
-    keyGenerator,
+  ), withPlaceholderBlock = createWithPlaceholderBlock(), withInsertBreak = createWithInsertBreak(editorActor, schemaTypes), withUtils = createWithUtils({
+    editorActor,
     schemaTypes,
     portableTextEditor
   }), withPortableTextSelections = createWithPortableTextSelections(
@@ -4392,10 +4468,9 @@ const originalFnMap = /* @__PURE__ */ new WeakMap(), withPlugins = (editor, opti
   };
 }, debug$6 = debugWithName("component:PortableTextEditor:SlateContainer");
 function SlateContainer(props) {
-  const { patches$, portableTextEditor, readOnly, maxBlocks, keyGenerator } = props, [[slateEditor, subscribe]] = useState(() => {
+  const { patches$, portableTextEditor, readOnly, maxBlocks } = props, [[slateEditor, subscribe]] = useState(() => {
     debug$6("Creating new Slate editor instance");
     const { editor, subscribe: _sub } = withPlugins(withReact(createEditor()), {
-      keyGenerator,
       maxBlocks,
       patches$,
       portableTextEditor,
@@ -4410,33 +4485,18 @@ function SlateContainer(props) {
     };
   }, [subscribe]), useEffect(() => {
     debug$6("Re-initializing plugin chain"), withPlugins(slateEditor, {
-      keyGenerator,
       maxBlocks,
       patches$,
       portableTextEditor,
       readOnly
     });
-  }, [
-    keyGenerator,
-    portableTextEditor,
-    maxBlocks,
-    readOnly,
-    patches$,
-    slateEditor
-  ]);
+  }, [portableTextEditor, maxBlocks, readOnly, patches$, slateEditor]);
   const initialValue = useMemo(() => [slateEditor.pteCreateTextBlock({ decorators: [] })], [slateEditor]);
   return useEffect(() => () => {
     debug$6("Destroying Slate editor"), slateEditor.destroy();
   }, [slateEditor]), /* @__PURE__ */ jsx(Slate, { editor: slateEditor, initialValue, children: props.children });
 }
-const defaultKeyGenerator = () => randomKey(12), PortableTextEditorKeyGeneratorContext = createContext(defaultKeyGenerator), usePortableTextEditorKeyGenerator = () => {
-  const keyGenerator = useContext(PortableTextEditorKeyGeneratorContext);
-  if (keyGenerator === void 0)
-    throw new Error(
-      "The `usePortableTextEditorKeyGenerator` hook must be used inside the <PortableTextEditor> component's context."
-    );
-  return keyGenerator;
-}, PortableTextEditorReadOnlyContext = createContext(!1), usePortableTextEditorReadOnlyStatus = () => {
+const PortableTextEditorReadOnlyContext = createContext(!1), usePortableTextEditorReadOnlyStatus = () => {
   const readOnly = useContext(PortableTextEditorReadOnlyContext);
   if (readOnly === void 0)
     throw new Error(
@@ -4445,7 +4505,7 @@ const defaultKeyGenerator = () => randomKey(12), PortableTextEditorKeyGeneratorC
   return readOnly;
 }, debug$5 = debugWithName("hook:useSyncValue"), CURRENT_VALUE = /* @__PURE__ */ new WeakMap();
 function useSyncValue(props) {
-  const { editorActor, portableTextEditor, readOnly, keyGenerator } = props, { schemaTypes } = portableTextEditor, previousValue = useRef(), slateEditor = useSlate(), updateValueFunctionRef = useRef(), updateFromCurrentValue = useCallback(() => {
+  const { editorActor, portableTextEditor, readOnly } = props, { schemaTypes } = portableTextEditor, previousValue = useRef(), slateEditor = useSlate(), updateValueFunctionRef = useRef(), updateFromCurrentValue = useCallback(() => {
     const currentValue = CURRENT_VALUE.get(portableTextEditor);
     if (previousValue.current === currentValue) {
       debug$5("Value is the same object as previous, not need to sync");
@@ -4511,7 +4571,7 @@ function useSyncValue(props) {
                       const validationValue = [value[currentBlockIndex]], validation = validateValue(
                         validationValue,
                         schemaTypes,
-                        keyGenerator
+                        editorActor.getSnapshot().context.keyGenerator
                       );
                       !validation.valid && validation.resolution?.autoResolve && validation.resolution?.patches.length > 0 && !readOnly && previousValue.current && previousValue.current !== value && (console.warn(
                         `${validation.resolution.action} for block with _key '${validationValue[0]._key}'. ${validation.resolution?.description}`
@@ -4536,7 +4596,7 @@ function useSyncValue(props) {
                       const validationValue = [value[currentBlockIndex]], validation = validateValue(
                         validationValue,
                         schemaTypes,
-                        keyGenerator
+                        editorActor.getSnapshot().context.keyGenerator
                       );
                       debug$5.enabled && debug$5(
                         "Validating and inserting new block in the end of the value",
@@ -4583,7 +4643,6 @@ function useSyncValue(props) {
     return updateValueFunctionRef.current = updateFunction, updateFunction;
   }, [
     editorActor,
-    keyGenerator,
     portableTextEditor,
     readOnly,
     schemaTypes,
@@ -4651,9 +4710,8 @@ function _updateBlock(slateEditor, currentBlock, oldBlock, currentBlockIndex) {
 }
 const debug$4 = debugWithName("component:PortableTextEditor:Synchronizer"), debugVerbose$1 = debug$4.enabled && !1, FLUSH_PATCHES_THROTTLED_MS = process.env.NODE_ENV === "test" ? 500 : 1e3;
 function Synchronizer(props) {
-  const portableTextEditor = usePortableTextEditor(), keyGenerator = usePortableTextEditorKeyGenerator(), readOnly = usePortableTextEditorReadOnlyStatus(), { editorActor, getValue, onChange, value } = props, pendingPatches = useRef([]), syncValue = useSyncValue({
+  const portableTextEditor = usePortableTextEditor(), readOnly = usePortableTextEditorReadOnlyStatus(), { editorActor, getValue, onChange, value } = props, pendingPatches = useRef([]), syncValue = useSyncValue({
     editorActor,
-    keyGenerator,
     portableTextEditor,
     readOnly
   }), slateEditor = useSlate();
@@ -4767,7 +4825,8 @@ const networkLogic = fromCallback(({ sendBack }) => {
   types: {
     context: {},
     events: {},
-    emitted: {}
+    emitted: {},
+    input: {}
   },
   actions: {
     "emit patch event": emit(({ event }) => (assertEvent(event, "patch"), event)),
@@ -4788,9 +4847,10 @@ const networkLogic = fromCallback(({ sendBack }) => {
   }
 }).createMachine({
   id: "editor",
-  context: {
+  context: ({ input }) => ({
+    keyGenerator: input.keyGenerator,
     pendingEvents: []
-  },
+  }),
   invoke: {
     id: "networkLogic",
     src: "networkLogic"
@@ -4878,7 +4938,7 @@ function PortableTextEditorSelectionProvider(props) {
     };
   }, [props.editorActor]), /* @__PURE__ */ jsx(PortableTextEditorSelectionContext.Provider, { value: selection, children: props.children });
 }
-const debug$2 = debugWithName("component:PortableTextEditor");
+const defaultKeyGenerator = () => randomKey(12), debug$2 = debugWithName("component:PortableTextEditor");
 class PortableTextEditor extends Component {
   /**
    * @internal
@@ -4902,7 +4962,11 @@ class PortableTextEditor extends Component {
       throw new Error('PortableTextEditor: missing "schemaType" property');
     props.incomingPatches$ && console.warn(
       "The prop 'incomingPatches$' is deprecated and renamed to 'patches$'"
-    ), this.editorActor = createActor(editorMachine), this.editorActor.start(), this.schemaTypes = getPortableTextMemberSchemaTypes(
+    ), this.editorActor = createActor(editorMachine, {
+      input: {
+        keyGenerator: props.keyGenerator || defaultKeyGenerator
+      }
+    }), this.editorActor.start(), this.schemaTypes = getPortableTextMemberSchemaTypes(
       props.schemaType.hasOwnProperty("jsonType") ? props.schemaType : compileType(props.schemaType)
     );
   }
@@ -4919,35 +4983,28 @@ class PortableTextEditor extends Component {
       return this.editable.getValue();
   };
   render() {
-    const { value, children, patches$, incomingPatches$ } = this.props, _patches$ = incomingPatches$ || patches$, maxBlocks = typeof this.props.maxBlocks > "u" ? void 0 : Number.parseInt(this.props.maxBlocks.toString(), 10) || void 0, readOnly = !!this.props.readOnly, keyGenerator = this.props.keyGenerator || defaultKeyGenerator;
+    const { value, children, patches$, incomingPatches$ } = this.props, _patches$ = incomingPatches$ || patches$, maxBlocks = typeof this.props.maxBlocks > "u" ? void 0 : Number.parseInt(this.props.maxBlocks.toString(), 10) || void 0, readOnly = !!this.props.readOnly;
     return /* @__PURE__ */ jsx(
       SlateContainer,
       {
-        keyGenerator,
         maxBlocks,
         patches$: _patches$,
         portableTextEditor: this,
         readOnly,
-        children: /* @__PURE__ */ jsx(PortableTextEditorKeyGeneratorContext.Provider, { value: keyGenerator, children: /* @__PURE__ */ jsx(PortableTextEditorContext.Provider, { value: this, children: /* @__PURE__ */ jsx(PortableTextEditorReadOnlyContext.Provider, { value: readOnly, children: /* @__PURE__ */ jsxs(
-          PortableTextEditorSelectionProvider,
-          {
-            editorActor: this.editorActor,
-            children: [
-              /* @__PURE__ */ jsx(
-                Synchronizer,
-                {
-                  editorActor: this.editorActor,
-                  getValue: this.getValue,
-                  onChange: (change) => {
-                    this.props.onChange(change), this.change$.next(change);
-                  },
-                  value
-                }
-              ),
-              children
-            ]
-          }
-        ) }) }) })
+        children: /* @__PURE__ */ jsx(PortableTextEditorContext.Provider, { value: this, children: /* @__PURE__ */ jsx(PortableTextEditorReadOnlyContext.Provider, { value: readOnly, children: /* @__PURE__ */ jsxs(PortableTextEditorSelectionProvider, { editorActor: this.editorActor, children: [
+          /* @__PURE__ */ jsx(
+            Synchronizer,
+            {
+              editorActor: this.editorActor,
+              getValue: this.getValue,
+              onChange: (change) => {
+                this.props.onChange(change), this.change$.next(change);
+              },
+              value
+            }
+          ),
+          children
+        ] }) }) })
       }
     );
   }
@@ -5213,7 +5270,7 @@ const debug$1 = debugWithName("components:Leaf"), EMPTY_MARKS = [], Leaf = (prop
     scrollSelectionIntoView,
     spellCheck,
     ...restProps
-  } = props, portableTextEditor = usePortableTextEditor(), readOnly = usePortableTextEditorReadOnlyStatus(), keyGenerator = usePortableTextEditorKeyGenerator(), ref = useRef(null), [editableElement, setEditableElement] = useState(
+  } = props, portableTextEditor = usePortableTextEditor(), readOnly = usePortableTextEditorReadOnlyStatus(), ref = useRef(null), [editableElement, setEditableElement] = useState(
     null
   ), [hasInvalidValue, setHasInvalidValue] = useState(!1), [rangeDecorationState, setRangeDecorationsState] = useState([]);
   useImperativeHandle(
@@ -5221,8 +5278,8 @@ const debug$1 = debugWithName("components:Leaf"), EMPTY_MARKS = [], Leaf = (prop
     () => ref.current
   );
   const rangeDecorationsRef = useRef(rangeDecorations), { editorActor, schemaTypes } = portableTextEditor, slateEditor = useSlate(), blockTypeName = schemaTypes.block.name, withInsertData = useMemo(
-    () => createWithInsertData(editorActor, schemaTypes, keyGenerator),
-    [editorActor, keyGenerator, schemaTypes]
+    () => createWithInsertData(editorActor, schemaTypes),
+    [editorActor, schemaTypes]
   ), withHotKeys = useMemo(
     () => createWithHotkeys(schemaTypes, portableTextEditor, hotkeys),
     [hotkeys, portableTextEditor, schemaTypes]