Revert "Feature: Suspend commit without blocking render (facebook#26398…

…)" This reverts commit db281b3.
kassens · Mar 20, 2023 · 66ea49b · 66ea49b
1 parent 75e9afd
commit 66ea49b
Show file tree

Hide file tree

Showing 23 changed files with 130 additions and 894 deletions.
diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js
@@ -459,17 +459,6 @@ export function requestPostPaintCallback(callback: (time: number) => void) {
   // noop
 }
 
-export function shouldSuspendCommit(type, props) {
-  return false;
-}
-
-export function startSuspendingCommit() {}
-
-export function suspendInstance(type, props) {}
-
-export function waitForCommitToBeReady() {
-  return null;
-}
 // eslint-disable-next-line no-undef
 export function prepareRendererToRender(container: Container): void {
   // noop

diff --git a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js b/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js
@@ -1608,19 +1608,6 @@ export function requestPostPaintCallback(callback: (time: number) => void) {
     localRequestAnimationFrame(time => callback(time));
   });
 }
-
-export function shouldSuspendCommit(type: Type, props: Props): boolean {
-  return false;
-}
-
-export function startSuspendingCommit(): void {}
-
-export function suspendInstance(type: Type, props: Props): void {}
-
-export function waitForCommitToBeReady(): null {
-  return null;
-}
-
 // -------------------
 //     Resources
 // -------------------

diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js
@@ -421,18 +421,6 @@ export function requestPostPaintCallback(callback: (time: number) => void) {
   // noop
 }
 
-export function shouldSuspendCommit(type: Type, props: Props): boolean {
-  return false;
-}
-
-export function startSuspendingCommit(): void {}
-
-export function suspendInstance(type: Type, props: Props): void {}
-
-export function waitForCommitToBeReady(): null {
-  return null;
-}
-
 export function prepareRendererToRender(container: Container): void {
   // noop
 }

diff --git a/packages/react-native-renderer/src/ReactNativeHostConfig.js b/packages/react-native-renderer/src/ReactNativeHostConfig.js
@@ -522,18 +522,6 @@ export function requestPostPaintCallback(callback: (time: number) => void) {
   // noop
 }
 
-export function shouldSuspendCommit(type: Type, props: Props): boolean {
-  return false;
-}
-
-export function startSuspendingCommit(): void {}
-
-export function suspendInstance(type: Type, props: Props): void {}
-
-export function waitForCommitToBeReady(): null {
-  return null;
-}
-
 export function prepareRendererToRender(container: Container): void {
   // noop
 }

diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js
@@ -28,9 +28,6 @@ export const {
   createLegacyRoot,
   getChildrenAsJSX,
   getPendingChildrenAsJSX,
-  getSuspenseyThingStatus,
-  resolveSuspenseyThing,
-  resetSuspenseyThingCache,
   createPortal,
   render,
   renderLegacySyncRoot,

diff --git a/packages/react-noop-renderer/src/ReactNoopPersistent.js b/packages/react-noop-renderer/src/ReactNoopPersistent.js
@@ -28,9 +28,6 @@ export const {
   createLegacyRoot,
   getChildrenAsJSX,
   getPendingChildrenAsJSX,
-  getSuspenseyThingStatus,
-  resolveSuspenseyThing,
-  resetSuspenseyThingCache,
   createPortal,
   render,
   renderLegacySyncRoot,

diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js
@@ -47,7 +47,6 @@ type Props = {
   left?: null | number,
   right?: null | number,
   top?: null | number,
-  src?: string,
   ...
 };
 type Instance = {
@@ -73,11 +72,6 @@ type CreateRootOptions = {
   ...
 };
 
-type SuspenseyCommitSubscription = {
-  pendingCount: number,
-  commit: null | (() => void),
-};
-
 const NO_CONTEXT = {};
 const UPPERCASE_CONTEXT = {};
 const UPDATE_SIGNAL = {};
@@ -244,11 +238,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       hidden: !!newProps.hidden,
       context: instance.context,
     };
-
-    if (type === 'suspensey-thing' && typeof newProps.src === 'string') {
-      clone.src = newProps.src;
-    }
-
     Object.defineProperty(clone, 'id', {
       value: clone.id,
       enumerable: false,
@@ -282,78 +271,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
     return hostContext === UPPERCASE_CONTEXT ? rawText.toUpperCase() : rawText;
   }
 
-  type SuspenseyThingRecord = {
-    status: 'pending' | 'fulfilled',
-    subscriptions: Array<SuspenseyCommitSubscription> | null,
-  };
-
-  let suspenseyThingCache: Map<
-    SuspenseyThingRecord,
-    'pending' | 'fulfilled',
-  > | null = null;
-
-  // Represents a subscription for all the suspensey things that block a
-  // particular commit. Once they've all loaded, the commit phase can proceed.
-  let suspenseyCommitSubscription: SuspenseyCommitSubscription | null = null;
-
-  function startSuspendingCommit(): void {
-    // This is where we might suspend on things that aren't associated with a
-    // particular node, like document.fonts.ready.
-    suspenseyCommitSubscription = null;
-  }
-
-  function suspendInstance(type: string, props: Props): void {
-    const src = props.src;
-    if (type === 'suspensey-thing' && typeof src === 'string') {
-      // Attach a listener to the suspensey thing and create a subscription
-      // object that uses reference counting to track when all the suspensey
-      // things have loaded.
-      const record = suspenseyThingCache.get(src);
-      if (record === undefined) {
-        throw new Error('Could not find record for key.');
-      }
-      if (record.status === 'pending') {
-        if (suspenseyCommitSubscription === null) {
-          suspenseyCommitSubscription = {
-            pendingCount: 1,
-            commit: null,
-          };
-        } else {
-          suspenseyCommitSubscription.pendingCount++;
-        }
-      }
-      // Stash the subscription on the record. In `resolveSuspenseyThing`,
-      // we'll use this fire the commit once all the things have loaded.
-      if (record.subscriptions === null) {
-        record.subscriptions = [];
-      }
-      record.subscriptions.push(suspenseyCommitSubscription);
-    } else {
-      throw new Error(
-        'Did not expect this host component to be visited when suspending ' +
-          'the commit. Did you check the SuspendCommit flag?',
-      );
-    }
-    return suspenseyCommitSubscription;
-  }
-
-  function waitForCommitToBeReady():
-    | ((commit: () => mixed) => () => void)
-    | null {
-    const subscription = suspenseyCommitSubscription;
-    if (subscription !== null) {
-      suspenseyCommitSubscription = null;
-      return (commit: () => void) => {
-        subscription.commit = commit;
-        const cancelCommit = () => {
-          subscription.commit = null;
-        };
-        return cancelCommit;
-      };
-    }
-    return null;
-  }
-
   const sharedHostConfig = {
     supportsSingletons: false,
 
@@ -405,11 +322,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
         hidden: !!props.hidden,
         context: hostContext,
       };
-
-      if (type === 'suspensey-thing' && typeof props.src === 'string') {
-        inst.src = props.src;
-      }
-
       // Hide from unit tests
       Object.defineProperty(inst, 'id', {value: inst.id, enumerable: false});
       Object.defineProperty(inst, 'parent', {
@@ -568,45 +480,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       const endTime = Scheduler.unstable_now();
       callback(endTime);
     },
-
-    shouldSuspendCommit(type: string, props: Props): boolean {
-      if (type === 'suspensey-thing' && typeof props.src === 'string') {
-        if (suspenseyThingCache === null) {
-          suspenseyThingCache = new Map();
-        }
-        const record = suspenseyThingCache.get(props.src);
-        if (record === undefined) {
-          const newRecord: SuspenseyThingRecord = {
-            status: 'pending',
-            subscriptions: null,
-          };
-          suspenseyThingCache.set(props.src, newRecord);
-          const onLoadStart = props.onLoadStart;
-          if (typeof onLoadStart === 'function') {
-            onLoadStart();
-          }
-          return props.src;
-        } else {
-          if (record.status === 'pending') {
-            // The resource was already requested, but it hasn't finished
-            // loading yet.
-            return true;
-          } else {
-            // The resource has already loaded. If the renderer is confident that
-            // the resource will still be cached by the time the render commits,
-            // then it can return false, like we do here.
-            return false;
-          }
-        }
-      }
-      // Don't need to suspend.
-      return false;
-    },
-
-    startSuspendingCommit,
-    suspendInstance,
-    waitForCommitToBeReady,
-
     prepareRendererToRender() {},
     resetRendererAfterRender() {},
   };
@@ -635,11 +508,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
           hostUpdateCounter++;
           instance.prop = newProps.prop;
           instance.hidden = !!newProps.hidden;
-
-          if (type === 'suspensey-thing' && typeof newProps.src === 'string') {
-            instance.src = newProps.src;
-          }
-
           if (shouldSetTextContent(type, newProps)) {
             if (__DEV__) {
               checkPropStringCoercion(newProps.children, 'children');
@@ -821,9 +689,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       if (instance.hidden) {
         props.hidden = true;
       }
-      if (instance.src) {
-        props.src = instance.src;
-      }
       if (children !== null) {
         props.children = children;
       }
@@ -1050,50 +915,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
       return getPendingChildrenAsJSX(container);
     },
 
-    getSuspenseyThingStatus(src): string | null {
-      if (suspenseyThingCache === null) {
-        return null;
-      } else {
-        const record = suspenseyThingCache.get(src);
-        return record === undefined ? null : record.status;
-      }
-    },
-
-    resolveSuspenseyThing(key: string): void {
-      if (suspenseyThingCache === null) {
-        suspenseyThingCache = new Map();
-      }
-      const record = suspenseyThingCache.get(key);
-      if (record === undefined) {
-        const newRecord: SuspenseyThingRecord = {
-          status: 'fulfilled',
-          subscriptions: null,
-        };
-        suspenseyThingCache.set(key, newRecord);
-      } else {
-        if (record.status === 'pending') {
-          record.status = 'fulfilled';
-          const subscriptions = record.subscriptions;
-          if (subscriptions !== null) {
-            record.subscriptions = null;
-            for (let i = 0; i < subscriptions.length; i++) {
-              const subscription = subscriptions[i];
-              subscription.pendingCount--;
-              if (subscription.pendingCount === 0) {
-                const commit = subscription.commit;
-                subscription.commit = null;
-                commit();
-              }
-            }
-          }
-        }
-      }
-    },
-
-    resetSuspenseyThingCache() {
-      suspenseyThingCache = null;
-    },
-
     createPortal(
       children: ReactNodeList,
       container: Container,

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -2298,7 +2298,7 @@ function updateSuspenseComponent(
             const newOffscreenQueue: OffscreenQueue = {
               transitions: currentTransitions,
               markerInstances: parentMarkerInstances,
-              retryQueue: null,
+              wakeables: null,
             };
             primaryChildFragment.updateQueue = newOffscreenQueue;
           } else {
@@ -2399,7 +2399,7 @@ function updateSuspenseComponent(
             const newOffscreenQueue: OffscreenQueue = {
               transitions: currentTransitions,
               markerInstances: parentMarkerInstances,
-              retryQueue: null,
+              wakeables: null,
             };
             primaryChildFragment.updateQueue = newOffscreenQueue;
           } else if (offscreenQueue === currentOffscreenQueue) {
@@ -2408,9 +2408,9 @@ function updateSuspenseComponent(
             const newOffscreenQueue: OffscreenQueue = {
               transitions: currentTransitions,
               markerInstances: parentMarkerInstances,
-              retryQueue:
+              wakeables:
                 currentOffscreenQueue !== null
-                  ? currentOffscreenQueue.retryQueue
+                  ? currentOffscreenQueue.wakeables
                   : null,
             };
             primaryChildFragment.updateQueue = newOffscreenQueue;