WIP

facebook · Feb 28, 2024 · ae87aca · ae87aca
1 parent 16ee439
commit ae87aca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberLane.js b/packages/react-reconciler/src/ReactFiberLane.js
@@ -905,18 +905,21 @@ export function addFiberToLanesMap(
   }
 }
 
-export function movePendingFibersToMemoized(root: FiberRoot, lanes: Lanes) {
+export function movePendingFibersToMemoized(root: FiberRoot, passedLanes) {
+  console.log('movePendingFibersToMemoized', root, new Error().stack);
   if (!enableUpdaterTracking) {
     return;
   }
   if (!isDevToolsPresent) {
     return;
   }
+  let lanes = root.pendingLanes;
   const pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
   const memoizedUpdaters = root.memoizedUpdaters;
   while (lanes > 0) {
     const index = laneToIndex(lanes);
     const lane = 1 << index;
+    console.log({index, lane, passedLanes});
 
     const updaters = pendingUpdatersLaneMap[index];
     if (updaters.size > 0) {
@@ -931,6 +934,7 @@ export function movePendingFibersToMemoized(root: FiberRoot, lanes: Lanes) {
 
     lanes &= ~lane;
   }
+  console.log('moved');
 }
 
 export function addTransitionToLanesMap(

diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.js b/packages/react-reconciler/src/ReactFiberWorkLoop.js
@@ -910,6 +910,7 @@ export function isUnsafeClassRenderPhaseUpdate(fiber: Fiber): boolean {
 export function performConcurrentWorkOnRoot(
   root: FiberRoot,
   didTimeout: boolean,
+  passedLanes,
 ): RenderTaskFn | null {
   if (enableProfilerTimer && enableProfilerNestedUpdatePhase) {
     resetNestedUpdateFlag();
@@ -947,6 +948,7 @@ export function performConcurrentWorkOnRoot(
     // Defensive coding. This is never expected to happen.
     return null;
   }
+  console.log({lanes, passedLanes});
 
   // We disable time-slicing in some cases: if the work has been CPU-bound
   // for too long ("expired" work, to prevent starvation), or we're in

diff --git a/packages/react-reconciler/src/__tests__/ReactUpdaters-test.internal.js b/packages/react-reconciler/src/__tests__/ReactUpdaters-test.internal.js
@@ -45,6 +45,7 @@ describe('updaters', () => {
         }
         const schedulerTags = [];
         const schedulerTypes = [];
+        console.log(fiberRoot.pendingUpdatersLaneMap);
         fiberRoot.memoizedUpdaters.forEach(fiber => {
           schedulerTags.push(fiber.tag);
           schedulerTypes.push(fiber.elementType);
@@ -262,7 +263,7 @@ describe('updaters', () => {
     await waitForAll([]);
   });
 
-  it('should cover suspense pings', async () => {
+  it.only('should cover suspense pings', async () => {
     let data = null;
     let resolver = null;
     let promise = null;
@@ -304,19 +305,19 @@ describe('updaters', () => {
     expect(setShouldSuspend).not.toBeNull();
     expect(allSchedulerTypes).toEqual([[null]]);
 
+    console.log('suspend -----------------');
     await act(() => {
       setShouldSuspend(true);
     });
     assertLog(['onCommitRoot']);
     expect(allSchedulerTypes).toEqual([[null], [Suspender]]);
 
     expect(resolver).not.toBeNull();
-    await act(() => {
-      resolver('abc');
-      return promise;
-    });
-    assertLog(['onCommitRoot']);
-    expect(allSchedulerTypes).toEqual([[null], [Suspender], []]);
+    console.log('final -----------------');
+    resolver('abc');
+    await waitForAll(['onCommitRoot']);
+
+    expect(allSchedulerTypes).toEqual([[null], [Suspender], [Suspender]]);
 
     // Verify no outstanding flushes
     await waitForAll([]);