Removed explicit root param and added getWorkInProgressRoot() to work loop

Author: Brian Vaughn

packages/react-reconciler/src/ReactFiberBeginWork.js

@@ -277,7 +277,6 @@ function forceUnmountCurrentAndReconcile(
 }
 
 function updateForwardRef(
-  root: FiberRoot,
   current: Fiber | null,
   workInProgress: Fiber,
   Component: any,
@@ -317,7 +316,6 @@ function updateForwardRef(
     nextChildren = renderWithHooks(
       current,
       workInProgress,
-      root,
       render,
       nextProps,
       ref,
@@ -332,7 +330,6 @@ function updateForwardRef(
         nextChildren = renderWithHooks(
           current,
           workInProgress,
-          root,
           render,
           nextProps,
           ref,
@@ -345,7 +342,6 @@ function updateForwardRef(
     nextChildren = renderWithHooks(
       current,
       workInProgress,
-      root,
       render,
       nextProps,
       ref,
@@ -374,7 +370,6 @@ function updateForwardRef(
 }
 
 function updateMemoComponent(
-  root: FiberRoot,
   current: Fiber | null,
   workInProgress: Fiber,
   Component: any,
@@ -403,7 +398,6 @@ function updateMemoComponent(
         validateFunctionComponentInDev(workInProgress, type);
       }
       return updateSimpleMemoComponent(
-        root,
         current,
         workInProgress,
         resolvedType,
@@ -484,7 +478,6 @@ function updateMemoComponent(
 }
 
 function updateSimpleMemoComponent(
-  root: FiberRoot,
   current: Fiber | null,
   workInProgress: Fiber,
   Component: any,
@@ -539,7 +532,6 @@ function updateSimpleMemoComponent(
     }
   }
   return updateFunctionComponent(
-    root,
     current,
     workInProgress,
     Component,
@@ -609,7 +601,6 @@ function markRef(current: Fiber | null, workInProgress: Fiber) {
 }
 
 function updateFunctionComponent(
-  root,
   current,
   workInProgress,
   Component,
@@ -647,7 +638,6 @@ function updateFunctionComponent(
     nextChildren = renderWithHooks(
       current,
       workInProgress,
-      root,
       Component,
       nextProps,
       context,
@@ -662,7 +652,6 @@ function updateFunctionComponent(
         nextChildren = renderWithHooks(
           current,
           workInProgress,
-          root,
           Component,
           nextProps,
           context,
@@ -675,7 +664,6 @@ function updateFunctionComponent(
     nextChildren = renderWithHooks(
       current,
       workInProgress,
-      root,
       Component,
       nextProps,
       context,
@@ -704,7 +692,6 @@ function updateFunctionComponent(
 }
 
 function updateChunk(
-  root: FiberRoot,
   current: Fiber | null,
   workInProgress: Fiber,
   chunk: any,
@@ -727,7 +714,6 @@ function updateChunk(
     nextChildren = renderWithHooks(
       current,
       workInProgress,
-      root,
       render,
       nextProps,
       data,
@@ -742,7 +728,6 @@ function updateChunk(
         nextChildren = renderWithHooks(
           current,
           workInProgress,
-          root,
           render,
           nextProps,
           data,
@@ -755,7 +740,6 @@ function updateChunk(
     nextChildren = renderWithHooks(
       current,
       workInProgress,
-      root,
       render,
       nextProps,
       data,
@@ -1126,7 +1110,6 @@ function updateHostText(current, workInProgress) {
 }
 
 function mountLazyComponent(
-  root,
   _current,
   workInProgress,
   elementType,
@@ -1164,7 +1147,6 @@ function mountLazyComponent(
         );
       }
       child = updateFunctionComponent(
-        root,
         null,
         workInProgress,
         Component,
@@ -1195,7 +1177,6 @@ function mountLazyComponent(
         );
       }
       child = updateForwardRef(
-        root,
         null,
         workInProgress,
         Component,
@@ -1220,7 +1201,6 @@ function mountLazyComponent(
         }
       }
       child = updateMemoComponent(
-        root,
         null,
         workInProgress,
         Component,
@@ -1234,7 +1214,6 @@ function mountLazyComponent(
       if (enableChunksAPI) {
         // TODO: Resolve for Hot Reloading.
         child = updateChunk(
-          root,
           null,
           workInProgress,
           Component,
@@ -1327,7 +1306,6 @@ function mountIncompleteClassComponent(
 }
 
 function mountIndeterminateComponent(
-  root,
   _current,
   workInProgress,
   Component,
@@ -1384,7 +1362,6 @@ function mountIndeterminateComponent(
     value = renderWithHooks(
       null,
       workInProgress,
-      root,
       Component,
       props,
       context,
@@ -1394,7 +1371,6 @@ function mountIndeterminateComponent(
     value = renderWithHooks(
       null,
       workInProgress,
-      root,
       Component,
       props,
       context,
@@ -1491,7 +1467,6 @@ function mountIndeterminateComponent(
           value = renderWithHooks(
             null,
             workInProgress,
-            root,
             Component,
             props,
             context,
@@ -2911,7 +2886,6 @@ function remountFiber(
 }
 
 function beginWork(
-  root: FiberRoot,
   current: Fiber | null,
   workInProgress: Fiber,
   renderExpirationTime: ExpirationTime,
@@ -3135,7 +3109,6 @@ function beginWork(
   switch (workInProgress.tag) {
     case IndeterminateComponent: {
       return mountIndeterminateComponent(
-        root,
         current,
         workInProgress,
         workInProgress.type,
@@ -3145,7 +3118,6 @@ function beginWork(
     case LazyComponent: {
       const elementType = workInProgress.elementType;
       return mountLazyComponent(
-        root,
         current,
         workInProgress,
         elementType,
@@ -3161,7 +3133,6 @@ function beginWork(
           ? unresolvedProps
           : resolveDefaultProps(Component, unresolvedProps);
       return updateFunctionComponent(
-        root,
         current,
         workInProgress,
         Component,
@@ -3210,7 +3181,6 @@ function beginWork(
           ? unresolvedProps
           : resolveDefaultProps(type, unresolvedProps);
       return updateForwardRef(
-        root,
         current,
         workInProgress,
         type,
@@ -3257,7 +3227,6 @@ function beginWork(
       }
       resolvedProps = resolveDefaultProps(type.type, resolvedProps);
       return updateMemoComponent(
-        root,
         current,
         workInProgress,
         type,
@@ -3268,7 +3237,6 @@ function beginWork(
     }
     case SimpleMemoComponent: {
       return updateSimpleMemoComponent(
-        root,
         current,
         workInProgress,
         workInProgress.type,
@@ -3324,7 +3292,6 @@ function beginWork(
         const chunk = workInProgress.type;
         const props = workInProgress.pendingProps;
         return updateChunk(
-          root,
           current,
           workInProgress,
           chunk,

packages/react-reconciler/src/ReactFiberHooks.js

@@ -15,11 +15,11 @@ import type {
   ReactEventResponderListener,
 } from 'shared/ReactTypes';
 import type {Fiber} from './ReactFiber';
-import type {FiberRoot} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 import type {HookEffectTag} from './ReactHookEffectTags';
 import type {SuspenseConfig} from './ReactFiberSuspenseConfig';
 import type {ReactPriorityLevel} from './SchedulerWithReactIntegration';
+import type {FiberRoot} from './ReactFiberRoot';
 
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 
@@ -36,6 +36,7 @@ import {
   Passive as HookPassive,
 } from './ReactHookEffectTags';
 import {
+  getWorkInProgressRoot,
   scheduleUpdateOnFiber,
   computeExpirationForFiber,
   requestCurrentTimeForUpdate,
@@ -181,10 +182,6 @@ let renderExpirationTime: ExpirationTime = NoWork;
 // the work-in-progress hook.
 let currentlyRenderingFiber: Fiber = (null: any);
 
-// The work-in-progress root fiber.
-// Used by mutable source hook to detect tears from pending updates.
-let currentlyRenderingRoot: FiberRoot = (null: any);
-
 // Hooks are stored as a linked list on the fiber's memoizedState field. The
 // current hook list is the list that belongs to the current fiber. The
 // work-in-progress hook list is a new list that will be added to the
@@ -363,15 +360,13 @@ function areHookInputsEqual(
 export function renderWithHooks(
   current: Fiber | null,
   workInProgress: Fiber,
-  root: FiberRoot,
   Component: any,
   props: any,
   secondArg: any,
   nextRenderExpirationTime: ExpirationTime,
 ): any {
   renderExpirationTime = nextRenderExpirationTime;
   currentlyRenderingFiber = workInProgress;
-  currentlyRenderingRoot = root;
 
   if (__DEV__) {
     hookTypesDev =
@@ -478,7 +473,6 @@ export function renderWithHooks(
 
   renderExpirationTime = NoWork;
   currentlyRenderingFiber = (null: any);
-  currentlyRenderingRoot = (null: any);
 
   currentHook = null;
   workInProgressHook = null;
@@ -873,11 +867,15 @@ function useMutableSourceImpl<Source, Snapshot>(
 ): Snapshot {
   const {getSnapshot, subscribe} = config;
   const version = source._getVersion();
-  const pendingExpirationTime = getPendingExpirationTime(
-    currentlyRenderingRoot,
-    source,
+  const root = ((getWorkInProgressRoot(): any): FiberRoot);
+
+  invariant(
+    root !== null,
+    'Expected a work-in-progress root. This is likely a bug in React. Please file an issue.',
   );
 
+  const pendingExpirationTime = getPendingExpirationTime(root, source);
+
   // Is it safe to read from this source during the current render?
   let isSafeToReadFromSource = false;
 
@@ -957,7 +955,6 @@ function useMutableSourceImpl<Source, Snapshot>(
 
   if (prevSource !== source) {
     const fiber = currentlyRenderingFiber;
-    const root = currentlyRenderingRoot;
 
     const create = () => {
       const scheduleUpdate = () => {