@portabletext/editor 2.15.1 → 2.15.2

package/lib/index.js

@@ -28,8 +28,6 @@ import { applyAll, unset, insert, set, setIfMissing, diffMatchPatch as diffMatch
 import { blockOffsetsToSelection } from "./_chunks-es/util.child-selection-point-to-block-offset.js";
 import { selectionPointToBlockOffset, sliceTextBlock } from "./_chunks-es/util.slice-text-block.js";
 import get from "lodash/get.js";
-import isUndefined from "lodash/isUndefined.js";
-import omitBy from "lodash/omitBy.js";
 import { createDraft, finishDraft } from "immer";
 import { createKeyboardShortcut, code, underline, italic, bold, undo, redo } from "@portabletext/keyboard-shortcuts";
 import isPlainObject from "lodash/isPlainObject.js";
@@ -4275,11 +4273,9 @@ const addAnnotationOperationImplementation = ({
   });
   if (!parsedBlock)
     throw new Error(`Unable to update block at ${JSON.stringify(operation.at)}`);
-  const slateBlock = toSlateValue([parsedBlock], {
+  const slateBlock = toSlateBlock(parsedBlock, {
     schemaTypes: context.schema
-  })?.at(0);
-  if (!slateBlock)
-    throw new Error("Unable to convert block to Slate value");
+  });
   Transforms.setNodes(operation.editor, slateBlock, {
     at: [blockIndex]
   });
@@ -5566,6 +5562,37 @@ function createWithObjectKeys(editorActor) {
       apply2(operation);
     }, editor.normalizeNode = (entry) => {
       const [node, path] = entry;
+      if (Element$1.isElement(node)) {
+        const [parent] = Editor.parent(editor, path);
+        if (parent && Editor.isEditor(parent)) {
+          const blockKeys = /* @__PURE__ */ new Set();
+          for (const sibling of parent.children) {
+            if (sibling._key && blockKeys.has(sibling._key)) {
+              const _key = editorActor.getSnapshot().context.keyGenerator();
+              blockKeys.add(_key), withNormalizeNode(editor, () => {
+                Transforms.setNodes(editor, {
+                  _key
+                }, {
+                  at: path
+                });
+              });
+              return;
+            }
+            if (!sibling._key) {
+              const _key = editorActor.getSnapshot().context.keyGenerator();
+              blockKeys.add(_key), withNormalizeNode(editor, () => {
+                Transforms.setNodes(editor, {
+                  _key
+                }, {
+                  at: path
+                });
+              });
+              return;
+            }
+            blockKeys.add(sibling._key);
+          }
+        }
+      }
       if (Element$1.isElement(node) && node._type === editorActor.getSnapshot().context.schema.block.name) {
         if (!node._key) {
           withNormalizeNode(editor, () => {
@@ -5577,17 +5604,32 @@ function createWithObjectKeys(editorActor) {
           });
           return;
         }
-        for (const [child, childPath] of Node.children(editor, path))
+        const childKeys = /* @__PURE__ */ new Set();
+        for (const [child, childPath] of Node.children(editor, path)) {
+          if (child._key && childKeys.has(child._key)) {
+            const _key = editorActor.getSnapshot().context.keyGenerator();
+            childKeys.add(_key), withNormalizeNode(editor, () => {
+              Transforms.setNodes(editor, {
+                _key
+              }, {
+                at: childPath
+              });
+            });
+            return;
+          }
           if (!child._key) {
-            withNormalizeNode(editor, () => {
+            const _key = editorActor.getSnapshot().context.keyGenerator();
+            childKeys.add(_key), withNormalizeNode(editor, () => {
               Transforms.setNodes(editor, {
-                _key: editorActor.getSnapshot().context.keyGenerator()
+                _key
               }, {
                 at: childPath
               });
             });
             return;
           }
+          childKeys.add(child._key);
+        }
       }
       withNormalizeNode(editor, () => {
         normalizeNode(entry);
@@ -5684,8 +5726,15 @@ function setPatch(editor, patch) {
   if (!block)
     return !1;
   const isTextBlock2 = editor.isTextBlock(block.node);
-  if (isTextBlock2 && patch.path.length > 1 && patch.path[1] !== "children")
-    return !1;
+  if (isTextBlock2 && patch.path[1] !== "children") {
+    const updatedBlock = applyAll(block.node, [{
+      ...patch,
+      path: patch.path.slice(1)
+    }]);
+    return Transforms.setNodes(editor, updatedBlock, {
+      at: [block.index]
+    }), !0;
+  }
   const child = findBlockChild(block, patch.path);
   if (isTextBlock2 && child) {
     if (Text.isText(child.node))
@@ -5959,17 +6008,34 @@ function removeTextPatch(schema, children, operation, beforeValue) {
   return patch.value ? [patch] : [];
 }
 function setNodePatch(schema, children, operation) {
-  if (operation.path.length === 1) {
-    const block = children[operation.path[0]];
-    if (typeof block._key != "string")
-      throw new Error("Expected block to have a _key");
-    const setNode = omitBy({
-      ...children[operation.path[0]],
-      ...operation.newProperties
-    }, isUndefined);
-    return [set(fromSlateValue([setNode], schema.block.name)[0], [{
-      _key: block._key
-    }])];
+  const blockIndex = operation.path.at(0);
+  if (blockIndex !== void 0 && operation.path.length === 1) {
+    const block = children.at(blockIndex);
+    if (!block)
+      return console.error("Could not find block at index", blockIndex), [];
+    if (isTextBlock({
+      schema
+    }, block)) {
+      const patches = [];
+      for (const key of Object.keys(operation.newProperties)) {
+        const value = operation.newProperties[key];
+        key === "_key" ? patches.push(set(value, [blockIndex, "_key"])) : patches.push(set(value, [{
+          _key: block._key
+        }, key]));
+      }
+      return patches;
+    } else {
+      const patches = [], _key = operation.newProperties._key;
+      _key !== void 0 && patches.push(set(_key, [blockIndex, "_key"]));
+      const properties = "value" in operation.newProperties && typeof operation.newProperties.value == "object" ? operation.newProperties.value : {}, keys = Object.keys(properties);
+      for (const key of keys) {
+        const value = properties[key];
+        patches.push(set(value, [{
+          _key: block._key
+        }, key]));
+      }
+      return patches;
+    }
   } else if (operation.path.length === 2) {
     const block = children[operation.path[0]];
     if (isTextBlock({