@portabletext/editor 2.14.0 → 2.14.2

package/lib/index.js

@@ -2919,6 +2919,14 @@ function getNextSpan({
     }
   return nextSpan;
 }
+const IS_NORMALIZING_NODE = /* @__PURE__ */ new WeakMap();
+function withNormalizeNode(editor, fn) {
+  const prev = IS_NORMALIZING_NODE.get(editor);
+  IS_NORMALIZING_NODE.set(editor, !0), fn(), IS_NORMALIZING_NODE.set(editor, prev);
+}
+function isNormalizingNode(editor) {
+  return IS_NORMALIZING_NODE.get(editor) ?? !1;
+}
 function withRemoteChanges(editor, fn) {
   const prev = isChangingRemotely(editor) || !1;
   IS_PROCESSING_REMOTE_CHANGES.set(editor, !0), fn(), IS_PROCESSING_REMOTE_CHANGES.set(editor, prev);
@@ -2961,53 +2969,45 @@ 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$c("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],
-              voids: !0
-            }), editorActor.send({
-              type: "done normalizing"
+            debug$c("Merging spans", JSON.stringify(child, null, 2), JSON.stringify(nextNode, null, 2)), withNormalizeNode(editor, () => {
+              Transforms.mergeNodes(editor, {
+                at: [childPath[0], childPath[1] + 1],
+                voids: !0
+              });
             });
             return;
           }
         }
       }
       if (editor.isTextBlock(node) && !Array.isArray(node.markDefs)) {
-        debug$c("Adding .markDefs to block node"), editorActor.send({
-          type: "normalizing"
-        }), Transforms.setNodes(editor, {
-          markDefs: []
-        }, {
-          at: path
-        }), editorActor.send({
-          type: "done normalizing"
+        debug$c("Adding .markDefs to block node"), withNormalizeNode(editor, () => {
+          Transforms.setNodes(editor, {
+            markDefs: []
+          }, {
+            at: path
+          });
         });
         return;
       }
       if (editor.isTextSpan(node) && !Array.isArray(node.marks)) {
-        debug$c("Adding .marks to span node"), editorActor.send({
-          type: "normalizing"
-        }), Transforms.setNodes(editor, {
-          marks: []
-        }, {
-          at: path
-        }), editorActor.send({
-          type: "done normalizing"
+        debug$c("Adding .marks to span node"), withNormalizeNode(editor, () => {
+          Transforms.setNodes(editor, {
+            marks: []
+          }, {
+            at: path
+          });
         });
         return;
       }
       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$c("Removing annotations from empty span node"), editorActor.send({
-            type: "normalizing"
-          }), Transforms.setNodes(editor, {
-            marks: node.marks?.filter((mark) => decorators2.includes(mark))
-          }, {
-            at: path
-          }), editorActor.send({
-            type: "done normalizing"
+          debug$c("Removing annotations from empty span node"), withNormalizeNode(editor, () => {
+            Transforms.setNodes(editor, {
+              marks: node.marks?.filter((mark) => decorators2.includes(mark))
+            }, {
+              at: path
+            });
           });
           return;
         }
@@ -3018,14 +3018,12 @@ 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$c("Removing orphaned annotations from span node"), editorActor.send({
-                type: "normalizing"
-              }), Transforms.setNodes(editor, {
-                marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
-              }, {
-                at: childPath
-              }), editorActor.send({
-                type: "done normalizing"
+              debug$c("Removing orphaned annotations from span node"), withNormalizeNode(editor, () => {
+                Transforms.setNodes(editor, {
+                  marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
+                }, {
+                  at: childPath
+                });
               });
               return;
             }
@@ -3036,14 +3034,12 @@ 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$c("Removing orphaned annotations from span node"), editorActor.send({
-              type: "normalizing"
-            }), Transforms.setNodes(editor, {
-              marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
-            }, {
-              at: path
-            }), editorActor.send({
-              type: "done normalizing"
+            debug$c("Removing orphaned annotations from span node"), withNormalizeNode(editor, () => {
+              Transforms.setNodes(editor, {
+                marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
+              }, {
+                at: path
+              });
             });
             return;
           }
@@ -3054,14 +3050,12 @@ 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$c("Removing duplicate markDefs"), editorActor.send({
-            type: "normalizing"
-          }), Transforms.setNodes(editor, {
-            markDefs: newMarkDefs
-          }, {
-            at: path
-          }), editorActor.send({
-            type: "done normalizing"
+          debug$c("Removing duplicate markDefs"), withNormalizeNode(editor, () => {
+            Transforms.setNodes(editor, {
+              markDefs: newMarkDefs
+            }, {
+              at: path
+            });
           });
           return;
         }
@@ -3069,19 +3063,19 @@ 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$c("Removing markDef not in use"), editorActor.send({
-            type: "normalizing"
-          }), Transforms.setNodes(editor, {
-            markDefs: newMarkDefs
-          }, {
-            at: path
-          }), editorActor.send({
-            type: "done normalizing"
+          debug$c("Removing markDef not in use"), withNormalizeNode(editor, () => {
+            Transforms.setNodes(editor, {
+              markDefs: newMarkDefs
+            }, {
+              at: path
+            });
           });
           return;
         }
       }
-      normalizeNode(nodeEntry);
+      withNormalizeNode(editor, () => {
+        normalizeNode(nodeEntry);
+      });
     }, editor.apply = (op) => {
       if (isChangingRemotely(editor)) {
         apply2(op);
@@ -3937,7 +3931,7 @@ function createWithUndoRedo(options) {
       } = editor, {
         undos
       } = history, step = undos[undos.length - 1], lastOp = step && step.operations && step.operations[step.operations.length - 1], overwrite = shouldOverwrite(op, lastOp), save = isSaving(editor), currentUndoStepId = getCurrentUndoStepId(editor);
-      let merge = currentUndoStepId === previousUndoStepId;
+      let merge = currentUndoStepId === previousUndoStepId || isNormalizingNode(editor);
       if (save) {
         if (step ? operations.length === 0 && (merge = currentUndoStepId === void 0 && previousUndoStepId === void 0 ? shouldMerge(op, lastOp) || overwrite : merge) : merge = !1, step && merge)
           step.operations.push(op);
@@ -5551,32 +5545,30 @@ function createWithObjectKeys(editorActor) {
       const [node, path] = entry;
       if (Element$1.isElement(node) && node._type === editorActor.getSnapshot().context.schema.block.name) {
         if (!node._key) {
-          editorActor.send({
-            type: "normalizing"
-          }), Transforms.setNodes(editor, {
-            _key: editorActor.getSnapshot().context.keyGenerator()
-          }, {
-            at: path
-          }), editorActor.send({
-            type: "done normalizing"
+          withNormalizeNode(editor, () => {
+            Transforms.setNodes(editor, {
+              _key: editorActor.getSnapshot().context.keyGenerator()
+            }, {
+              at: path
+            });
           });
           return;
         }
         for (const [child, childPath] of Node.children(editor, path))
           if (!child._key) {
-            editorActor.send({
-              type: "normalizing"
-            }), Transforms.setNodes(editor, {
-              _key: editorActor.getSnapshot().context.keyGenerator()
-            }, {
-              at: childPath
-            }), editorActor.send({
-              type: "done normalizing"
+            withNormalizeNode(editor, () => {
+              Transforms.setNodes(editor, {
+                _key: editorActor.getSnapshot().context.keyGenerator()
+              }, {
+                at: childPath
+              });
             });
             return;
           }
       }
-      normalizeNode(entry);
+      withNormalizeNode(editor, () => {
+        normalizeNode(entry);
+      });
     }, editor;
   };
 }
@@ -6296,34 +6288,32 @@ function createWithSchemaTypes({
       if (node._type === void 0 && path.length === 2) {
         debug$8("Setting span type on text node without a type");
         const span = node, key = span._key || editorActor.getSnapshot().context.keyGenerator();
-        editorActor.send({
-          type: "normalizing"
-        }), Transforms.setNodes(editor, {
-          ...span,
-          _type: editorActor.getSnapshot().context.schema.span.name,
-          _key: key
-        }, {
-          at: path
-        }), editorActor.send({
-          type: "done normalizing"
+        withNormalizeNode(editor, () => {
+          Transforms.setNodes(editor, {
+            ...span,
+            _type: editorActor.getSnapshot().context.schema.span.name,
+            _key: key
+          }, {
+            at: path
+          });
         });
         return;
       }
       if (node._key === void 0 && (path.length === 1 || path.length === 2)) {
         debug$8("Setting missing key on child node without a key");
         const key = editorActor.getSnapshot().context.keyGenerator();
-        editorActor.send({
-          type: "normalizing"
-        }), Transforms.setNodes(editor, {
-          _key: key
-        }, {
-          at: path
-        }), editorActor.send({
-          type: "done normalizing"
+        withNormalizeNode(editor, () => {
+          Transforms.setNodes(editor, {
+            _key: key
+          }, {
+            at: path
+          });
         });
         return;
       }
-      normalizeNode(entry);
+      withNormalizeNode(editor, () => {
+        normalizeNode(entry);
+      });
     }, editor;
   };
 }
@@ -8918,6 +8908,24 @@ const abstractAnnotationBehaviors = [defineBehavior({
       marks: [...event.decorators ?? [], ...markDefs.map((markDef) => markDef._key)]
     }
   })]]
+}), defineBehavior({
+  on: "insert.text",
+  guard: ({
+    snapshot
+  }) => {
+    const selection = snapshot.context.selection;
+    return !selection || isSelectionCollapsed(selection) ? !1 : {
+      selection
+    };
+  },
+  actions: [({
+    event
+  }, {
+    selection
+  }) => [raise({
+    type: "delete",
+    at: selection
+  }), raise(event)]]
 })], shiftLeft = createKeyboardShortcut({
   default: [{
     key: "ArrowLeft",
@@ -9959,6 +9967,12 @@ const editorMachine = setup({
         event
       }) => (assertEvent(event, "remove behavior"), context.behaviors.delete(event.behaviorConfig), /* @__PURE__ */ new Set([...context.behaviors]))
     }),
+    "add slate editor to context": assign({
+      slateEditor: ({
+        context,
+        event
+      }) => event.type === "add slate editor" ? event.editor : context.slateEditor
+    }),
     "emit patch event": emit(({
       event
     }) => (assertEvent(event, "internal.patch"), event)),
@@ -10081,7 +10095,10 @@ const editorMachine = setup({
   guards: {
     "slate is busy": ({
       context
-    }) => context.slateEditor ? context.slateEditor.operations.length > 0 : !1
+    }) => context.slateEditor ? context.slateEditor.operations.length > 0 : !1,
+    "slate is normalizing node": ({
+      context
+    }) => context.slateEditor ? isNormalizingNode(context.slateEditor) : !1
   }
 }).createMachine({
   id: "editor",
@@ -10115,6 +10132,9 @@ const editorMachine = setup({
         }) => event.maxBlocks
       })
     },
+    "add slate editor": {
+      actions: "add slate editor to context"
+    },
     "update selection": {
       actions: [assign({
         selection: ({
@@ -10382,36 +10402,20 @@ const editorMachine = setup({
                         debug$5("exit: setup->set up->writing->pristine->idle");
                       }],
                       on: {
-                        normalizing: {
-                          target: "normalizing"
-                        },
-                        "internal.patch": {
+                        "internal.patch": [{
+                          guard: "slate is normalizing node",
+                          actions: "defer event"
+                        }, {
                           actions: "defer event",
                           target: "#editor.setup.set up.writing.dirty"
-                        },
-                        mutation: {
+                        }],
+                        mutation: [{
+                          guard: "slate is normalizing node",
+                          actions: "defer event"
+                        }, {
                           actions: "defer event",
                           target: "#editor.setup.set up.writing.dirty"
-                        }
-                      }
-                    },
-                    normalizing: {
-                      entry: [() => {
-                        debug$5("entry: setup->set up->writing->pristine->normalizing");
-                      }],
-                      exit: [() => {
-                        debug$5("exit: setup->set up->writing->pristine->normalizing");
-                      }],
-                      on: {
-                        "done normalizing": {
-                          target: "idle"
-                        },
-                        "internal.patch": {
-                          actions: "defer event"
-                        },
-                        mutation: {
-                          actions: "defer event"
-                        }
+                        }]
                       }
                     }
                   }
@@ -12671,7 +12675,7 @@ function RoutePatchesObservableToEditorActor(props) {
   }, t1 = [props.editorActor, props.patches$], $[0] = props.editorActor, $[1] = props.patches$, $[2] = t0, $[3] = t1) : (t0 = $[2], t1 = $[3]), useEffect(t0, t1), null;
 }
 function EditorProvider(props) {
-  const $ = c(28);
+  const $ = c(29);
   let t0;
   $[0] !== props.initialConfig ? (t0 = () => {
     const internalEditor = createInternalEditor(props.initialConfig), portableTextEditor = new PortableTextEditor({
@@ -12687,7 +12691,7 @@ function EditorProvider(props) {
     portableTextEditor: portableTextEditor_0
   } = t1;
   let t2;
-  $[2] !== internalEditor_0.actors.editorActor || $[3] !== internalEditor_0.actors.mutationActor || $[4] !== internalEditor_0.actors.relayActor || $[5] !== internalEditor_0.actors.syncActor || $[6] !== internalEditor_0.subscriptions || $[7] !== portableTextEditor_0 ? (t2 = () => {
+  $[2] !== internalEditor_0.actors.editorActor || $[3] !== internalEditor_0.actors.mutationActor || $[4] !== internalEditor_0.actors.relayActor || $[5] !== internalEditor_0.actors.syncActor || $[6] !== internalEditor_0.editor._internal.slateEditor.instance || $[7] !== internalEditor_0.subscriptions || $[8] !== portableTextEditor_0 ? (t2 = () => {
     const unsubscribers = [];
     for (const subscription of internalEditor_0.subscriptions)
       unsubscribers.push(subscription());
@@ -12695,24 +12699,27 @@ function EditorProvider(props) {
       const change = eventToChange(event);
       change && portableTextEditor_0.change$.next(change);
     });
-    return unsubscribers.push(relayActorSubscription.unsubscribe), internalEditor_0.actors.editorActor.start(), internalEditor_0.actors.mutationActor.start(), internalEditor_0.actors.relayActor.start(), internalEditor_0.actors.syncActor.start(), () => {
+    return unsubscribers.push(relayActorSubscription.unsubscribe), internalEditor_0.actors.editorActor.start(), internalEditor_0.actors.editorActor.send({
+      type: "add slate editor",
+      editor: internalEditor_0.editor._internal.slateEditor.instance
+    }), internalEditor_0.actors.mutationActor.start(), internalEditor_0.actors.relayActor.start(), internalEditor_0.actors.syncActor.start(), () => {
       for (const unsubscribe of unsubscribers)
         unsubscribe();
       stopActor(internalEditor_0.actors.editorActor), stopActor(internalEditor_0.actors.mutationActor), stopActor(internalEditor_0.actors.relayActor), stopActor(internalEditor_0.actors.syncActor);
     };
-  }, $[2] = internalEditor_0.actors.editorActor, $[3] = internalEditor_0.actors.mutationActor, $[4] = internalEditor_0.actors.relayActor, $[5] = internalEditor_0.actors.syncActor, $[6] = internalEditor_0.subscriptions, $[7] = portableTextEditor_0, $[8] = t2) : t2 = $[8];
+  }, $[2] = internalEditor_0.actors.editorActor, $[3] = internalEditor_0.actors.mutationActor, $[4] = internalEditor_0.actors.relayActor, $[5] = internalEditor_0.actors.syncActor, $[6] = internalEditor_0.editor._internal.slateEditor.instance, $[7] = internalEditor_0.subscriptions, $[8] = portableTextEditor_0, $[9] = t2) : t2 = $[9];
   let t3;
-  $[9] !== internalEditor_0 || $[10] !== portableTextEditor_0 ? (t3 = [internalEditor_0, portableTextEditor_0], $[9] = internalEditor_0, $[10] = portableTextEditor_0, $[11] = t3) : t3 = $[11], useEffect(t2, t3);
+  $[10] !== internalEditor_0 || $[11] !== portableTextEditor_0 ? (t3 = [internalEditor_0, portableTextEditor_0], $[10] = internalEditor_0, $[11] = portableTextEditor_0, $[12] = t3) : t3 = $[12], useEffect(t2, t3);
   let t4;
-  $[12] !== portableTextEditor_0 || $[13] !== props.children ? (t4 = /* @__PURE__ */ jsx(PortableTextEditorContext.Provider, { value: portableTextEditor_0, children: props.children }), $[12] = portableTextEditor_0, $[13] = props.children, $[14] = t4) : t4 = $[14];
+  $[13] !== portableTextEditor_0 || $[14] !== props.children ? (t4 = /* @__PURE__ */ jsx(PortableTextEditorContext.Provider, { value: portableTextEditor_0, children: props.children }), $[13] = portableTextEditor_0, $[14] = props.children, $[15] = t4) : t4 = $[15];
   let t5;
-  $[15] !== internalEditor_0.editor._internal.slateEditor.initialValue || $[16] !== internalEditor_0.editor._internal.slateEditor.instance || $[17] !== t4 ? (t5 = /* @__PURE__ */ jsx(Slate, { editor: internalEditor_0.editor._internal.slateEditor.instance, initialValue: internalEditor_0.editor._internal.slateEditor.initialValue, children: t4 }), $[15] = internalEditor_0.editor._internal.slateEditor.initialValue, $[16] = internalEditor_0.editor._internal.slateEditor.instance, $[17] = t4, $[18] = t5) : t5 = $[18];
+  $[16] !== internalEditor_0.editor._internal.slateEditor.initialValue || $[17] !== internalEditor_0.editor._internal.slateEditor.instance || $[18] !== t4 ? (t5 = /* @__PURE__ */ jsx(Slate, { editor: internalEditor_0.editor._internal.slateEditor.instance, initialValue: internalEditor_0.editor._internal.slateEditor.initialValue, children: t4 }), $[16] = internalEditor_0.editor._internal.slateEditor.initialValue, $[17] = internalEditor_0.editor._internal.slateEditor.instance, $[18] = t4, $[19] = t5) : t5 = $[19];
   let t6;
-  $[19] !== internalEditor_0.actors.relayActor || $[20] !== t5 ? (t6 = /* @__PURE__ */ jsx(RelayActorContext.Provider, { value: internalEditor_0.actors.relayActor, children: t5 }), $[19] = internalEditor_0.actors.relayActor, $[20] = t5, $[21] = t6) : t6 = $[21];
+  $[20] !== internalEditor_0.actors.relayActor || $[21] !== t5 ? (t6 = /* @__PURE__ */ jsx(RelayActorContext.Provider, { value: internalEditor_0.actors.relayActor, children: t5 }), $[20] = internalEditor_0.actors.relayActor, $[21] = t5, $[22] = t6) : t6 = $[22];
   let t7;
-  $[22] !== internalEditor_0.actors.editorActor || $[23] !== t6 ? (t7 = /* @__PURE__ */ jsx(EditorActorContext.Provider, { value: internalEditor_0.actors.editorActor, children: t6 }), $[22] = internalEditor_0.actors.editorActor, $[23] = t6, $[24] = t7) : t7 = $[24];
+  $[23] !== internalEditor_0.actors.editorActor || $[24] !== t6 ? (t7 = /* @__PURE__ */ jsx(EditorActorContext.Provider, { value: internalEditor_0.actors.editorActor, children: t6 }), $[23] = internalEditor_0.actors.editorActor, $[24] = t6, $[25] = t7) : t7 = $[25];
   let t8;
-  return $[25] !== internalEditor_0.editor || $[26] !== t7 ? (t8 = /* @__PURE__ */ jsx(EditorContext.Provider, { value: internalEditor_0.editor, children: t7 }), $[25] = internalEditor_0.editor, $[26] = t7, $[27] = t8) : t8 = $[27], t8;
+  return $[26] !== internalEditor_0.editor || $[27] !== t7 ? (t8 = /* @__PURE__ */ jsx(EditorContext.Provider, { value: internalEditor_0.editor, children: t7 }), $[26] = internalEditor_0.editor, $[27] = t7, $[28] = t8) : t8 = $[28], t8;
 }
 const usePortableTextEditorSelection = () => {
   const $ = c(3), editorActor = useContext(EditorActorContext), [selection, setSelection2] = useState(null);