From 9c758bb4cb9a5866beeda46f997fdac200aecfea Mon Sep 17 00:00:00 2001
From: zhugexinxin <42615243+zhugexinxin@users.noreply.github.com>
Date: Thu, 24 Mar 2022 13:56:17 +0800
Subject: [PATCH] Add merge to set node (#4905)

* feat: add merge to setNodes

* chore: add merge to setNodes test

* chore: prettier

* chore: change to PropsMerge

* chore: restore the changes for addMark
---
 packages/slate/src/interfaces/editor.ts       |  1 +
 packages/slate/src/transforms/node.ts         | 12 ++++++---
 .../test/transforms/setNodes/merge/text.tsx   | 26 +++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 packages/slate/test/transforms/setNodes/merge/text.tsx

diff --git a/packages/slate/src/interfaces/editor.ts b/packages/slate/src/interfaces/editor.ts
index b8618ebab..055a845be 100644
--- a/packages/slate/src/interfaces/editor.ts
+++ b/packages/slate/src/interfaces/editor.ts
@@ -1736,3 +1736,4 @@ export type NodeMatch<T extends Node> =
   | ((node: Node, path: Path) => boolean)
 
 export type PropsCompare = (prop: Partial<Node>, node: Partial<Node>) => boolean
+export type PropsMerge = (prop: Partial<Node>, node: Partial<Node>) => object
diff --git a/packages/slate/src/transforms/node.ts b/packages/slate/src/transforms/node.ts
index c2747ffa4..ba1c32834 100644
--- a/packages/slate/src/transforms/node.ts
+++ b/packages/slate/src/transforms/node.ts
@@ -11,7 +11,7 @@ import {
   NodeEntry,
   Ancestor,
 } from '..'
-import { NodeMatch, PropsCompare } from '../interfaces/editor'
+import { NodeMatch, PropsCompare, PropsMerge } from '../interfaces/editor'
 
 export interface NodeTransforms {
   insertNodes: <T extends Node>(
@@ -76,6 +76,7 @@ export interface NodeTransforms {
       split?: boolean
       voids?: boolean
       compare?: PropsCompare
+      merge?: PropsMerge
     }
   ) => void
   splitNodes: <T extends Node>(
@@ -570,10 +571,11 @@ export const NodeTransforms: NodeTransforms = {
       split?: boolean
       voids?: boolean
       compare?: PropsCompare
+      merge?: PropsMerge
     } = {}
   ): void {
     Editor.withoutNormalizing(editor, () => {
-      let { match, at = editor.selection, compare } = options
+      let { match, at = editor.selection, compare, merge } = options
       const {
         hanging = false,
         mode = 'lowest',
@@ -660,7 +662,11 @@ export const NodeTransforms: NodeTransforms = {
             // Omit new properties from the old properties list
             if (node.hasOwnProperty(k)) properties[k] = node[k]
             // Omit properties that have been removed from the new properties list
-            if (props[k] != null) newProperties[k] = props[k]
+            if (merge) {
+              if (props[k] != null) newProperties[k] = merge(node[k], props[k])
+            } else {
+              if (props[k] != null) newProperties[k] = props[k]
+            }
           }
         }
 
diff --git a/packages/slate/test/transforms/setNodes/merge/text.tsx b/packages/slate/test/transforms/setNodes/merge/text.tsx
new file mode 100644
index 000000000..6fc5c1937
--- /dev/null
+++ b/packages/slate/test/transforms/setNodes/merge/text.tsx
@@ -0,0 +1,26 @@
+/** @jsx jsx */
+import { Transforms, Text } from 'slate'
+import { jsx } from '../../..'
+import _ from 'lodash'
+
+export const run = editor => {
+  Transforms.setNodes(
+    editor,
+    { a: { b: 2, c: 3 } },
+    { at: [0, 0], match: Text.isText, merge: (n, p) => _.defaultsDeep(p, n) }
+  )
+}
+export const input = (
+  <editor>
+    <block>
+      <text a={{ b: 1 }}>word</text>
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>
+      <text a={{ b: 2, c: 3 }}>word</text>
+    </block>
+  </editor>
+)