@portabletext/editor 7.10.7 → 7.10.8-crx.0

package/lib/index.js

@@ -18,7 +18,7 @@ import { setup, fromCallback, assign, and, assertEvent, enqueueActions, emit, no
 import { htmlToPortableText } from "@portabletext/html";
 import { toHTML } from "@portabletext/to-html";
 import { markdownToPortableText, portableTextToMarkdown } from "@portabletext/markdown";
-import { applyAll, unset, set, insert, setIfMissing, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
+import { unset, applyAll, set, insert, setIfMissing, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
 import "xstate/guards";
 import { EditorContext as EditorContext$1 } from "./_chunks-es/use-editor.js";
 import { useEditor } from "./_chunks-es/use-editor.js";
@@ -7950,6 +7950,17 @@ function applyOperation(editor, op) {
       let {
         node
       } = op;
+      if (!targetsStructuralChildren(editor, path2)) {
+        applyOnRootBlock(editor, path2, {
+          type: "insert",
+          path: path2.slice(1),
+          position: op.position,
+          // Sidecar array members aren't necessarily objects (e.g. `marks`
+          // holds strings), so the node is plain JSON data here.
+          items: [node]
+        }), transformSelection = !0;
+        break;
+      }
       modifyChildren(editor, parentPath(path2), (children) => {
         !editor.isProcessingRemoteChanges && !editor.isUndoing && !editor.isRedoing && node._key !== void 0 && children.some((sibling) => sibling._key === node._key) && (node = {
           ...node,
@@ -8038,6 +8049,10 @@ function applyOperation(editor, op) {
       if (setNodePath.length === 0)
         break;
       if (setPropertyPath.length === 0) {
+        if (!targetsStructuralChildren(editor, setNodePath)) {
+          applyOnRootBlock(editor, path2, set(value, path2.slice(1))), transformSelection = !0;
+          break;
+        }
         value !== null && typeof value == "object" && !Array.isArray(value) && modifyDescendant(editor, setNodePath, () => value), transformSelection = !0;
         break;
       }
@@ -8079,6 +8094,18 @@ function applyOperation(editor, op) {
         break;
       }
       const lastSegment = path2[path2.length - 1];
+      if ((isKeyedSegment(lastSegment) || typeof lastSegment == "number") && !targetsStructuralChildren(editor, path2)) {
+        if (!op.inverse && !editor.isProcessingRemoteChanges) {
+          const arrayValue = getValue(editor.snapshot.context.value, path2.slice(0, -1));
+          Array.isArray(arrayValue) && (op.inverse = {
+            type: "set",
+            path: path2.slice(0, -1),
+            value: arrayValue
+          });
+        }
+        applyOnRootBlock(editor, path2, unset(path2.slice(1))), transformSelection = !0;
+        break;
+      }
       if (isKeyedSegment(lastSegment) || typeof lastSegment == "number") {
         if (editor.snapshot.context.selection) {
           let selection = {
@@ -8223,6 +8250,29 @@ function applyOperation(editor, op) {
     });
   }
 }
+function targetsStructuralChildren(editor, path2) {
+  if (path2.length < 2)
+    return !0;
+  const fieldSegment = path2[path2.length - 2];
+  return typeof fieldSegment != "string" ? !0 : getChildFieldName({
+    schema: editor.snapshot.context.schema,
+    containers: editor.snapshot.context.containers,
+    value: editor.snapshot.context.value
+  }, path2.slice(0, -2)) === fieldSegment;
+}
+function applyOnRootBlock(editor, path2, patch) {
+  const blockSegment = findBlockSegment(path2);
+  if (!blockSegment)
+    return;
+  const blockIndex = resolveBlockIndex(editor, blockSegment);
+  if (blockIndex === -1)
+    return;
+  const block = editor.snapshot.context.value[blockIndex];
+  if (!block)
+    return;
+  const updatedBlock = applyAll(block, [patch]), newValue = editor.snapshot.context.value.slice();
+  newValue[blockIndex] = updatedBlock, editor.snapshot.context.value = newValue;
+}
 function replaceLastSegment(path2, segment) {
   if (path2.length === 0)
     return [segment];
@@ -10124,8 +10174,19 @@ function createApplyPatch(context) {
   };
 }
 function diffMatchPatch(editor, patch) {
-  if (patch.path.at(-1) !== "text")
-    return !1;
+  if (patch.path.at(-1) !== "text") {
+    const currentValue = getValue(editor.snapshot.context.value, patch.path);
+    if (typeof currentValue != "string")
+      return !1;
+    const [newValue2] = apply(parse(patch.value), currentValue, {
+      allowExceedingIndices: !0
+    });
+    return editor.apply({
+      type: "set",
+      path: patch.path,
+      value: newValue2
+    }), !0;
+  }
   const spanPath = patch.path.slice(0, -1), spanEntry = getNode(editor.snapshot, spanPath);
   if (!spanEntry || !isSpan({
     schema: editor.snapshot.context.schema
@@ -18410,65 +18471,81 @@ async function updateValue({
 }) {
   let doneSyncing = !1, isChanged = !1, isValid = !0;
   const hadSelection = !!editorEngine.snapshot.context.selection;
-  if ((!value || value.length === 0) && (clearEditor({
-    editorEngine,
-    doneSyncing
-  }), isChanged = !0), value && value.length > 0)
-    if (streamBlocks)
-      await new Promise((resolve) => {
-        if (doneSyncing) {
-          resolve();
+  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)
           return;
-        }
         isChanged = removeExtraBlocks({
           editorEngine,
           value
-        }), (async () => {
-          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();
-        })();
-      });
-    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++;
+        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",
@@ -18717,6 +18794,10 @@ 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: [{
@@ -18767,14 +18848,14 @@ function updateBlock({
           const oldChild = oldEngineBlock.children[currentBlockChildIndex];
           if (!oldChild)
             return;
-          editorEngine.apply({
+          liveBlockHasChildKey(editorEngine, oldEngineBlock._key, oldChild._key) ? 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",
@@ -18818,6 +18899,12 @@ 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, {