@portabletext/editor 7.10.8-crx.0 → 7.10.9

package/lib/index.js

@@ -11042,12 +11042,13 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
 }), preventOverlappingAnnotations = defineBehavior({
   // Given an `annotation.add` event
   on: "annotation.add",
-  // When the annotation is active in the selection
+  // When the raised `annotation.remove` would strip the annotation from at
+  // least one span
   guard: ({
     snapshot,
     event
   }) => {
-    const at = event.at ?? snapshot.context.selection;
+    const at = resolveEffectiveSelection(snapshot, event.at);
     if (!at)
       return !1;
     const adjustedSnapshot = {
@@ -11114,7 +11115,22 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
       marks: activeDecorators
     }
   }), forward(event)]]
-}), coreAnnotationBehaviors = [addAnnotationOnCollapsedSelection, preventOverlappingAnnotations, stripAnnotationsOnFullSpanDeletion], defaultKeyboardShortcuts = {
+}), coreAnnotationBehaviors = [addAnnotationOnCollapsedSelection, preventOverlappingAnnotations, stripAnnotationsOnFullSpanDeletion];
+function resolveEffectiveSelection(snapshot, at) {
+  if (!at)
+    return snapshot.context.selection;
+  const resolvedAt = resolveSelection({
+    snapshot
+  }, at);
+  return resolvedAt ? {
+    anchor: resolvedAt.anchor,
+    focus: resolvedAt.focus,
+    // Resolving can move either point, so `at.backward` may no longer
+    // match; derive the direction from the resolved points instead.
+    backward: isBackwardRange(resolvedAt, snapshot.context)
+  } : snapshot.context.selection;
+}
+const defaultKeyboardShortcuts = {
   arrowDown: createKeyboardShortcut({
     default: [{
       key: "ArrowDown",
@@ -16704,7 +16720,21 @@ function isCustomBehaviorEvent(event) {
 function eventCategory(event) {
   return isNativeBehaviorEvent(event) ? "native" : isAbstractBehaviorEvent(event) ? "synthetic" : isCustomBehaviorEvent(event) ? "custom" : "synthetic";
 }
-function performEvent({
+const maxEventDepth = 100, eventDepths = /* @__PURE__ */ new WeakMap();
+function performEvent(args) {
+  const depth = (eventDepths.get(args.editor) ?? 0) + 1;
+  if (depth > maxEventDepth) {
+    console.error(new Error(`Performing "${args.event.type}" was aborted because the event chain exceeded a depth of ${maxEventDepth}. This usually means Behaviors keep raising events in a cycle.`));
+    return;
+  }
+  eventDepths.set(args.editor, depth);
+  try {
+    performEventInternal(args);
+  } finally {
+    eventDepths.set(args.editor, depth - 1);
+  }
+}
+function performEventInternal({
   mode,
   behaviors,
   remainingEventBehaviors,
@@ -18471,81 +18501,65 @@ async function updateValue({
 }) {
   let doneSyncing = !1, isChanged = !1, isValid = !0;
   const hadSelection = !!editorEngine.snapshot.context.selection;
-  try {
-    if ((!value || value.length === 0) && (clearEditor({
-      editorEngine,
-      doneSyncing
-    }), isChanged = !0), value && value.length > 0)
-      if (streamBlocks)
-        await new Promise((resolve, reject) => {
-          if (doneSyncing) {
-            resolve();
-            return;
-          }
-          isChanged = removeExtraBlocks({
-            editorEngine,
-            value
-          }), (async () => {
-            try {
-              for await (const [currentBlock, currentBlockIndex] of getStreamedBlocks({
-                value
-              })) {
-                const {
-                  blockChanged,
-                  blockValid
-                } = syncBlock({
-                  context,
-                  sendBack,
-                  block: currentBlock,
-                  index: currentBlockIndex,
-                  editorEngine,
-                  value
-                });
-                if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !isValid)
-                  break;
-              }
-              resolve();
-            } catch (error) {
-              reject(error);
-            }
-          })();
-        });
-      else {
-        if (doneSyncing)
+  if ((!value || value.length === 0) && (clearEditor({
+    editorEngine,
+    doneSyncing
+  }), isChanged = !0), value && value.length > 0)
+    if (streamBlocks)
+      await new Promise((resolve) => {
+        if (doneSyncing) {
+          resolve();
           return;
+        }
         isChanged = removeExtraBlocks({
           editorEngine,
           value
-        });
-        let index = 0;
-        for (const block of value) {
-          const {
-            blockChanged,
-            blockValid
-          } = syncBlock({
-            context,
-            sendBack,
-            block,
-            index,
-            editorEngine,
+        }), (async () => {
+          for await (const [currentBlock, currentBlockIndex] of getStreamedBlocks({
             value
-          });
-          if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !blockValid)
-            break;
-          index++;
-        }
+          })) {
+            const {
+              blockChanged,
+              blockValid
+            } = syncBlock({
+              context,
+              sendBack,
+              block: currentBlock,
+              index: currentBlockIndex,
+              editorEngine,
+              value
+            });
+            if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !isValid)
+              break;
+          }
+          resolve();
+        })();
+      });
+    else {
+      if (doneSyncing)
+        return;
+      isChanged = removeExtraBlocks({
+        editorEngine,
+        value
+      });
+      let index = 0;
+      for (const block of value) {
+        const {
+          blockChanged,
+          blockValid
+        } = syncBlock({
+          context,
+          sendBack,
+          block,
+          index,
+          editorEngine,
+          value
+        });
+        if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !blockValid)
+          break;
+        index++;
       }
-  } catch (err) {
-    console.error(err), sendBack({
-      type: "invalid value",
-      resolution: null,
-      value
-    }), doneSyncing = !0, sendBack({
-      type: "done syncing",
-      value
-    });
-    return;
-  }
+    }
   if (!isValid) {
     debug.syncValue("Invalid value, returning"), doneSyncing = !0, sendBack({
       type: "done syncing",
@@ -18794,10 +18808,6 @@ function updateBlock({
         const childNode = oldEngineBlock.children[childIndex];
         if (!childNode)
           return;
-        if (!liveBlockHasChildKey(editorEngine, oldEngineBlock._key, childNode._key)) {
-          debug.syncValue("Skipping superfluous-child unset; _key not present in live children", childNode._key);
-          return;
-        }
         editorEngine.apply({
           type: "unset",
           path: [{
@@ -18848,14 +18858,14 @@ function updateBlock({
           const oldChild = oldEngineBlock.children[currentBlockChildIndex];
           if (!oldChild)
             return;
-          liveBlockHasChildKey(editorEngine, oldEngineBlock._key, oldChild._key) ? editorEngine.apply({
+          editorEngine.apply({
             type: "unset",
             path: [{
               _key: oldEngineBlock._key
             }, "children", {
               _key: oldChild._key
             }]
-          }) : debug.syncValue("Skipping replace-child unset; _key not present in live children", oldChild._key);
+          });
           const prevSibling = currentBlockChildIndex > 0 ? engineBlock.children[currentBlockChildIndex - 1] : void 0;
           prevSibling ? editorEngine.apply({
             type: "insert",
@@ -18899,12 +18909,6 @@ function updateBlock({
     });
   }
 }
-function liveBlockHasChildKey(editorEngine, blockKey, childKey) {
-  const liveBlock = editorEngine.snapshot.context.value.find((node) => node._key === blockKey);
-  return !liveBlock || !isTextBlock({
-    schema: editorEngine.snapshot.context.schema
-  }, liveBlock) ? !1 : liveBlock.children.some((child) => child._key === childKey);
-}
 function createInternalEditor(config) {
   debug.setup("creating new editor instance");
   const subscriptions = [], editorActor = createActor(editorMachine, {