@portabletext/editor 1.47.3 → 1.47.5

package/lib/_chunks-cjs/editor-provider.cjs

@@ -1313,12 +1313,12 @@ const CURRENT_BEHAVIOR_ACTION_SET = /* @__PURE__ */ new WeakMap();
 function withApplyingBehaviorActionSet(editor, fn) {
   const current = CURRENT_BEHAVIOR_ACTION_SET.get(editor);
   if (current) {
-    withApplyingBehaviorActions(editor, fn);
+    fn();
     return;
   }
   CURRENT_BEHAVIOR_ACTION_SET.set(editor, current ?? {
     actionSetId: defaultKeyGenerator()
-  }), withApplyingBehaviorActions(editor, fn), CURRENT_BEHAVIOR_ACTION_SET.set(editor, void 0);
+  }), fn(), CURRENT_BEHAVIOR_ACTION_SET.set(editor, void 0);
 }
 function getCurrentBehaviorActionSetId(editor) {
   return CURRENT_BEHAVIOR_ACTION_SET.get(editor)?.actionSetId;
@@ -2629,7 +2629,10 @@ function createOperationToPatches(editorActor) {
 const insertTextActionImplementation = ({
   action
 }) => {
-  slate.Transforms.insertText(action.editor, action.text);
+  action.editor.marks ? slate.Transforms.insertNodes(action.editor, {
+    text: action.text,
+    ...action.editor.marks
+  }) : slate.Transforms.insertText(action.editor, action.text), action.editor.marks = null;
 };
 function isPortableTextSpan(node) {
   return node._type === "span" && "text" in node && typeof node.text == "string" && (typeof node.marks > "u" || Array.isArray(node.marks) && node.marks.every((mark) => typeof mark == "string"));
@@ -3388,10 +3391,6 @@ const blockSetBehaviorActionImplementation = ({
   }, {
     at: location
   });
-}, blurActionImplementation = ({
-  action
-}) => {
-  slateReact.ReactEditor.blur(action.editor);
 };
 function getFocusBlock({
   editor
@@ -3722,10 +3721,6 @@ const decoratorAddActionImplementation = ({
   action
 }) => {
   action.effect();
-}, focusActionImplementation = ({
-  action
-}) => {
-  slateReact.ReactEditor.focus(action.editor);
 }, insertInlineObjectActionImplementation = ({
   context,
   action
@@ -4038,10 +4033,8 @@ const moveBackwardActionImplementation = ({
   "annotation.remove": removeAnnotationActionImplementation,
   "block.set": blockSetBehaviorActionImplementation,
   "block.unset": blockUnsetBehaviorActionImplementation,
-  blur: blurActionImplementation,
   "decorator.add": decoratorAddActionImplementation,
   "decorator.remove": removeDecoratorActionImplementation,
-  focus: focusActionImplementation,
   delete: deleteActionImplementation,
   "delete.backward": deleteBackwardActionImplementation,
   "delete.forward": deleteForwardActionImplementation,
@@ -4093,13 +4086,6 @@ function performAction({
       });
       break;
     }
-    case "blur": {
-      behaviorActionImplementations.blur({
-        context,
-        action
-      });
-      break;
-    }
     case "decorator.add": {
       behaviorActionImplementations["decorator.add"]({
         context,
@@ -4149,13 +4135,6 @@ function performAction({
       });
       break;
     }
-    case "focus": {
-      behaviorActionImplementations.focus({
-        context,
-        action
-      });
-      break;
-    }
     case "history.redo": {
       behaviorActionImplementations["history.redo"]({
         context,
@@ -4332,10 +4311,7 @@ function createWithEventListeners(editorActor) {
           type: "insert.text",
           text
         },
-        editor,
-        defaultActionCallback: () => {
-          insertText(text, options);
-        }
+        editor
       });
     }, editor.redo = () => {
       if (isApplyingBehaviorActions(editor)) {
@@ -4374,10 +4350,7 @@ function createWithEventListeners(editorActor) {
             range
           })
         },
-        editor,
-        defaultActionCallback: () => {
-          select(location);
-        }
+        editor
       });
     }, editor.setFragmentData = () => {
       console.warn("Unexpected call to .setFragmentData(...)");
@@ -5860,8 +5833,7 @@ function performEvent({
   keyGenerator,
   schema: schema2,
   getSnapshot,
-  nativeEvent,
-  defaultActionCallback
+  nativeEvent
 }) {
   debug$3(`(${eventCategory(event)})`, JSON.stringify(event, null, 2));
   const defaultAction = isCustomBehaviorEvent(event) || isNativeBehaviorEvent(event) || isAbstractBehaviorEvent(event) ? void 0 : {
@@ -5874,16 +5846,6 @@ 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) {
-    if (defaultActionCallback) {
-      withApplyingBehaviorActions(editor, () => {
-        try {
-          defaultActionCallback();
-        } catch (error) {
-          console.error(new Error(`Performing action "${event.type}" failed due to: ${error.message}`));
-        }
-      });
-      return;
-    }
     if (!defaultAction)
       return;
     withApplyingBehaviorActions(editor, () => {
@@ -5894,11 +5856,11 @@ function performEvent({
             schema: schema2
           },
           action: defaultAction
-        }), editor.onChange();
+        });
       } catch (error) {
         console.error(new Error(`Performing action "${defaultAction.type}" as a result of "${event.type}" failed due to: ${error.message}`));
       }
-    });
+    }), editor.onChange();
     return;
   }
   const guardSnapshot = getSnapshot();
@@ -5925,7 +5887,6 @@ function performEvent({
                 keyGenerator,
                 schema: schema2,
                 getSnapshot,
-                defaultActionCallback: void 0,
                 nativeEvent: void 0
               });
               continue;
@@ -5940,45 +5901,53 @@ function performEvent({
                   keyGenerator,
                   schema: schema2,
                   getSnapshot,
-                  defaultActionCallback: void 0,
                   nativeEvent: void 0
                 });
-              else
-                try {
-                  performAction({
-                    context: {
-                      keyGenerator,
-                      schema: schema2
-                    },
-                    action: {
-                      ...action.event,
-                      editor
-                    }
-                  });
-                } catch (error) {
-                  console.error(new Error(`Performing action "${action.event.type}" as a result of "${event.type}" failed due to: ${error.message}`));
+              else {
+                const internalAction2 = {
+                  ...action.event,
+                  editor
+                };
+                let actionFailed2 = !1;
+                if (withApplyingBehaviorActions(editor, () => {
+                  try {
+                    performAction({
+                      context: {
+                        keyGenerator,
+                        schema: schema2
+                      },
+                      action: internalAction2
+                    });
+                  } catch (error) {
+                    console.error(new Error(`Performing action "${action.event.type}" as a result of "${event.type}" failed due to: ${error.message}`)), actionFailed2 = !0;
+                  }
+                }), actionFailed2)
                   break;
-                }
+                editor.onChange();
+              }
               continue;
             }
             const internalAction = {
               ...action,
               editor
             };
-            try {
-              performAction({
-                context: {
-                  keyGenerator,
-                  schema: schema2
-                },
-                action: internalAction
-              });
-            } catch (error) {
-              console.error(new Error(`Performing action "${internalAction.type}" as a result of "${event.type}" failed due to: ${error.message}`));
+            let actionFailed = !1;
+            if (withApplyingBehaviorActions(editor, () => {
+              try {
+                performAction({
+                  context: {
+                    keyGenerator,
+                    schema: schema2
+                  },
+                  action: internalAction
+                });
+              } catch (error) {
+                console.error(new Error(`Performing action "${internalAction.type}" as a result of "${event.type}" failed due to: ${error.message}`)), actionFailed = !0;
+              }
+            }), actionFailed)
               break;
-            }
+            editor.onChange();
           }
-          editor.onChange();
         }));
       }
       if (behaviorOverwritten) {
@@ -5988,16 +5957,6 @@ function performEvent({
     }
   }
   if (!behaviorOverwritten) {
-    if (defaultActionCallback) {
-      withApplyingBehaviorActions(editor, () => {
-        try {
-          defaultActionCallback();
-        } catch (error) {
-          console.error(new Error(`Performing "${event.type}" failed due to: ${error.message}`));
-        }
-      });
-      return;
-    }
     if (!defaultAction)
       return;
     withApplyingBehaviorActions(editor, () => {
@@ -6008,11 +5967,11 @@ function performEvent({
             schema: schema2
           },
           action: defaultAction
-        }), editor.onChange();
+        });
       } catch (error) {
         console.error(new Error(`Performing action "${defaultAction.type}" as a result of "${event.type}" failed due to: ${error.message}`));
       }
-    });
+    }), editor.onChange();
   }
 }
 function slateChildrenToBlocks(schema2, value) {
@@ -6156,6 +6115,30 @@ const editorMachine = xstate.setup({
     "clear pending events": xstate.assign({
       pendingEvents: []
     }),
+    "handle blur": ({
+      event
+    }) => {
+      xstate.assertEvent(event, "blur");
+      try {
+        slateReact.ReactEditor.blur(event.editor);
+      } catch (error) {
+        console.error(new Error(`Failed to blur editor: ${error.message}`));
+      }
+    },
+    "handle focus": ({
+      context
+    }) => {
+      if (!context.slateEditor) {
+        console.error("No Slate editor found to focus");
+        return;
+      }
+      try {
+        const currentSelection = context.slateEditor.selection;
+        slateReact.ReactEditor.focus(context.slateEditor), currentSelection && slate.Transforms.select(context.slateEditor, currentSelection);
+      } catch (error) {
+        console.error(new Error(`Failed to focus editor: ${error.message}`));
+      }
+    },
     "handle behavior event": ({
       context,
       event,
@@ -6179,10 +6162,14 @@ const editorMachine = xstate.setup({
           hasTag: (tag) => self.getSnapshot().hasTag(tag),
           internalDrag: context.internalDrag
         }),
-        nativeEvent: event.nativeEvent,
-        defaultActionCallback: event.type === "behavior event" ? event.defaultActionCallback : void 0
+        nativeEvent: event.nativeEvent
       });
     }
+  },
+  guards: {
+    "slate is busy": ({
+      context
+    }) => context.slateEditor ? context.slateEditor.operations.length > 0 : !1
   }
 }).createMachine({
   id: "editor",
@@ -6361,6 +6348,17 @@ const editorMachine = xstate.setup({
             },
             "behavior event": {
               actions: "handle behavior event"
+            },
+            blur: {
+              actions: "handle blur"
+            },
+            focus: {
+              target: ".focusing",
+              actions: [xstate.assign({
+                slateEditor: ({
+                  event
+                }) => event.editor
+              })]
             }
           },
           initial: "idle",
@@ -6380,6 +6378,27 @@ const editorMachine = xstate.setup({
                 }
               }
             },
+            focusing: {
+              initial: "checking if busy",
+              states: {
+                "checking if busy": {
+                  always: [{
+                    guard: "slate is busy",
+                    target: "busy"
+                  }, {
+                    target: "#editor.edit mode.editable.idle",
+                    actions: ["handle focus"]
+                  }]
+                },
+                busy: {
+                  after: {
+                    10: {
+                      target: "checking if busy"
+                    }
+                  }
+                }
+              }
+            },
             "dragging internally": {
               exit: [({
                 context
@@ -6712,19 +6731,13 @@ function createEditableAPI(editor, editorActor) {
   return {
     focus: () => {
       editorActor.send({
-        type: "behavior event",
-        behaviorEvent: {
-          type: "focus"
-        },
+        type: "focus",
         editor
       });
     },
     blur: () => {
       editorActor.send({
-        type: "behavior event",
-        behaviorEvent: {
-          type: "blur"
-        },
+        type: "blur",
         editor
       });
     },
@@ -7136,6 +7149,18 @@ function createInternalEditorFromActor(editorActor, legacySchema) {
         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",