@portabletext/editor 7.10.10 → 7.10.12

package/lib/index.js

@@ -8978,6 +8978,9 @@ function createSpanNode(context) {
     marks: []
   };
 }
+function isCosmeticNormalizationSkipped(editor) {
+  return editor.isProcessingRemoteChanges;
+}
 const normalizeNode = (editor, entry) => {
   const [node, path2] = entry, nodeRecord = node;
   if (isEditor(node) && node.snapshot.context.value.length === 0) {
@@ -8986,7 +8989,7 @@ const normalizeNode = (editor, entry) => {
     });
     return;
   }
-  if (isTextBlock({
+  if (!isCosmeticNormalizationSkipped(editor) && isTextBlock({
     schema: editor.snapshot.context.schema
   }, node)) {
     const children = getChildren(editor.snapshot, path2);
@@ -9302,7 +9305,9 @@ const normalizeNode = (editor, entry) => {
       }, child)) {
         if (prev != null && isSpan({
           schema: editor.snapshot.context.schema
-        }, prev)) {
+        }, prev) && // Only this merge/empty-drop arm is cosmetic; the inline-object
+        // bracketing below is a repair and keeps running.
+        !isCosmeticNormalizationSkipped(editor)) {
           if (child.text === "") {
             editor.apply({
               type: "unset",
@@ -15088,7 +15093,10 @@ const abstractAnnotationBehaviors = [defineBehavior({
         ...snapshot.context,
         selection: at
       }
-    }, focusTextBlock = getFocusTextBlock(adjustedSnapshot);
+    };
+    if (!isSelectionCollapsed$1(adjustedSnapshot))
+      return !1;
+    const focusTextBlock = getFocusTextBlock(adjustedSnapshot);
     if (!focusTextBlock)
       return !1;
     const nextSibling = getSibling(adjustedSnapshot, focusTextBlock.path, {
@@ -18700,7 +18708,7 @@ function syncBlock({
   if (!oldEngineBlock || !oldBlock) {
     const validation2 = validateValue([block], context.schema, context.keyGenerator);
     if (debug.syncValue("Validating and inserting new block in the end of the value", block), validation2.valid || validation2.resolution?.autoResolve) {
-      const engineBlock = toEngineBlock(block, {
+      const repairedBlock = applyAutoResolution(validation2, [block], block), engineBlock = toEngineBlock(repairedBlock, {
         schemaTypes: context.schema
       });
       return withoutNormalizing(editorEngine, () => {
@@ -18739,46 +18747,53 @@ function syncBlock({
       blockChanged: !1,
       blockValid: !0
     };
-  const validation = validateValue([blockToValidate], context.schema, context.keyGenerator);
-  return !validation.valid && validation.resolution?.autoResolve && validation.resolution?.patches.length > 0 && !context.readOnly && context.previousValue && context.previousValue !== value && (console.warn(`${validation.resolution.action} for block with _key '${blockToValidate._key}'. ${validation.resolution?.description}`), validation.resolution.patches.forEach((patch) => {
+  const validationValue = [blockToValidate], validation = validateValue(validationValue, context.schema, context.keyGenerator);
+  if (!validation.valid && validation.resolution?.autoResolve && validation.resolution?.patches.length > 0 && !context.readOnly && context.previousValue && context.previousValue !== value && (console.warn(`${validation.resolution.action} for block with _key '${blockToValidate._key}'. ${validation.resolution?.description}`), validation.resolution.patches.forEach((patch) => {
     sendBack({
       type: "patch",
       patch
     });
-  })), validation.valid || validation.resolution?.autoResolve ? (oldBlock._key === block._key && oldBlock._type === block._type ? (debug.syncValue("Updating block", oldBlock, block), withoutNormalizing(editorEngine, () => {
-    withRemoteChanges(editorEngine, () => {
-      withoutPatching(editorEngine, () => {
-        updateBlock({
-          context,
-          editorEngine,
-          oldEngineBlock,
-          block,
-          index
+  })), validation.valid || validation.resolution?.autoResolve) {
+    const repairedBlock = applyAutoResolution(validation, validationValue, block);
+    return oldBlock._key === block._key && oldBlock._type === block._type ? (debug.syncValue("Updating block", oldBlock, repairedBlock), withoutNormalizing(editorEngine, () => {
+      withRemoteChanges(editorEngine, () => {
+        withoutPatching(editorEngine, () => {
+          updateBlock({
+            context,
+            editorEngine,
+            oldEngineBlock,
+            block: repairedBlock,
+            index
+          });
         });
       });
-    });
-  })) : (debug.syncValue("Replacing block", oldBlock, block), withoutNormalizing(editorEngine, () => {
-    withRemoteChanges(editorEngine, () => {
-      withoutPatching(editorEngine, () => {
-        replaceBlock({
-          context,
-          editorEngine,
-          block,
-          index
+    })) : (debug.syncValue("Replacing block", oldBlock, repairedBlock), withoutNormalizing(editorEngine, () => {
+      withRemoteChanges(editorEngine, () => {
+        withoutPatching(editorEngine, () => {
+          replaceBlock({
+            context,
+            editorEngine,
+            block: repairedBlock,
+            index
+          });
         });
       });
-    });
-  })), {
-    blockChanged: !0,
-    blockValid: !0
-  }) : (sendBack({
-    type: "invalid value",
-    resolution: validation.resolution,
-    value
-  }), {
-    blockChanged: !1,
-    blockValid: !1
-  });
+    })), {
+      blockChanged: !0,
+      blockValid: !0
+    };
+  } else
+    return sendBack({
+      type: "invalid value",
+      resolution: validation.resolution,
+      value
+    }), {
+      blockChanged: !1,
+      blockValid: !1
+    };
+}
+function applyAutoResolution(validation, validationValue, block) {
+  return !validation.valid && validation.resolution?.autoResolve ? applyAll(validationValue, validation.resolution.patches).at(0) ?? block : block;
 }
 function replaceBlock({
   context,