@portabletext/editor 2.15.2 → 2.15.4

package/lib/index.js

@@ -27,7 +27,6 @@ import omit from "lodash/omit.js";
 import { applyAll, unset, insert, set, setIfMissing, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
 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 { createDraft, finishDraft } from "immer";
 import { createKeyboardShortcut, code, underline, italic, bold, undo, redo } from "@portabletext/keyboard-shortcuts";
 import isPlainObject from "lodash/isPlainObject.js";
@@ -4456,15 +4455,9 @@ const addAnnotationOperationImplementation = ({
   if (!child || !childPath)
     throw new Error(`Unable to find child at ${JSON.stringify(operation.at)}`);
   if (operation.editor.isTextSpan(child)) {
-    operation.props.includes("text") && operation.editor.apply({
-      type: "remove_text",
-      path: childPath,
-      offset: 0,
-      text: child.text
-    });
     const newNode = {};
     for (const prop of operation.props)
-      if (prop !== "_type") {
+      if (prop !== "text" && prop !== "_type") {
         if (prop === "_key") {
           newNode._key = context.keyGenerator();
           continue;
@@ -4473,6 +4466,11 @@ const addAnnotationOperationImplementation = ({
       }
     Transforms.setNodes(operation.editor, newNode, {
       at: childPath
+    }), operation.props.includes("text") && operation.editor.apply({
+      type: "remove_text",
+      path: childPath,
+      offset: 0,
+      text: child.text
     });
     return;
   }
@@ -6023,17 +6021,26 @@ function setNodePatch(schema, children, operation) {
           _key: block._key
         }, key]));
       }
+      for (const key of Object.keys(operation.properties))
+        key in operation.newProperties || patches.push(unset([{
+          _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);
+      const newValue = "value" in operation.newProperties && typeof operation.newProperties.value == "object" ? operation.newProperties.value : {}, keys = Object.keys(newValue);
       for (const key of keys) {
-        const value = properties[key];
-        patches.push(set(value, [{
+        const value2 = newValue[key];
+        patches.push(set(value2, [{
           _key: block._key
         }, key]));
       }
+      const value = "value" in operation.properties && typeof operation.properties.value == "object" ? operation.properties.value : {};
+      for (const key of Object.keys(value))
+        key in newValue || patches.push(unset([{
+          _key: block._key
+        }, key]));
       return patches;
     }
   } else if (operation.path.length === 2) {
@@ -6049,8 +6056,8 @@ function setNodePatch(schema, children, operation) {
           _key !== void 0 && patches.push(set(_key, [{
             _key: blockKey
           }, "children", block.children.indexOf(child), "_key"]));
-          const properties = "value" in operation.newProperties && typeof operation.newProperties.value == "object" ? operation.newProperties.value : {}, keys2 = Object.keys(properties);
-          for (const key of keys2) {
+          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: blockKey
@@ -6060,22 +6067,29 @@ function setNodePatch(schema, children, operation) {
           }
           return patches;
         }
-        const keys = Object.keys(operation.newProperties);
-        return keys.forEach((keyName) => {
-          if (keys.length === 1 && keyName === "_key") {
-            const val = get(operation.newProperties, keyName);
-            patches.push(set(val, [{
+        const newPropNames = Object.keys(operation.newProperties);
+        for (const keyName of newPropNames) {
+          const value = operation.newProperties[keyName];
+          if (keyName === "_key") {
+            patches.push(set(value, [{
               _key: blockKey
             }, "children", block.children.indexOf(child), keyName]));
-          } else {
-            const val = get(operation.newProperties, keyName);
-            patches.push(set(val, [{
-              _key: blockKey
-            }, "children", {
-              _key: childKey
-            }, keyName]));
+            continue;
           }
-        }), patches;
+          patches.push(set(value, [{
+            _key: blockKey
+          }, "children", {
+            _key: childKey
+          }, keyName]));
+        }
+        const propNames = Object.keys(operation.properties);
+        for (const keyName of propNames)
+          keyName in operation.newProperties || patches.push(unset([{
+            _key: blockKey
+          }, "children", {
+            _key: childKey
+          }, keyName]));
+        return patches;
       }
       throw new Error("Could not find a valid child");
     }