Clear fiber field from host instance on unmount

facebook · Apr 21, 2020 · f2940a8 · f2940a8
1 parent ff431b7
commit f2940a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/react-dom/src/client/ReactDOMComponentTree.js b/packages/react-dom/src/client/ReactDOMComponentTree.js
@@ -40,6 +40,12 @@ export function precacheFiberNode(
   (node: any)[internalInstanceKey] = hostInst;
 }
 
+export function clearFiberNode(
+  node: Instance | TextInstance | SuspenseInstance,
+): void {
+  (node: any)[internalInstanceKey] = null;
+}
+
 export function markContainerAsRoot(hostRoot: Fiber, node: Container): void {
   node[internalContainerInstanceKey] = hostRoot;
 }

diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -19,6 +19,7 @@ import {
   precacheFiberNode,
   updateFiberProps,
   getClosestInstanceFromNode,
+  clearFiberNode,
 } from './ReactDOMComponentTree';
 import {
   createElement,
@@ -522,8 +523,10 @@ function dispatchAfterDetachedBlur(target: HTMLElement): void {
 
 export function beforeRemoveInstance(
   instance: Instance | TextInstance | SuspenseInstance,
-) {
-  // TODO for ReactDOM.createEventInstance
+): void {
+  // Clear the fiber off the instance, to help GC
+  clearFiberNode(instance);
+  // TODO handle ReactDOM.createEventInstance
 }
 
 export function removeChild(