@portabletext/editor 2.8.3 → 2.9.0

package/lib/index.js

@@ -3698,19 +3698,17 @@ function toInt(num) {
   return parseInt(num, 10);
 }
 const CURRENT_UNDO_STEP = /* @__PURE__ */ new WeakMap();
-function withUndoStep(editor, fn) {
-  const current = CURRENT_UNDO_STEP.get(editor);
-  if (current) {
-    fn();
-    return;
-  }
-  CURRENT_UNDO_STEP.set(editor, current ?? {
-    undoStepId: defaultKeyGenerator()
-  }), fn(), CURRENT_UNDO_STEP.set(editor, void 0);
-}
 function getCurrentUndoStepId(editor) {
   return CURRENT_UNDO_STEP.get(editor)?.undoStepId;
 }
+function createUndoStep(editor) {
+  CURRENT_UNDO_STEP.set(editor, {
+    undoStepId: defaultKeyGenerator()
+  });
+}
+function clearUndoStep(editor) {
+  CURRENT_UNDO_STEP.set(editor, void 0);
+}
 const debug$b = debugWithName("plugin:withUndoRedo"), SAVING = /* @__PURE__ */ new WeakMap(), REMOTE_PATCHES = /* @__PURE__ */ new WeakMap(), UNDO_STEP_LIMIT = 1e3, isSaving = (editor) => {
   const state = SAVING.get(editor);
   return state === void 0 ? !0 : state;
@@ -8271,28 +8269,104 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
   on: "insert.blocks",
   guard: ({
     event
-  }) => event.placement === "before",
+  }) => {
+    const onlyBlock = event.blocks.length === 1 ? event.blocks.at(0) : void 0;
+    return onlyBlock ? {
+      onlyBlock
+    } : !1;
+  },
   actions: [({
     event
-  }) => event.blocks.map((block, index) => raise({
+  }, {
+    onlyBlock
+  }) => [raise({
+    type: "insert.block",
+    block: onlyBlock,
+    placement: event.placement,
+    select: event.select ?? "end"
+  })]]
+}), defineBehavior({
+  on: "insert.blocks",
+  guard: ({
+    snapshot,
+    event
+  }) => {
+    if (event.placement !== "before")
+      return !1;
+    const firstBlockKey = event.blocks.at(0)?._key ?? snapshot.context.keyGenerator(), lastBlockKey = event.blocks.at(-1)?._key ?? snapshot.context.keyGenerator();
+    return {
+      firstBlockKey,
+      lastBlockKey
+    };
+  },
+  actions: [({
+    snapshot,
+    event
+  }, {
+    firstBlockKey,
+    lastBlockKey
+  }) => [...event.blocks.map((block, index) => raise({
     type: "insert.block",
     block,
     placement: index === 0 ? "before" : "after",
-    select: event.select ?? "end"
-  }))]
+    select: index !== event.blocks.length - 1 ? "end" : "none"
+  })), ...event.select === "none" ? [raise({
+    type: "select",
+    at: snapshot.context.selection
+  })] : event.select === "start" ? [raise({
+    type: "select.block",
+    at: [{
+      _key: firstBlockKey
+    }],
+    select: "start"
+  })] : [raise({
+    type: "select.block",
+    at: [{
+      _key: lastBlockKey
+    }],
+    select: "end"
+  })]]]
 }), defineBehavior({
   on: "insert.blocks",
   guard: ({
+    snapshot,
     event
-  }) => event.placement === "after",
+  }) => {
+    if (event.placement !== "after")
+      return !1;
+    const firstBlockKey = event.blocks.at(0)?._key ?? snapshot.context.keyGenerator(), lastBlockKey = event.blocks.at(-1)?._key ?? snapshot.context.keyGenerator();
+    return {
+      firstBlockKey,
+      lastBlockKey
+    };
+  },
   actions: [({
+    snapshot,
     event
-  }) => event.blocks.map((block) => raise({
+  }, {
+    firstBlockKey,
+    lastBlockKey
+  }) => [...event.blocks.map((block, index) => raise({
     type: "insert.block",
     block,
     placement: "after",
-    select: event.select ?? "end"
-  }))]
+    select: index !== event.blocks.length - 1 ? "end" : "none"
+  })), ...event.select === "none" ? [raise({
+    type: "select",
+    at: snapshot.context.selection
+  })] : event.select === "start" ? [raise({
+    type: "select.block",
+    at: [{
+      _key: firstBlockKey
+    }],
+    select: "start"
+  })] : [raise({
+    type: "select.block",
+    at: [{
+      _key: lastBlockKey
+    }],
+    select: "end"
+  })]]]
 }), defineBehavior({
   on: "insert.blocks",
   guard: ({
@@ -8302,49 +8376,123 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
     if (event.placement !== "auto")
       return !1;
     const focusTextBlock = getFocusTextBlock(snapshot);
-    return focusTextBlock ? {
-      focusTextBlock
-    } : !1;
+    if (!focusTextBlock || !isEmptyTextBlock(snapshot.context, focusTextBlock.node))
+      return !1;
+    const firstBlockKey = event.blocks.at(0)?._key ?? snapshot.context.keyGenerator(), lastBlockKey = event.blocks.at(-1)?._key ?? snapshot.context.keyGenerator();
+    return {
+      focusTextBlock,
+      firstBlockKey,
+      lastBlockKey
+    };
   },
   actions: [({
-    snapshot,
     event
   }, {
-    focusTextBlock
-  }) => event.blocks.length === 1 ? [raise({
-    type: "insert.block",
-    block: event.blocks[0],
-    placement: "auto",
-    select: event.select ?? "end"
-  })] : isEmptyTextBlock(snapshot.context, focusTextBlock.node) ? event.blocks.map((block, index) => raise({
+    firstBlockKey,
+    lastBlockKey
+  }) => [...event.blocks.map((block, index) => raise({
     type: "insert.block",
     block,
     placement: index === 0 ? "auto" : "after",
-    select: event.select ?? "end"
-  })) : event.blocks.flatMap((block, index) => index === 0 ? [raise({
-    type: "split"
-  }), raise({
-    type: "select.previous block",
+    select: index !== event.blocks.length - 1 ? "end" : "none"
+  })), ...event.select === "none" || event.select === "start" ? [raise({
+    type: "select.block",
+    at: [{
+      _key: firstBlockKey
+    }],
+    select: "start"
+  })] : [raise({
+    type: "select.block",
+    at: [{
+      _key: lastBlockKey
+    }],
     select: "end"
-  }), raise({
+  })]]]
+}), defineBehavior({
+  on: "insert.blocks",
+  guard: ({
+    snapshot,
+    event
+  }) => {
+    if (event.placement !== "auto")
+      return !1;
+    const focusTextBlock = getFocusTextBlock(snapshot);
+    if (!focusTextBlock || !snapshot.context.selection)
+      return !1;
+    const focusBlockStartPoint = getBlockStartPoint({
+      context: snapshot.context,
+      block: focusTextBlock
+    }), focusBlockEndPoint = getBlockEndPoint({
+      context: snapshot.context,
+      block: focusTextBlock
+    }), focusTextBlockAfter = sliceTextBlock({
+      context: {
+        schema: snapshot.context.schema,
+        selection: {
+          anchor: snapshot.context.selection.focus,
+          focus: focusBlockEndPoint
+        }
+      },
+      block: focusTextBlock.node
+    });
+    return {
+      firstBlockKey: event.blocks.at(0)?._key ?? snapshot.context.keyGenerator(),
+      focusBlockStartPoint,
+      focusBlockEndPoint,
+      focusTextBlockAfter,
+      selection: snapshot.context.selection
+    };
+  },
+  actions: [({
+    event
+  }, {
+    focusBlockEndPoint,
+    focusTextBlockAfter,
+    selection,
+    firstBlockKey,
+    focusBlockStartPoint
+  }) => [...event.blocks.flatMap((block, index) => index === 0 ? [...isEqualSelectionPoints(selection.focus, focusBlockEndPoint) ? [] : [raise({
+    type: "delete",
+    at: {
+      anchor: selection.focus,
+      focus: focusBlockEndPoint
+    }
+  })], raise({
     type: "insert.block",
     block,
     placement: "auto",
-    select: event.select ?? "end"
+    select: "end"
   })] : index === event.blocks.length - 1 ? [raise({
-    type: "select.next block",
-    select: "start"
-  }), raise({
     type: "insert.block",
     block,
+    placement: "after",
+    select: "end"
+  }), raise({
+    type: "insert.block",
+    block: focusTextBlockAfter,
     placement: "auto",
-    select: event.select ?? "end"
+    select: event.select === "end" ? "none" : "end"
   })] : [raise({
     type: "insert.block",
     block,
     placement: "after",
-    select: event.select ?? "end"
-  })])]
+    select: "end"
+  })]), ...event.select === "none" ? [raise({
+    type: "select",
+    at: selection
+  })] : event.select === "start" ? [isEqualSelectionPoints(selection.focus, focusBlockStartPoint) ? raise({
+    type: "select.block",
+    at: [{
+      _key: firstBlockKey
+    }],
+    select: "start"
+  }) : raise({
+    type: "select",
+    at: {
+      anchor: selection.focus,
+      focus: selection.focus
+    }
+  })] : []]]
 }), defineBehavior({
   on: "insert.blocks",
   guard: ({
@@ -8600,62 +8748,99 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
     to: nextBlock.path
   })]]
 })], abstractSelectBehaviors = [defineBehavior({
-  on: "select.previous block",
+  on: "select.block",
   guard: ({
     snapshot,
     event
   }) => {
-    const previousBlock = getPreviousBlock(snapshot);
-    if (!previousBlock)
+    if (event.select !== "end")
       return !1;
-    const point = event.select === "end" ? getBlockEndPoint({
-      context: snapshot.context,
-      block: previousBlock
-    }) : getBlockStartPoint({
-      context: snapshot.context,
-      block: previousBlock
-    });
-    return {
-      selection: {
-        anchor: point,
-        focus: point
+    const block = getFocusBlock$1({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: {
+            path: event.at,
+            offset: 0
+          },
+          focus: {
+            path: event.at,
+            offset: 0
+          }
+        }
       }
-    };
+    });
+    return block ? {
+      blockEndPoint: getBlockEndPoint({
+        context: snapshot.context,
+        block
+      })
+    } : !1;
   },
   actions: [(_, {
-    selection
+    blockEndPoint
   }) => [raise({
     type: "select",
-    at: selection
+    at: {
+      anchor: blockEndPoint,
+      focus: blockEndPoint
+    }
   })]]
 }), defineBehavior({
-  on: "select.next block",
+  on: "select.block",
+  actions: [({
+    event
+  }) => [raise({
+    type: "select",
+    at: {
+      anchor: {
+        path: event.at,
+        offset: 0
+      },
+      focus: {
+        path: event.at,
+        offset: 0
+      }
+    }
+  })]]
+}), defineBehavior({
+  on: "select.previous block",
   guard: ({
-    snapshot,
+    snapshot
+  }) => {
+    const previousBlock = getPreviousBlock(snapshot);
+    return previousBlock ? {
+      previousBlock
+    } : !1;
+  },
+  actions: [({
     event
+  }, {
+    previousBlock
+  }) => [raise({
+    type: "select.block",
+    at: previousBlock.path,
+    select: event.select
+  })]]
+}), defineBehavior({
+  on: "select.next block",
+  guard: ({
+    snapshot
   }) => {
     const nextBlock = getNextBlock(snapshot);
-    if (!nextBlock)
-      return !1;
-    const point = event.select === "end" ? getBlockEndPoint({
-      context: snapshot.context,
-      block: nextBlock
-    }) : getBlockStartPoint({
-      context: snapshot.context,
-      block: nextBlock
-    });
-    return {
-      selection: {
-        anchor: point,
-        focus: point
-      }
-    };
+    return nextBlock ? {
+      nextBlock
+    } : !1;
   },
-  actions: [(_, {
-    selection
+  actions: [({
+    event
+  }, {
+    nextBlock
   }) => [raise({
-    type: "select",
-    at: selection
+    type: "select.block",
+    at: nextBlock.path,
+    select: event.select
   })]]
 })], abstractSerializeBehaviors = [defineBehavior({
   on: "serialize",
@@ -9029,7 +9214,7 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
 function isSyntheticBehaviorEvent(event) {
   return !isCustomBehaviorEvent(event) && !isNativeBehaviorEvent(event) && !isAbstractBehaviorEvent(event);
 }
-const abstractBehaviorEventTypes = ["annotation.set", "annotation.toggle", "decorator.toggle", "delete.backward", "delete.block", "delete.child", "delete.forward", "delete.text", "deserialize", "deserialize.data", "deserialization.success", "deserialization.failure", "insert.blocks", "insert.break", "insert.inline object", "insert.soft break", "insert.span", "list item.add", "list item.remove", "list item.toggle", "move.block down", "move.block up", "select.previous block", "select.next block", "serialize", "serialize.data", "serialization.success", "serialization.failure", "split", "style.add", "style.remove", "style.toggle"];
+const abstractBehaviorEventTypes = ["annotation.set", "annotation.toggle", "decorator.toggle", "delete.backward", "delete.block", "delete.child", "delete.forward", "delete.text", "deserialize", "deserialize.data", "deserialization.success", "deserialization.failure", "insert.blocks", "insert.break", "insert.inline object", "insert.soft break", "insert.span", "list item.add", "list item.remove", "list item.toggle", "move.block down", "move.block up", "select.block", "select.previous block", "select.next block", "serialize", "serialize.data", "serialization.success", "serialization.failure", "split", "style.add", "style.remove", "style.toggle"];
 function isAbstractBehaviorEvent(event) {
   return abstractBehaviorEventTypes.includes(event.type);
 }
@@ -9056,7 +9241,7 @@ function performEvent({
   nativeEvent,
   sendBack
 }) {
-  debug$6(`(${mode}:${eventCategory(event)})`, JSON.stringify(event, null, 2));
+  mode === "send" && !isNativeBehaviorEvent(event) && createUndoStep(editor), debug$6(`(${mode}:${eventCategory(event)})`, JSON.stringify(event, null, 2));
   const eventBehaviors = [...remainingEventBehaviors, ...abstractBehaviors].filter((behavior) => {
     if (behavior.on === "*")
       return !0;
@@ -9064,7 +9249,7 @@ function performEvent({
     return listenedNamespace !== void 0 && eventNamespace !== void 0 && listenedNamespace === eventNamespace || listenedNamespace !== void 0 && eventNamespace === void 0 && listenedNamespace === event.type ? !0 : behavior.on === event.type;
   });
   if (eventBehaviors.length === 0 && isSyntheticBehaviorEvent(event)) {
-    nativeEvent?.preventDefault(), withApplyingBehaviorOperations(editor, () => {
+    nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withApplyingBehaviorOperations(editor, () => {
       debug$6(`(execute:${eventCategory(event)})`, JSON.stringify(event, null, 2)), performOperation({
         context: {
           keyGenerator,
@@ -9108,63 +9293,63 @@ function performEvent({
         }
         if (actions.length !== 0) {
           if (nativeEventPrevented = actions.some((action) => action.type === "raise" || action.type === "execute") || !actions.some((action) => action.type === "forward"), actions.some((action) => action.type === "execute")) {
-            withUndoStep(editor, () => {
-              for (const action of actions) {
-                if (action.type === "effect") {
-                  try {
-                    action.effect({
-                      send: sendBack
-                    });
-                  } catch (error) {
-                    console.error(new Error(`Executing effect as a result of "${event.type}" failed due to: ${error.message}`));
-                  }
-                  continue;
-                }
-                if (action.type === "forward") {
-                  const remainingEventBehaviors2 = eventBehaviors.slice(eventBehaviorIndex + 1);
-                  performEvent({
-                    mode: "forward",
-                    behaviors,
-                    remainingEventBehaviors: remainingEventBehaviors2,
-                    event: action.event,
-                    editor,
-                    keyGenerator,
-                    schema,
-                    getSnapshot,
-                    nativeEvent,
-                    sendBack
-                  });
-                  continue;
-                }
-                if (action.type === "raise") {
-                  performEvent({
-                    mode: "raise",
-                    behaviors,
-                    remainingEventBehaviors: behaviors,
-                    event: action.event,
-                    editor,
-                    keyGenerator,
-                    schema,
-                    getSnapshot,
-                    nativeEvent,
-                    sendBack
+            createUndoStep(editor);
+            for (const action of actions) {
+              if (action.type === "effect") {
+                try {
+                  action.effect({
+                    send: sendBack
                   });
-                  continue;
+                } catch (error) {
+                  console.error(new Error(`Executing effect as a result of "${event.type}" failed due to: ${error.message}`));
                 }
+                continue;
+              }
+              if (action.type === "forward") {
+                const remainingEventBehaviors2 = eventBehaviors.slice(eventBehaviorIndex + 1);
                 performEvent({
-                  mode: "execute",
+                  mode: "forward",
                   behaviors,
-                  remainingEventBehaviors: [],
+                  remainingEventBehaviors: remainingEventBehaviors2,
                   event: action.event,
                   editor,
                   keyGenerator,
                   schema,
                   getSnapshot,
-                  nativeEvent: void 0,
+                  nativeEvent,
                   sendBack
                 });
+                continue;
               }
-            });
+              if (action.type === "raise") {
+                performEvent({
+                  mode: "raise",
+                  behaviors,
+                  remainingEventBehaviors: behaviors,
+                  event: action.event,
+                  editor,
+                  keyGenerator,
+                  schema,
+                  getSnapshot,
+                  nativeEvent,
+                  sendBack
+                });
+                continue;
+              }
+              performEvent({
+                mode: "execute",
+                behaviors,
+                remainingEventBehaviors: [],
+                event: action.event,
+                editor,
+                keyGenerator,
+                schema,
+                getSnapshot,
+                nativeEvent: void 0,
+                sendBack
+              });
+            }
+            clearUndoStep(editor);
             continue;
           }
           for (const action of actions) {
@@ -9216,7 +9401,7 @@ function performEvent({
       break;
     }
   }
-  !defaultBehaviorOverwritten && isSyntheticBehaviorEvent(event) ? (nativeEvent?.preventDefault(), withApplyingBehaviorOperations(editor, () => {
+  !defaultBehaviorOverwritten && isSyntheticBehaviorEvent(event) ? (nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withApplyingBehaviorOperations(editor, () => {
     debug$6(`(execute:${eventCategory(event)})`, JSON.stringify(event, null, 2)), performOperation({
       context: {
         keyGenerator,
@@ -9297,7 +9482,44 @@ function createEditorSnapshot({
     decoratorState: editor.decoratorState
   };
 }
-const debug$5 = debugWithName("editor machine"), editorMachine = setup({
+const debug$5 = debugWithName("editor machine");
+function rerouteExternalBehaviorEvent({
+  event,
+  slateEditor
+}) {
+  switch (event.type) {
+    case "blur":
+      return {
+        type: "blur",
+        editor: slateEditor
+      };
+    case "focus":
+      return {
+        type: "focus",
+        editor: slateEditor
+      };
+    case "insert.block object":
+      return {
+        type: "behavior event",
+        behaviorEvent: {
+          type: "insert.block",
+          block: {
+            _type: event.blockObject.name,
+            ...event.blockObject.value ?? {}
+          },
+          placement: event.placement
+        },
+        editor: slateEditor
+      };
+    default:
+      return {
+        type: "behavior event",
+        behaviorEvent: event,
+        editor: slateEditor
+      };
+  }
+}
+const editorMachine = setup({
   types: {
     context: {},
     events: {},
@@ -9399,7 +9621,7 @@ const debug$5 = debugWithName("editor machine"), editorMachine = setup({
       try {
         const behaviors = [...context.behaviors.values()].map((config) => config.behavior);
         performEvent({
-          mode: "raise",
+          mode: "send",
           behaviors,
           remainingEventBehaviors: behaviors,
           event: event.behaviorEvent,
@@ -9421,11 +9643,10 @@ const debug$5 = debugWithName("editor machine"), editorMachine = setup({
               self.send(eventSentBack);
               return;
             }
-            self.send({
-              type: "behavior event",
-              behaviorEvent: eventSentBack,
-              editor: event.editor
-            });
+            self.send(rerouteExternalBehaviorEvent({
+              event: eventSentBack,
+              slateEditor: event.editor
+            }));
           }
         });
       } catch (error) {
@@ -11371,38 +11592,11 @@ function createInternalEditor(config) {
         case "update maxBlocks":
           editorActor.send(event);
           break;
-        case "blur":
-          editorActor.send({
-            type: "blur",
-            editor: slateEditor.instance
-          });
-          break;
-        case "focus":
-          editorActor.send({
-            type: "focus",
-            editor: slateEditor.instance
-          });
-          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
-          });
+          editorActor.send(rerouteExternalBehaviorEvent({
+            event,
+            slateEditor: slateEditor.instance
+          }));
       }
     },
     on: (event, listener) => relayActor.on(event, (event2) => {