@portabletext/editor 2.9.2 → 2.10.0

package/lib/index.cjs

@@ -1089,6 +1089,11 @@ function getEditorSnapshot({
   editorActorSnapshot,
   slateEditorInstance
 }) {
+  const selection = slateEditorInstance.selection ? slateRangeToSelection({
+    schema: editorActorSnapshot.context.schema,
+    editor: slateEditorInstance,
+    range: slateEditorInstance.selection
+  }) : null;
   return {
     blockIndexMap: slateEditorInstance.blockIndexMap,
     context: {
@@ -1098,7 +1103,7 @@ function getEditorSnapshot({
         "edit mode": "read only"
       }),
       schema: editorActorSnapshot.context.schema,
-      selection: editorActorSnapshot.context.selection,
+      selection,
       value: slateEditorInstance.value
     },
     decoratorState: slateEditorInstance.decoratorState
@@ -1926,6 +1931,7 @@ const RelayActorContext = React.createContext({}), debug$d = debugWithName("comp
                 },
                 blocks: result_1.insert,
                 options: {
+                  removeUnusedMarkDefs: !0,
                   validateFields: !1
                 }
               }),
@@ -2394,6 +2400,7 @@ const converterJson = {
         context: snapshot.context,
         block,
         options: {
+          removeUnusedMarkDefs: !0,
           validateFields: !1
         }
       });
@@ -2456,6 +2463,7 @@ function createConverterTextHtml(legacySchema) {
           context: snapshot.context,
           block,
           options: {
+            removeUnusedMarkDefs: !0,
             validateFields: !1
           }
         });
@@ -2503,6 +2511,7 @@ function createConverterTextPlain(legacySchema) {
           context: snapshot.context,
           block,
           options: {
+            removeUnusedMarkDefs: !0,
             validateFields: !1
           }
         });
@@ -4050,12 +4059,12 @@ const addAnnotationOperationImplementation = ({
     context,
     block: updatedBlock,
     options: {
+      removeUnusedMarkDefs: !1,
       validateFields: !0
     }
   });
   if (!parsedBlock)
     throw new Error(`Unable to update block at ${JSON.stringify(operation.at)}`);
-  parsedBlock.markDefs = updatedBlock.markDefs;
   const slateBlock = toSlateValue([parsedBlock], {
     schemaTypes: context.schema
   })?.at(0);
@@ -4100,6 +4109,7 @@ const addAnnotationOperationImplementation = ({
       context,
       block: omit__default.default(parsedBlock, propsToRemove),
       options: {
+        removeUnusedMarkDefs: !0,
         validateFields: !0
       }
     });
@@ -4117,6 +4127,7 @@ const addAnnotationOperationImplementation = ({
     context,
     block: omit__default.default(parsedBlock, operation.props.filter((prop) => prop !== "_type")),
     options: {
+      removeUnusedMarkDefs: !0,
       validateFields: !0
     }
   });
@@ -4505,6 +4516,7 @@ const insertBlockOperationImplementation = ({
     block: operation.block,
     context,
     options: {
+      removeUnusedMarkDefs: !0,
       validateFields: !0
     }
   });
@@ -4715,7 +4727,76 @@ function insertBlock({
     }
   }
 }
-const insertTextOperationImplementation = ({
+const insertChildOperationImplementation = ({
+  context,
+  operation
+}) => {
+  const focus = operation.editor.selection?.focus, focusBlockIndex = focus?.path.at(0), focusChildIndex = focus?.path.at(1);
+  if (focusBlockIndex === void 0 || focusChildIndex === void 0)
+    throw new Error("Unable to insert child without a focus");
+  const [focusBlock, focusBlockPath] = getFocusBlock({
+    editor: operation.editor
+  });
+  if (!focus || !focusBlock || !focusBlockPath)
+    throw new Error("Unable to insert child without a focus block");
+  if (!schema.isTextBlock(context, focusBlock))
+    throw new Error("Unable to insert child into a non-text block");
+  const markDefs = focusBlock.markDefs ?? [], markDefKeyMap = /* @__PURE__ */ new Map();
+  for (const markDef of markDefs)
+    markDefKeyMap.set(markDef._key, markDef._key);
+  const span = util_sliceBlocks.parseSpan({
+    span: operation.child,
+    context,
+    markDefKeyMap,
+    options: {
+      validateFields: !0
+    }
+  });
+  if (span) {
+    const [focusSpan] = getFocusSpan({
+      editor: operation.editor
+    });
+    focusSpan ? slate.Transforms.insertNodes(operation.editor, span, {
+      at: focus,
+      select: !0
+    }) : slate.Transforms.insertNodes(operation.editor, span, {
+      at: [focusBlockIndex, focusChildIndex + 1],
+      select: !0
+    });
+    return;
+  }
+  const inlineObject = util_sliceBlocks.parseInlineObject({
+    inlineObject: operation.child,
+    context,
+    options: {
+      validateFields: !0
+    }
+  });
+  if (inlineObject) {
+    const {
+      _key,
+      _type,
+      ...rest
+    } = inlineObject;
+    slate.Transforms.insertNodes(operation.editor, {
+      _key,
+      _type,
+      children: [{
+        _key: VOID_CHILD_KEY,
+        _type: "span",
+        text: "",
+        marks: []
+      }],
+      value: rest,
+      __inline: !0
+    }, {
+      at: [focusBlockIndex, focusChildIndex + 1],
+      select: !0
+    });
+    return;
+  }
+  throw new Error("Unable to parse child");
+}, insertTextOperationImplementation = ({
   context,
   operation
 }) => {
@@ -4819,6 +4900,7 @@ const insertTextOperationImplementation = ({
   "history.redo": historyRedoOperationImplementation,
   "history.undo": historyUndoOperationImplementation,
   "insert.block": insertBlockOperationImplementation,
+  "insert.child": insertChildOperationImplementation,
   "insert.text": insertTextOperationImplementation,
   "move.backward": moveBackwardOperationImplementation,
   "move.block": moveBlockOperationImplementation,
@@ -4916,6 +4998,13 @@ function performOperation({
           });
           break;
         }
+        case "insert.child": {
+          behaviorOperationImplementations["insert.child"]({
+            context,
+            operation
+          });
+          break;
+        }
         case "insert.text": {
           behaviorOperationImplementations["insert.text"]({
             context,
@@ -7693,7 +7782,11 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = behaviors_index.defineBehavior
 }, coreBehaviorsConfig = [...coreAnnotationBehaviors, coreDecoratorBehaviors.strongShortcut, coreDecoratorBehaviors.emShortcut, coreDecoratorBehaviors.underlineShortcut, coreDecoratorBehaviors.codeShortcut, ...coreDndBehaviors, coreBlockObjectBehaviors.clickingAboveLonelyBlockObject, coreBlockObjectBehaviors.clickingBelowLonelyBlockObject, coreBlockObjectBehaviors.arrowDownOnLonelyBlockObject, coreBlockObjectBehaviors.arrowUpOnLonelyBlockObject, coreBlockObjectBehaviors.breakingBlockObject, coreBlockObjectBehaviors.deletingEmptyTextBlockAfterBlockObject, coreBlockObjectBehaviors.deletingEmptyTextBlockBeforeBlockObject, coreListBehaviors.clearListOnBackspace, coreListBehaviors.unindentListOnBackspace, coreListBehaviors.mergeTextIntoListOnDelete, coreListBehaviors.mergeTextIntoListOnBackspace, coreListBehaviors.deletingListFromStart, coreListBehaviors.clearListOnEnter, coreListBehaviors.indentListOnTab, coreListBehaviors.unindentListOnShiftTab, coreListBehaviors.inheritListLevel, coreListBehaviors.inheritListItem, coreListBehaviors.inheritListProperties, coreInsertBreakBehaviors.breakingAtTheEndOfTextBlock, coreInsertBreakBehaviors.breakingAtTheStartOfTextBlock, coreInsertBreakBehaviors.breakingEntireDocument, coreInsertBreakBehaviors.breakingEntireBlocks, coreInsertBreakBehaviors.breakingInlineObject].map((behavior) => ({
   behavior,
   priority: corePriority
-})), abstractAnnotationBehaviors = [behaviors_index.defineBehavior({
+}));
+function withoutNormalizingConditional(editor, predicate, fn) {
+  predicate() ? slate.Editor.withoutNormalizing(editor, fn) : fn();
+}
+const abstractAnnotationBehaviors = [behaviors_index.defineBehavior({
   on: "annotation.set",
   guard: ({
     snapshot,
@@ -8475,21 +8568,63 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = behaviors_index.defineBehavior
     type: "split"
   })]]
 }), behaviors_index.defineBehavior({
-  on: "insert.inline object",
+  on: "insert.child",
+  guard: ({
+    snapshot
+  }) => {
+    const lastBlock = selector_isSelectingEntireBlocks.getLastBlock(snapshot);
+    return !lastBlock || snapshot.context.selection ? !1 : {
+      lastBlockEndPoint: util_isSelectionCollapsed.getBlockEndPoint({
+        context: snapshot.context,
+        block: lastBlock
+      })
+    };
+  },
+  actions: [({
+    event
+  }, {
+    lastBlockEndPoint
+  }) => [behaviors_index.raise({
+    type: "select",
+    at: {
+      anchor: lastBlockEndPoint,
+      focus: lastBlockEndPoint
+    }
+  }), behaviors_index.raise(event)]]
+}), behaviors_index.defineBehavior({
+  on: "insert.child",
+  guard: ({
+    snapshot
+  }) => {
+    const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot);
+    return snapshot.context.selection && !focusTextBlock;
+  },
   actions: [({
     snapshot,
     event
-  }) => [behaviors_index.execute({
+  }) => [behaviors_index.raise({
     type: "insert.block",
     block: {
       _type: snapshot.context.schema.block.name,
       children: [{
-        _type: event.inlineObject.name,
-        ...event.inlineObject.value
+        _type: snapshot.context.schema.span.name,
+        text: "",
+        marks: []
       }]
     },
     placement: "auto",
     select: "end"
+  }), behaviors_index.raise(event)]]
+}), behaviors_index.defineBehavior({
+  on: "insert.inline object",
+  actions: [({
+    event
+  }) => [behaviors_index.raise({
+    type: "insert.child",
+    child: {
+      _type: event.inlineObject.name,
+      ...event.inlineObject.value
+    }
   })]]
 }), behaviors_index.defineBehavior({
   on: "insert.soft break",
@@ -8501,33 +8636,59 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = behaviors_index.defineBehavior
 }), behaviors_index.defineBehavior({
   on: "insert.span",
   guard: ({
-    snapshot,
-    event
-  }) => ({
-    markDefs: event.annotations?.map((annotation) => ({
-      _type: annotation.name,
-      _key: snapshot.context.keyGenerator(),
-      ...annotation.value
-    })) ?? []
-  }),
+    snapshot
+  }) => !selector_isSelectionExpanded.getFocusTextBlock(snapshot),
   actions: [({
     snapshot,
     event
-  }, {
-    markDefs
-  }) => [behaviors_index.execute({
+  }) => [behaviors_index.raise({
     type: "insert.block",
     block: {
       _type: snapshot.context.schema.block.name,
       children: [{
         _type: snapshot.context.schema.span.name,
-        text: event.text,
-        marks: [...event.decorators ?? [], ...markDefs.map((markDef) => markDef._key)]
-      }],
-      markDefs
+        text: "",
+        marks: []
+      }]
     },
     placement: "auto",
     select: "end"
+  }), behaviors_index.raise(event)]]
+}), behaviors_index.defineBehavior({
+  on: "insert.span",
+  guard: ({
+    snapshot,
+    event
+  }) => {
+    const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot);
+    return {
+      markDefs: event.annotations?.map((annotation) => ({
+        _type: annotation.name,
+        _key: snapshot.context.keyGenerator(),
+        ...annotation.value
+      })) ?? [],
+      focusTextBlock
+    };
+  },
+  actions: [({
+    snapshot,
+    event
+  }, {
+    markDefs,
+    focusTextBlock
+  }) => [...focusTextBlock ? [behaviors_index.raise({
+    type: "block.set",
+    at: focusTextBlock.path,
+    props: {
+      markDefs: [...focusTextBlock.node.markDefs ?? [], ...markDefs]
+    }
+  })] : [], behaviors_index.raise({
+    type: "insert.child",
+    child: {
+      _type: snapshot.context.schema.span.name,
+      text: event.text,
+      marks: [...event.decorators ?? [], ...markDefs.map((markDef) => markDef._key)]
+    }
   })]]
 })], abstractKeyboardBehaviors = [
   /**
@@ -9005,6 +9166,7 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = behaviors_index.defineBehavior
         }),
         context: snapshot.context,
         options: {
+          removeUnusedMarkDefs: !0,
           validateFields: !1
         }
       });
@@ -9259,62 +9421,64 @@ function performEvent({
         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
+        const actionTypes = actions.map((action) => action.type), uniqueActionTypes = new Set(actionTypes), raiseGroup = actionTypes.length > 1 && uniqueActionTypes.size === 1 && uniqueActionTypes.has("raise"), executeGroup = actionTypes.length > 1 && uniqueActionTypes.size === 1 && uniqueActionTypes.has("execute");
+        withoutNormalizingConditional(editor, () => raiseGroup || executeGroup, () => {
+          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: mode === "execute" ? "execute" : "forward",
+                behaviors,
+                remainingEventBehaviors: remainingEventBehaviors2,
+                event: action.event,
+                editor,
+                keyGenerator,
+                schema: schema2,
+                getSnapshot,
+                nativeEvent,
+                sendBack
               });
-            } catch (error) {
-              console.error(new Error(`Executing effect as a result of "${event.type}" failed due to: ${error.message}`));
+              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;
             }
-            continue;
-          }
-          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",
+              mode: "execute",
               behaviors,
-              remainingEventBehaviors: mode === "execute" ? remainingEventBehaviors : behaviors,
+              remainingEventBehaviors: [],
               event: action.event,
               editor,
               keyGenerator,
               schema: schema2,
               getSnapshot,
-              nativeEvent,
+              nativeEvent: void 0,
               sendBack
             });
-            continue;
           }
-          performEvent({
-            mode: "execute",
-            behaviors,
-            remainingEventBehaviors: [],
-            event: action.event,
-            editor,
-            keyGenerator,
-            schema: schema2,
-            getSnapshot,
-            nativeEvent: void 0,
-            sendBack
-          });
-        }
-        undoStepCreated && clearUndoStep(editor);
+        }), undoStepCreated && clearUndoStep(editor);
       }
       break;
     }