Move and add try/catch to Host Single acquire

The release is still not wrapped.
facebook · Sep 4, 2024 · ba1e919 · ba1e919
1 parent 7275edb
commit ba1e919
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberCommitHostEffects.js b/packages/react-reconciler/src/ReactFiberCommitHostEffects.js
@@ -47,6 +47,8 @@ import {
   commitHydratedSuspenseInstance,
   removeChildFromContainer,
   removeChild,
+  clearSingleton,
+  acquireSingletonInstance,
 } from './ReactFiberConfig';
 import {captureCommitPhaseError} from './ReactFiberWorkLoop';
 
@@ -413,3 +415,21 @@ export function commitHostHydratedSuspense(
     captureCommitPhaseError(finishedWork, finishedWork.return, error);
   }
 }
+
+export function commitHostSingleton(finishedWork: Fiber) {
+  const singleton = finishedWork.stateNode;
+  const props = finishedWork.memoizedProps;
+
+  try {
+    // This was a new mount, we need to clear and set initial properties
+    clearSingleton(singleton);
+    acquireSingletonInstance(
+      finishedWork.type,
+      props,
+      singleton,
+      finishedWork,
+    );
+  } catch (error) {
+    captureCommitPhaseError(finishedWork, finishedWork.return, error);
+  }
+}
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -121,8 +121,6 @@ import {
   prepareForCommit,
   beforeActiveInstanceBlur,
   detachDeletedInstance,
-  clearSingleton,
-  acquireSingletonInstance,
   releaseSingletonInstance,
   getHoistableRoot,
   acquireResource,
@@ -210,6 +208,7 @@ import {
   commitHostHydratedSuspense,
   commitHostRemoveChildFromContainer,
   commitHostRemoveChild,
+  commitHostSingleton,
 } from './ReactFiberCommitHostEffects';
 
 // Used during the commit phase to track the state of the Offscreen component stack.
@@ -1852,16 +1851,7 @@ function commitMutationEffectsOnFiber(
         if (flags & Update) {
           const previousWork = finishedWork.alternate;
           if (previousWork === null) {
-            const singleton = finishedWork.stateNode;
-            const props = finishedWork.memoizedProps;
-            // This was a new mount, we need to clear and set initial properties
-            clearSingleton(singleton);
-            acquireSingletonInstance(
-              finishedWork.type,
-              props,
-              singleton,
-              finishedWork,
-            );
+            commitHostSingleton(finishedWork);
           }
         }
       }