@portabletext/editor 2.9.1 → 2.9.2

package/lib/index.cjs

@@ -156,7 +156,14 @@ function getFocusSpan({
   if (!editor.selection)
     return [void 0, void 0];
   try {
-    const [node, path] = slate.Editor.node(editor, editor.selection.focus.path);
+    const [focusBlock] = getFocusBlock({
+      editor
+    });
+    if (!focusBlock)
+      return [void 0, void 0];
+    if (!editor.isTextBlock(focusBlock))
+      return [void 0, void 0];
+    const [node, path] = slate.Editor.node(editor, editor.selection.focus.path.slice(0, 2));
     if (editor.isTextSpan(node))
       return [node, path];
   } catch {
@@ -2601,46 +2608,6 @@ function createPlaceholderBlock(context) {
     }]
   };
 }
-const insertTextOperationImplementation = ({
-  context,
-  operation
-}) => {
-  const snapshot = {
-    blockIndexMap: operation.editor.blockIndexMap,
-    context: {
-      value: operation.editor.value,
-      selection: operation.editor.selection ? slateRangeToSelection({
-        schema: context.schema,
-        editor: operation.editor,
-        range: operation.editor.selection
-      }) : null,
-      schema: context.schema,
-      keyGenerator: context.keyGenerator,
-      converters: [],
-      readOnly: !1
-    },
-    decoratorState: operation.editor.decoratorState
-  }, markState = selector_isSelectingEntireBlocks.getMarkState(snapshot), activeDecorators = selector_isSelectingEntireBlocks.getActiveDecorators(snapshot), activeAnnotations = selector_isSelectingEntireBlocks.getActiveAnnotationsMarks(snapshot), [focusSpan] = getFocusSpan({
-    editor: operation.editor
-  });
-  if (!focusSpan) {
-    slate.Transforms.insertText(operation.editor, operation.text);
-    return;
-  }
-  if (markState && markState.state === "unchanged") {
-    const markStateDecorators = (markState.marks ?? []).filter((mark) => context.schema.decorators.map((decorator) => decorator.name).includes(mark));
-    if (markStateDecorators.length === activeDecorators.length && markStateDecorators.every((mark) => activeDecorators.includes(mark))) {
-      slate.Transforms.insertText(operation.editor, operation.text);
-      return;
-    }
-  }
-  slate.Transforms.insertNodes(operation.editor, {
-    _type: focusSpan._type,
-    _key: context.keyGenerator(),
-    text: operation.text,
-    marks: [...activeDecorators, ...activeAnnotations]
-  }), slateDom.EDITOR_TO_PENDING_SELECTION.set(operation.editor, operation.editor.selection), operation.editor.decoratorState = {};
-};
 function getPreviousSpan({
   editor,
   blockPath,
@@ -4067,55 +4034,35 @@ const addAnnotationOperationImplementation = ({
   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 = slate.Editor.node(operation.editor, location, {
-    depth: 1
-  })?.[0];
+  const blockIndex = operation.editor.blockIndexMap.get(operation.at[0]._key);
+  if (blockIndex === void 0)
+    throw new Error(`Unable to find block index for block at ${JSON.stringify(operation.at)}`);
+  const block = operation.editor.value.at(blockIndex);
   if (!block)
     throw new Error(`Unable to find block at ${JSON.stringify(operation.at)}`);
-  const parsedBlock = fromSlateValue([block], context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(operation.editor)).at(0);
-  if (!parsedBlock)
-    throw new Error(`Unable to parse block at ${JSON.stringify(operation.at)}`);
   const {
     _type,
     ...filteredProps
-  } = operation.props, updatedBlock = util_sliceBlocks.parseBlock({
+  } = operation.props, updatedBlock = {
+    ...block,
+    ...filteredProps
+  }, parsedBlock = util_sliceBlocks.parseBlock({
     context,
-    block: {
-      ...parsedBlock,
-      ...filteredProps
-    },
+    block: updatedBlock,
     options: {
       validateFields: !0
     }
   });
-  if (!updatedBlock)
+  if (!parsedBlock)
     throw new Error(`Unable to update block at ${JSON.stringify(operation.at)}`);
-  const slateBlock = toSlateValue([updatedBlock], {
+  parsedBlock.markDefs = updatedBlock.markDefs;
+  const slateBlock = toSlateValue([parsedBlock], {
     schemaTypes: context.schema
   })?.at(0);
   if (!slateBlock)
     throw new Error("Unable to convert block to Slate value");
   slate.Transforms.setNodes(operation.editor, slateBlock, {
-    at: location
+    at: [blockIndex]
   });
 }, blockUnsetOperationImplementation = ({
   context,
@@ -4768,7 +4715,46 @@ function insertBlock({
     }
   }
 }
-const moveBackwardOperationImplementation = ({
+const insertTextOperationImplementation = ({
+  context,
+  operation
+}) => {
+  const snapshot = {
+    blockIndexMap: operation.editor.blockIndexMap,
+    context: {
+      value: operation.editor.value,
+      selection: operation.editor.selection ? slateRangeToSelection({
+        schema: context.schema,
+        editor: operation.editor,
+        range: operation.editor.selection
+      }) : null,
+      schema: context.schema,
+      keyGenerator: context.keyGenerator,
+      converters: [],
+      readOnly: !1
+    },
+    decoratorState: operation.editor.decoratorState
+  }, markState = selector_isSelectingEntireBlocks.getMarkState(snapshot), activeDecorators = selector_isSelectingEntireBlocks.getActiveDecorators(snapshot), activeAnnotations = selector_isSelectingEntireBlocks.getActiveAnnotationsMarks(snapshot), [focusSpan] = getFocusSpan({
+    editor: operation.editor
+  });
+  if (!focusSpan) {
+    slate.Transforms.insertText(operation.editor, operation.text);
+    return;
+  }
+  if (markState && markState.state === "unchanged") {
+    const markStateDecorators = (markState.marks ?? []).filter((mark) => context.schema.decorators.map((decorator) => decorator.name).includes(mark));
+    if (markStateDecorators.length === activeDecorators.length && markStateDecorators.every((mark) => activeDecorators.includes(mark))) {
+      slate.Transforms.insertText(operation.editor, operation.text);
+      return;
+    }
+  }
+  slate.Transforms.insertNodes(operation.editor, {
+    _type: focusSpan._type,
+    _key: context.keyGenerator(),
+    text: operation.text,
+    marks: [...activeDecorators, ...activeAnnotations]
+  }), slateDom.EDITOR_TO_PENDING_SELECTION.set(operation.editor, operation.editor.selection), operation.editor.decoratorState = {};
+}, moveBackwardOperationImplementation = ({
   operation
 }) => {
   slate.Transforms.move(operation.editor, {
@@ -4843,141 +4829,141 @@ function performOperation({
   context,
   operation
 }) {
-  try {
-    switch (operation.type) {
-      case "annotation.add": {
-        behaviorOperationImplementations["annotation.add"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "annotation.remove": {
-        behaviorOperationImplementations["annotation.remove"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "block.set": {
-        behaviorOperationImplementations["block.set"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "block.unset": {
-        behaviorOperationImplementations["block.unset"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "child.set": {
-        behaviorOperationImplementations["child.set"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "child.unset": {
-        behaviorOperationImplementations["child.unset"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "decorator.add": {
-        behaviorOperationImplementations["decorator.add"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "decorator.remove": {
-        behaviorOperationImplementations["decorator.remove"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "delete": {
-        behaviorOperationImplementations.delete({
-          context,
-          operation
-        });
-        break;
-      }
-      case "history.redo": {
-        behaviorOperationImplementations["history.redo"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "history.undo": {
-        behaviorOperationImplementations["history.undo"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "insert.block": {
-        behaviorOperationImplementations["insert.block"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "insert.text": {
-        behaviorOperationImplementations["insert.text"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "move.backward": {
-        behaviorOperationImplementations["move.backward"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "move.block": {
-        behaviorOperationImplementations["move.block"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "move.forward": {
-        behaviorOperationImplementations["move.forward"]({
-          context,
-          operation
-        });
-        break;
-      }
-      default: {
-        behaviorOperationImplementations.select({
-          context,
-          operation
-        });
-        break;
+  slate.Editor.withoutNormalizing(operation.editor, () => {
+    try {
+      switch (operation.type) {
+        case "annotation.add": {
+          behaviorOperationImplementations["annotation.add"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "annotation.remove": {
+          behaviorOperationImplementations["annotation.remove"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "block.set": {
+          behaviorOperationImplementations["block.set"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "block.unset": {
+          behaviorOperationImplementations["block.unset"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "child.set": {
+          behaviorOperationImplementations["child.set"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "child.unset": {
+          behaviorOperationImplementations["child.unset"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "decorator.add": {
+          behaviorOperationImplementations["decorator.add"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "decorator.remove": {
+          behaviorOperationImplementations["decorator.remove"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "delete": {
+          behaviorOperationImplementations.delete({
+            context,
+            operation
+          });
+          break;
+        }
+        case "history.redo": {
+          behaviorOperationImplementations["history.redo"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "history.undo": {
+          behaviorOperationImplementations["history.undo"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "insert.block": {
+          behaviorOperationImplementations["insert.block"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "insert.text": {
+          behaviorOperationImplementations["insert.text"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "move.backward": {
+          behaviorOperationImplementations["move.backward"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "move.block": {
+          behaviorOperationImplementations["move.block"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "move.forward": {
+          behaviorOperationImplementations["move.forward"]({
+            context,
+            operation
+          });
+          break;
+        }
+        default: {
+          behaviorOperationImplementations.select({
+            context,
+            operation
+          });
+          break;
+        }
       }
+    } catch (error) {
+      console.error(new Error(`Executing "${operation.type}" failed due to: ${error.message}`));
     }
-  } catch (error) {
-    console.error(new Error(`Executing "${operation.type}" failed due to: ${error.message}`));
-  }
-}
-const CURRENT_OPERATION_ID = /* @__PURE__ */ new WeakMap();
-function withApplyingBehaviorOperations(editor, fn) {
-  CURRENT_OPERATION_ID.set(editor, util_sliceBlocks.defaultKeyGenerator()), slate.Editor.withoutNormalizing(editor, fn), CURRENT_OPERATION_ID.set(editor, void 0);
+  });
 }
-function getCurrentOperationId(editor) {
-  return CURRENT_OPERATION_ID.get(editor);
+const IS_PERFORMING_OPERATION = /* @__PURE__ */ new WeakMap();
+function withPerformingBehaviorOperation(editor, fn) {
+  const prev = IS_PERFORMING_OPERATION.get(editor);
+  IS_PERFORMING_OPERATION.set(editor, !0), fn(), IS_PERFORMING_OPERATION.set(editor, prev);
 }
-function isApplyingBehaviorOperations(editor) {
-  return getCurrentOperationId(editor) !== void 0;
+function isPerformingBehaviorOperation(editor) {
+  return IS_PERFORMING_OPERATION.get(editor) ?? !1;
 }
 function createWithEventListeners(editorActor) {
   return function(editor) {
@@ -4988,7 +4974,7 @@ function createWithEventListeners(editorActor) {
       select
     } = editor;
     return editor.delete = (options) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         editorDelete(options);
         return;
       }
@@ -5017,7 +5003,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.deleteBackward = (unit) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         console.error("Unexpected call to .deleteBackward(...)");
         return;
       }
@@ -5030,7 +5016,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.deleteForward = (unit) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         console.error("Unexpected call to .deleteForward(...)");
         return;
       }
@@ -5043,7 +5029,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.insertBreak = () => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         console.error("Unexpected call to .insertBreak(...)");
         return;
       }
@@ -5055,7 +5041,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.insertData = (dataTransfer) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         console.error("Unexpected call to .insertData(...)");
         return;
       }
@@ -5070,13 +5056,14 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.insertSoftBreak = () => {
-      if (isApplyingBehaviorOperations(editor)) {
-        insertTextOperationImplementation({
+      if (isPerformingBehaviorOperation(editor)) {
+        performOperation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
             schema: editorActor.getSnapshot().context.schema
           },
           operation: {
+            type: "insert.text",
             text: `
 `,
             editor
@@ -5092,13 +5079,14 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.insertText = (text) => {
-      if (isApplyingBehaviorOperations(editor)) {
-        insertTextOperationImplementation({
+      if (isPerformingBehaviorOperation(editor)) {
+        performOperation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
             schema: editorActor.getSnapshot().context.schema
           },
           operation: {
+            type: "insert.text",
             text,
             editor
           }
@@ -5114,7 +5102,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.redo = () => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         performOperation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
@@ -5135,7 +5123,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.select = (location) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         select(location);
         return;
       }
@@ -5155,7 +5143,7 @@ function createWithEventListeners(editorActor) {
     }, editor.setFragmentData = () => {
       console.error("Unexpected call to .setFragmentData(...)");
     }, editor.undo = () => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         performOperation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
@@ -9224,7 +9212,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(), mode === "send" && clearUndoStep(editor), withApplyingBehaviorOperations(editor, () => {
+    nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withPerformingBehaviorOperation(editor, () => {
       debug$6(`(execute:${eventCategory(event)})`, JSON.stringify(event, null, 2)), performOperation({
         context: {
           keyGenerator,
@@ -9266,117 +9254,72 @@ function performEvent({
         } catch (error) {
           console.error(new Error(`Evaluating actions for "${event.type}" failed due to: ${error.message}`));
         }
-        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")) {
-            createUndoStep(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: schema2,
-                  getSnapshot,
-                  nativeEvent,
-                  sendBack
-                });
-                continue;
-              }
-              if (action.type === "raise") {
-                performEvent({
-                  mode: "raise",
-                  behaviors,
-                  remainingEventBehaviors: behaviors,
-                  event: action.event,
-                  editor,
-                  keyGenerator,
-                  schema: schema2,
-                  getSnapshot,
-                  nativeEvent,
-                  sendBack
-                });
-                continue;
-              }
-              performEvent({
-                mode: "execute",
-                behaviors,
-                remainingEventBehaviors: [],
-                event: action.event,
-                editor,
-                keyGenerator,
-                schema: schema2,
-                getSnapshot,
-                nativeEvent: void 0,
-                sendBack
+        if (actions.length === 0)
+          continue;
+        nativeEventPrevented = actions.some((action) => action.type === "raise" || action.type === "execute") || !actions.some((action) => action.type === "forward");
+        let undoStepCreated = !1;
+        actions.some((action) => action.type === "execute") && (createUndoStep(editor), undoStepCreated = !0);
+        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}`));
             }
-            clearUndoStep(editor);
             continue;
           }
-          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: schema2,
-                getSnapshot,
-                nativeEvent,
-                sendBack
-              });
-              continue;
-            }
-            if (action.type === "raise") {
-              performEvent({
-                mode: "raise",
-                behaviors,
-                remainingEventBehaviors: mode === "execute" ? remainingEventBehaviors : behaviors,
-                event: action.event,
-                editor,
-                keyGenerator,
-                schema: schema2,
-                getSnapshot,
-                nativeEvent,
-                sendBack
-              });
-              continue;
-            }
-            action.type === "execute" && console.error("Unexpected action type: `execute`");
+          if (action.type === "forward") {
+            const remainingEventBehaviors2 = eventBehaviors.slice(eventBehaviorIndex + 1);
+            performEvent({
+              mode: mode === "execute" ? "execute" : "forward",
+              behaviors,
+              remainingEventBehaviors: remainingEventBehaviors2,
+              event: action.event,
+              editor,
+              keyGenerator,
+              schema: schema2,
+              getSnapshot,
+              nativeEvent,
+              sendBack
+            });
+            continue;
           }
+          if (action.type === "raise") {
+            performEvent({
+              mode: mode === "execute" ? "execute" : "raise",
+              behaviors,
+              remainingEventBehaviors: mode === "execute" ? remainingEventBehaviors : behaviors,
+              event: action.event,
+              editor,
+              keyGenerator,
+              schema: schema2,
+              getSnapshot,
+              nativeEvent,
+              sendBack
+            });
+            continue;
+          }
+          performEvent({
+            mode: "execute",
+            behaviors,
+            remainingEventBehaviors: [],
+            event: action.event,
+            editor,
+            keyGenerator,
+            schema: schema2,
+            getSnapshot,
+            nativeEvent: void 0,
+            sendBack
+          });
         }
+        undoStepCreated && clearUndoStep(editor);
       }
       break;
     }
   }
-  !defaultBehaviorOverwritten && isSyntheticBehaviorEvent(event) ? (nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withApplyingBehaviorOperations(editor, () => {
+  !defaultBehaviorOverwritten && isSyntheticBehaviorEvent(event) ? (nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withPerformingBehaviorOperation(editor, () => {
     debug$6(`(execute:${eventCategory(event)})`, JSON.stringify(event, null, 2)), performOperation({
       context: {
         keyGenerator,
@@ -11316,7 +11259,8 @@ async function updateValue({
                   slateEditor,
                   value
                 });
-                isChanged = blockChanged || isChanged, isValid = isValid && blockValid;
+                if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !isValid)
+                  break;
               }
               resolve();
             })();
@@ -11345,7 +11289,9 @@ async function updateValue({
               slateEditor,
               value
             });
-            isChanged = blockChanged || isChanged, isValid = isValid && blockValid, index++;
+            if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !blockValid)
+              break;
+            index++;
           }
         });
       });