Take previously added/removed nodes into account when fetching child …

…node in core normalization (#5396)
ianstormtaylor · Apr 18, 2023 · bc945eb · bc945eb
1 parent 832e75f
commit bc945eb
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/.changeset/tall-gorillas-deny.md b/.changeset/tall-gorillas-deny.md
@@ -0,0 +1,5 @@
+---
+'slate': patch
+---
+
+Correct core normalization that could cause wrong nodes to be removed
diff --git a/packages/slate/src/create-editor.ts b/packages/slate/src/create-editor.ts
@@ -245,7 +245,7 @@ export const createEditor = (): Editor => {
       for (let i = 0; i < node.children.length; i++, n++) {
         const currentNode = Node.get(editor, path)
         if (Text.isText(currentNode)) continue
-        const child = node.children[i] as Descendant
+        const child = currentNode.children[n] as Descendant
         const prev = currentNode.children[n - 1] as Descendant
         const isLast = i === node.children.length - 1
         const isInlineOrText =

diff --git a/packages/slate/test/normalization/block/remove-inline.tsx b/packages/slate/test/normalization/block/remove-inline.tsx
@@ -6,13 +6,16 @@ export const input = (
     <block>
       <block>one</block>
       <inline>two</inline>
+      <block>three</block>
+      <inline>four</inline>
     </block>
   </editor>
 )
 export const output = (
   <editor>
     <block>
       <block>one</block>
+      <block>three</block>
     </block>
   </editor>
 )
diff --git a/packages/slate/test/normalization/editor/remove-inline.tsx b/packages/slate/test/normalization/editor/remove-inline.tsx
@@ -5,10 +5,13 @@ export const input = (
   <editor>
     <inline>one</inline>
     <block>two</block>
+    <inline>three</inline>
+    <block>four</block>
   </editor>
 )
 export const output = (
   <editor>
     <block>two</block>
+    <block>four</block>
   </editor>
 )
diff --git a/packages/slate/test/normalization/editor/remove-text.tsx b/packages/slate/test/normalization/editor/remove-text.tsx
@@ -5,10 +5,13 @@ export const input = (
   <editor>
     <text>one</text>
     <block>two</block>
+    <text>three</text>
+    <block>four</block>
   </editor>
 )
 export const output = (
   <editor>
     <block>two</block>
+    <block>four</block>
   </editor>
 )
diff --git a/packages/slate/test/normalization/inline/remove-block.tsx b/packages/slate/test/normalization/inline/remove-block.tsx
@@ -8,6 +8,8 @@ export const input = (
       <inline>
         <block>one</block>
         <text>two</text>
+        <block>three</block>
+        <text>four</text>
       </inline>
       <text />
     </block>
@@ -18,7 +20,7 @@ export const output = (
     <block>
       <text />
       <inline>
-        <text>two</text>
+        <text>twofour</text>
       </inline>
       <text />
     </block>