fix(reconciler): remove beforeChild on replace

pmndrs · Mar 4, 2023 · 5f376ce · 5f376ce
1 parent cf9bfc6
commit 5f376ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/packages/fiber/src/core/reconciler.ts b/packages/fiber/src/core/reconciler.ts
@@ -42,7 +42,6 @@ export interface Instance<O = any> {
   attach?: AttachType<O>
   previousAttach?: any
   isHidden: boolean
-  autoRemovedBeforeAppend?: boolean
 }
 
 interface HostConfig {
@@ -152,7 +151,10 @@ function insertBefore(
   child.parent = parent
   const childIndex = parent.children.indexOf(beforeChild)
   if (childIndex !== -1) parent.children.splice(childIndex, replace ? 1 : 0, child)
-  if (replace) beforeChild.parent = null
+  if (replace) {
+    beforeChild.parent = null
+    removeChild(parent, beforeChild)
+  }
 
   // Attach tree once complete
   handleContainerEffects(parent, child, beforeChild, replace)
@@ -234,14 +236,7 @@ function switchInstance(
 
   // Link up new instance
   const parent = oldInstance.parent
-  if (parent) {
-    // Manually handle replace https://github.com/pmndrs/react-three-fiber/pull/2680
-    // insertBefore(parent, newInstance, oldInstance, true)
-
-    if (!oldInstance.autoRemovedBeforeAppend) removeChild(parent, oldInstance)
-    if (newInstance.parent) newInstance.autoRemovedBeforeAppend = true
-    appendChild(parent, newInstance)
-  }
+  if (parent) insertBefore(parent, newInstance, oldInstance, true)
 
   // This evil hack switches the react-internal fiber node
   // https://github.com/facebook/react/issues/14983

diff --git a/packages/test-renderer/src/__tests__/__snapshots__/RTTR.core.test.tsx.snap b/packages/test-renderer/src/__tests__/__snapshots__/RTTR.core.test.tsx.snap
@@ -386,13 +386,6 @@ Array [
       },
       Object {
         "children": Array [
-          Object {
-            "children": Array [],
-            "props": Object {
-              "attach": "material",
-            },
-            "type": "meshBasicMaterial",
-          },
           Object {
             "children": Array [],
             "props": Object {
@@ -404,6 +397,13 @@ Array [
             },
             "type": "boxGeometry",
           },
+          Object {
+            "children": Array [],
+            "props": Object {
+              "attach": "material",
+            },
+            "type": "meshBasicMaterial",
+          },
         ],
         "props": Object {
           "position-x": 12,