Don't yield before commit during sync error retry

Author: acdlite

packages/react-reconciler/src/ReactFiberScheduler.new.js

@@ -854,9 +854,11 @@ function renderRoot(
         // caused by tearing due to a mutation during an event. Try rendering
         // one more time without yiedling to events.
         prepareFreshStack(root, expirationTime);
-        // Return a continutation to maintian the same priority, but pass
-        // isSync true to disable yielding.
-        return renderRoot.bind(null, root, expirationTime, true);
+        scheduleCallback(
+          ImmediatePriority,
+          renderRoot.bind(null, root, expirationTime),
+        );
+        return null;
       }
       // If we're already rendering synchronously, commit the root in its
       // errored state.

packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.internal.js

@@ -134,11 +134,6 @@ describe('ReactIncrementalErrorHandling', () => {
       'ErrorMessage',
     ]);
 
-    if (enableNewScheduler) {
-      expect(ReactNoop.getChildren()).toEqual([]);
-      Scheduler.flushAll();
-    }
-
     expect(ReactNoop.getChildren()).toEqual([span('Caught an error: oops!')]);
   });
 
@@ -342,23 +337,14 @@ describe('ReactIncrementalErrorHandling', () => {
     // Finish the rest of the async work
     expect(Scheduler).toFlushAndYieldThrough(['Sibling']);
 
-    // React retries once, synchronously, before throwing.
-    if (enableNewScheduler) {
-      // New scheduler yields in between render and commit
-      Scheduler.unstable_flushNumberOfYields(1);
-      expect(Scheduler).toHaveYielded(['Parent', 'BadRender', 'Sibling']);
-      // Error is thrown during commit
-      expect(() => Scheduler.flushAll()).toThrow('oops');
-    } else {
-      // Old scheduler renders, commits, and throws synchronously
-      expect(() => Scheduler.unstable_flushNumberOfYields(1)).toThrow('oops');
-      expect(Scheduler).toHaveYielded([
-        'Parent',
-        'BadRender',
-        'Sibling',
-        'commit',
-      ]);
-    }
+    // Old scheduler renders, commits, and throws synchronously
+    expect(() => Scheduler.unstable_flushNumberOfYields(1)).toThrow('oops');
+    expect(Scheduler).toHaveYielded([
+      'Parent',
+      'BadRender',
+      'Sibling',
+      'commit',
+    ]);
     expect(ReactNoop.getChildren()).toEqual([]);
   });