@portabletext/editor 4.3.4 → 4.3.6

package/lib/index.js

@@ -6,7 +6,7 @@ import { Element as Element$1, Text, Range, Editor, Node, Point, Path, Transform
 import { useSlateStatic, useSlateSelector, ReactEditor, useSlate, Editable, withReact, Slate } from "slate-react";
 import rawDebug from "debug";
 import { DOMEditor, isDOMNode, EDITOR_TO_PENDING_SELECTION, IS_FOCUSED, IS_READ_ONLY } from "slate-dom";
-import { getBlockEndPoint, getBlockStartPoint, getBlockKeyFromSelectionPoint, isSelectionCollapsed, isKeyedSegment, isEqualSelectionPoints, getChildKeyFromSelectionPoint, blockOffsetToSpanSelectionPoint, defaultKeyGenerator, parseBlocks, parseBlock, isListBlock, isTypedObject, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint as getSelectionEndPoint$1, parseAnnotation, parseMarkDefs, parseSpan, parseInlineObject } from "./_chunks-es/util.slice-blocks.js";
+import { getBlockEndPoint, getBlockStartPoint, getBlockKeyFromSelectionPoint, isSelectionCollapsed, isKeyedSegment, isEqualSelectionPoints, getChildKeyFromSelectionPoint, blockOffsetToSpanSelectionPoint, defaultKeyGenerator, parseBlocks, parseBlock, isListBlock, isTypedObject, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint as getSelectionEndPoint$1, parseAnnotation, parseMarkDefs, parseSpan, parseInlineObject, isEqualPathSegments } from "./_chunks-es/util.slice-blocks.js";
 import { isTextBlock, isSpan, compileSchema } from "@portabletext/schema";
 import { defineSchema } from "@portabletext/schema";
 import { isEmptyTextBlock, sliceTextBlock, getTextBlockText } from "./_chunks-es/util.slice-text-block.js";
@@ -283,7 +283,7 @@ function isEqualToEmptyEditor(initialValue, blocks, schemaTypes) {
   if (!Element$1.isElement(firstBlock) || firstBlock._type !== schemaTypes.block.name || "listItem" in firstBlock || !("style" in firstBlock) || firstBlock.style !== schemaTypes.styles.at(0)?.name || !Array.isArray(firstBlock.children) || firstBlock.children.length !== 1)
     return !1;
   const firstChild = firstBlock.children.at(0);
-  return !(!firstChild || !Text.isText(firstChild) || !("_type" in firstChild) || firstChild._type !== schemaTypes.span.name || firstChild.text !== "" || firstChild.marks?.join("") || Object.keys(firstBlock).some((key) => key !== "_type" && key !== "_key" && key !== "children" && key !== "markDefs" && key !== "style") || isEqualValues({
+  return !(!firstChild || !Text.isText(firstChild) || !("_type" in firstChild) || firstChild._type !== schemaTypes.span.name || firstChild.text !== "" || firstChild.marks?.join("") || "markDefs" in firstBlock && Array.isArray(firstBlock.markDefs) && firstBlock.markDefs.length > 0 || Object.keys(firstBlock).some((key) => key !== "_type" && key !== "_key" && key !== "children" && key !== "markDefs" && key !== "style") || isEqualValues({
     schema: schemaTypes
   }, initialValue, [firstBlock]));
 }
@@ -5218,11 +5218,21 @@ function mergeNodePatch(schema, children, operation, beforeValue) {
     }, updatedBlock.children[operation.path[1] - 1]) ? updatedBlock.children[operation.path[1] - 1] : void 0, removedSpan = block.children[operation.path[1]] && isSpan({
       schema
     }, block.children[operation.path[1]]) ? block.children[operation.path[1]] : void 0;
-    updatedSpan && (block.children.filter((span) => span._key === updatedSpan._key).length === 1 ? patches.push(set(updatedSpan.text, [{
-      _key: block._key
-    }, "children", {
-      _key: updatedSpan._key
-    }, "text"])) : console.warn(`Multiple spans have \`_key\` ${updatedSpan._key}. It's ambiguous which one to update.`, JSON.stringify(block, null, 2))), removedSpan && (block.children.filter((span) => span._key === removedSpan._key).length === 1 ? patches.push(unset([{
+    if (updatedSpan) {
+      const spansMatchingKey = block.children.filter((span) => span._key === updatedSpan._key);
+      if (spansMatchingKey.length === 1) {
+        const prevSpan = spansMatchingKey[0];
+        isSpan({
+          schema
+        }, prevSpan) && prevSpan.text !== updatedSpan.text && patches.push(set(updatedSpan.text, [{
+          _key: block._key
+        }, "children", {
+          _key: updatedSpan._key
+        }, "text"]));
+      } else
+        console.warn(`Multiple spans have \`_key\` ${updatedSpan._key}. It's ambiguous which one to update.`, JSON.stringify(block, null, 2));
+    }
+    removedSpan && (block.children.filter((span) => span._key === removedSpan._key).length === 1 ? patches.push(unset([{
       _key: block._key
     }, "children", {
       _key: removedSpan._key
@@ -11317,6 +11327,13 @@ function sortByPriority(items) {
     result.includes(item) || result.push(item);
   return [...result, ...itemsWithoutPriority];
 }
+function pathsOverlap(pathA, pathB) {
+  const minLength = Math.min(pathA.length, pathB.length);
+  for (let i = 0; i < minLength; i++)
+    if (!isEqualPathSegments(pathA[i], pathB[i]))
+      return !1;
+  return !0;
+}
 function rerouteExternalBehaviorEvent({
   event,
   slateEditor
@@ -11412,6 +11429,20 @@ const editorMachine = setup({
     "clear pending events": assign({
       pendingEvents: []
     }),
+    "discard conflicting pending patches": assign({
+      pendingEvents: ({
+        context,
+        event
+      }) => {
+        if (event.type !== "patches")
+          return context.pendingEvents;
+        const incomingPaths = event.patches.map((patch) => patch.path);
+        return context.pendingEvents.filter((pendingEvent) => pendingEvent.type !== "internal.patch" ? !0 : !incomingPaths.some((incomingPath) => pathsOverlap(pendingEvent.patch.path, incomingPath)));
+      }
+    }),
+    "discard all pending events": assign({
+      pendingEvents: []
+    }),
     "defer incoming patches": assign({
       pendingIncomingPatchesEvents: ({
         context,
@@ -11811,7 +11842,13 @@ const editorMachine = setup({
                         }, {
                           actions: "defer event",
                           target: "#editor.setup.set up.writing.dirty"
-                        }]
+                        }],
+                        patches: {
+                          actions: "discard conflicting pending patches"
+                        },
+                        "syncing value": {
+                          actions: "discard all pending events"
+                        }
                       }
                     }
                   }