From f13cd6b9180e18201b2a001b6f5d109218071319 Mon Sep 17 00:00:00 2001
From: Ulion <ulion2002@gmail.com>
Date: Sat, 16 Jul 2022 06:22:37 +0800
Subject: [PATCH] support insertFragment with text/inline + block mixed
 fragments. (#5018)

---
 .changeset/pretty-plums-grow.md               |  5 +++
 packages/slate/src/transforms/text.ts         | 12 ++++---
 .../insertFragment/of-mixed/block-empty.tsx   | 33 ++++++++++++++++++
 .../insertFragment/of-mixed/block-empty2.tsx  | 33 ++++++++++++++++++
 .../insertFragment/of-mixed/block-empty3.tsx  | 31 +++++++++++++++++
 .../insertFragment/of-mixed/block-end.tsx     | 32 +++++++++++++++++
 .../insertFragment/of-mixed/block-end2.tsx    | 30 ++++++++++++++++
 .../insertFragment/of-mixed/block-middle.tsx  | 34 +++++++++++++++++++
 .../insertFragment/of-mixed/block-start.tsx   | 33 ++++++++++++++++++
 .../insertFragment/of-mixed/block-start2.tsx  | 31 +++++++++++++++++
 10 files changed, 269 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/pretty-plums-grow.md
 create mode 100644 packages/slate/test/transforms/insertFragment/of-mixed/block-empty.tsx
 create mode 100644 packages/slate/test/transforms/insertFragment/of-mixed/block-empty2.tsx
 create mode 100644 packages/slate/test/transforms/insertFragment/of-mixed/block-empty3.tsx
 create mode 100644 packages/slate/test/transforms/insertFragment/of-mixed/block-end.tsx
 create mode 100644 packages/slate/test/transforms/insertFragment/of-mixed/block-end2.tsx
 create mode 100644 packages/slate/test/transforms/insertFragment/of-mixed/block-middle.tsx
 create mode 100644 packages/slate/test/transforms/insertFragment/of-mixed/block-start.tsx
 create mode 100644 packages/slate/test/transforms/insertFragment/of-mixed/block-start2.tsx

diff --git a/.changeset/pretty-plums-grow.md b/.changeset/pretty-plums-grow.md
new file mode 100644
index 000000000..bce1b086b
--- /dev/null
+++ b/.changeset/pretty-plums-grow.md
@@ -0,0 +1,5 @@
+---
+'slate': patch
+---
+
+Fix for insertFragment text/inline + block mixed fragments.
diff --git a/packages/slate/src/transforms/text.ts b/packages/slate/src/transforms/text.ts
index c127b8566..c64e61fd1 100644
--- a/packages/slate/src/transforms/text.ts
+++ b/packages/slate/src/transforms/text.ts
@@ -397,7 +397,7 @@ export const TextTransforms: TextTransforms = {
 
       const middleRef = Editor.pathRef(
         editor,
-        isBlockEnd ? Path.next(blockPath) : blockPath
+        isBlockEnd && !ends.length ? Path.next(blockPath) : blockPath
       )
 
       const endRef = Editor.pathRef(
@@ -405,8 +405,6 @@ export const TextTransforms: TextTransforms = {
         isInlineEnd ? Path.next(inlinePath) : inlinePath
       )
 
-      const blockPathRef = Editor.pathRef(editor, blockPath)
-
       Transforms.splitNodes(editor, {
         at,
         match: n =>
@@ -414,6 +412,10 @@ export const TextTransforms: TextTransforms = {
             ? Editor.isBlock(editor, n)
             : Text.isText(n) || Editor.isInline(editor, n),
         mode: hasBlocks ? 'lowest' : 'highest',
+        always:
+          hasBlocks &&
+          (!isBlockStart || starts.length > 0) &&
+          (!isBlockEnd || ends.length > 0),
         voids,
       })
 
@@ -431,8 +433,8 @@ export const TextTransforms: TextTransforms = {
         voids,
       })
 
-      if (isBlockEmpty && middles.length) {
-        Transforms.delete(editor, { at: blockPathRef.unref()!, voids })
+      if (isBlockEmpty && !starts.length && middles.length && !ends.length) {
+        Transforms.delete(editor, { at: blockPath, voids })
       }
 
       Transforms.insertNodes(editor, middles, {
diff --git a/packages/slate/test/transforms/insertFragment/of-mixed/block-empty.tsx b/packages/slate/test/transforms/insertFragment/of-mixed/block-empty.tsx
new file mode 100644
index 000000000..06ac456e5
--- /dev/null
+++ b/packages/slate/test/transforms/insertFragment/of-mixed/block-empty.tsx
@@ -0,0 +1,33 @@
+/** @jsx jsx */
+import { Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const run = editor => {
+  Transforms.insertFragment(
+    editor,
+    <fragment>
+      <text>one</text>
+      <block>two</block>
+      <text>three</text>
+    </fragment>
+  )
+}
+export const input = (
+  <editor>
+    <block>word</block>
+    <block>
+      <cursor />
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>word</block>
+    <block>one</block>
+    <block>two</block>
+    <block>
+      three
+      <cursor />
+    </block>
+  </editor>
+)
diff --git a/packages/slate/test/transforms/insertFragment/of-mixed/block-empty2.tsx b/packages/slate/test/transforms/insertFragment/of-mixed/block-empty2.tsx
new file mode 100644
index 000000000..acd981042
--- /dev/null
+++ b/packages/slate/test/transforms/insertFragment/of-mixed/block-empty2.tsx
@@ -0,0 +1,33 @@
+/** @jsx jsx */
+import { Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const run = editor => {
+  Transforms.insertFragment(
+    editor,
+    <fragment>
+      <block>two</block>
+      <text>three</text>
+    </fragment>
+  )
+}
+export const input = (
+  <editor>
+    <block>word</block>
+    <block>
+      <cursor />
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>word</block>
+    <block>two</block>
+    <block>
+      <text>
+        three
+        <cursor />
+      </text>
+    </block>
+  </editor>
+)
diff --git a/packages/slate/test/transforms/insertFragment/of-mixed/block-empty3.tsx b/packages/slate/test/transforms/insertFragment/of-mixed/block-empty3.tsx
new file mode 100644
index 000000000..5cbf9af38
--- /dev/null
+++ b/packages/slate/test/transforms/insertFragment/of-mixed/block-empty3.tsx
@@ -0,0 +1,31 @@
+/** @jsx jsx */
+import { Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const run = editor => {
+  Transforms.insertFragment(
+    editor,
+    <fragment>
+      <text>one</text>
+      <block>two</block>
+    </fragment>
+  )
+}
+export const input = (
+  <editor>
+    <block>word</block>
+    <block>
+      <cursor />
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>word</block>
+    <block>one</block>
+    <block>
+      two
+      <cursor />
+    </block>
+  </editor>
+)
diff --git a/packages/slate/test/transforms/insertFragment/of-mixed/block-end.tsx b/packages/slate/test/transforms/insertFragment/of-mixed/block-end.tsx
new file mode 100644
index 000000000..5e71575ac
--- /dev/null
+++ b/packages/slate/test/transforms/insertFragment/of-mixed/block-end.tsx
@@ -0,0 +1,32 @@
+/** @jsx jsx */
+import { Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const run = editor => {
+  Transforms.insertFragment(
+    editor,
+    <fragment>
+      <text>one</text>
+      <block>two</block>
+      <text>three</text>
+    </fragment>
+  )
+}
+export const input = (
+  <editor>
+    <block>
+      word
+      <cursor />
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>wordone</block>
+    <block>two</block>
+    <block>
+      three
+      <cursor />
+    </block>
+  </editor>
+)
diff --git a/packages/slate/test/transforms/insertFragment/of-mixed/block-end2.tsx b/packages/slate/test/transforms/insertFragment/of-mixed/block-end2.tsx
new file mode 100644
index 000000000..c289cb5c6
--- /dev/null
+++ b/packages/slate/test/transforms/insertFragment/of-mixed/block-end2.tsx
@@ -0,0 +1,30 @@
+/** @jsx jsx */
+import { Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const run = editor => {
+  Transforms.insertFragment(
+    editor,
+    <fragment>
+      <text>one</text>
+      <block>two</block>
+    </fragment>
+  )
+}
+export const input = (
+  <editor>
+    <block>
+      word
+      <cursor />
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>wordone</block>
+    <block>
+      two
+      <cursor />
+    </block>
+  </editor>
+)
diff --git a/packages/slate/test/transforms/insertFragment/of-mixed/block-middle.tsx b/packages/slate/test/transforms/insertFragment/of-mixed/block-middle.tsx
new file mode 100644
index 000000000..c6a689243
--- /dev/null
+++ b/packages/slate/test/transforms/insertFragment/of-mixed/block-middle.tsx
@@ -0,0 +1,34 @@
+/** @jsx jsx */
+import { Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const run = editor => {
+  Transforms.insertFragment(
+    editor,
+    <fragment>
+      <text>one</text>
+      <block>two</block>
+      <text>three</text>
+    </fragment>
+  )
+}
+export const input = (
+  <editor>
+    <block>
+      wo
+      <cursor />
+      rd
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>woone</block>
+    <block>two</block>
+    <block>
+      three
+      <cursor />
+      rd
+    </block>
+  </editor>
+)
diff --git a/packages/slate/test/transforms/insertFragment/of-mixed/block-start.tsx b/packages/slate/test/transforms/insertFragment/of-mixed/block-start.tsx
new file mode 100644
index 000000000..a173aa5b5
--- /dev/null
+++ b/packages/slate/test/transforms/insertFragment/of-mixed/block-start.tsx
@@ -0,0 +1,33 @@
+/** @jsx jsx */
+import { Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const run = editor => {
+  Transforms.insertFragment(
+    editor,
+    <fragment>
+      <text>one</text>
+      <block>two</block>
+      <text>three</text>
+    </fragment>
+  )
+}
+export const input = (
+  <editor>
+    <block>
+      <cursor />
+      word
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>one</block>
+    <block>two</block>
+    <block>
+      three
+      <cursor />
+      word
+    </block>
+  </editor>
+)
diff --git a/packages/slate/test/transforms/insertFragment/of-mixed/block-start2.tsx b/packages/slate/test/transforms/insertFragment/of-mixed/block-start2.tsx
new file mode 100644
index 000000000..209a6f8d8
--- /dev/null
+++ b/packages/slate/test/transforms/insertFragment/of-mixed/block-start2.tsx
@@ -0,0 +1,31 @@
+/** @jsx jsx */
+import { Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const run = editor => {
+  Transforms.insertFragment(
+    editor,
+    <fragment>
+      <block>one</block>
+      <text>two</text>
+    </fragment>
+  )
+}
+export const input = (
+  <editor>
+    <block>
+      <cursor />
+      word
+    </block>
+  </editor>
+)
+export const output = (
+  <editor>
+    <block>one</block>
+    <block>
+      two
+      <cursor />
+      word
+    </block>
+  </editor>
+)