Remove the safeguard around beforeActiveInstanceBlur

facebook · Jun 11, 2021 · 626cd53 · 626cd53
1 parent 696c161
commit 626cd53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 38 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js
@@ -342,24 +342,6 @@ function safelyCallDestroy(
   }
 }
 
-function safelyCallBeforeInstanceBlur(fiber: Fiber) {
-  if (__DEV__) {
-    setCurrentDebugFiberInDEV(fiber);
-    invokeGuardedCallback(null, beforeActiveInstanceBlur, null, fiber);
-    if (hasCaughtError()) {
-      const error = clearCaughtError();
-      captureCommitPhaseError(fiber, fiber.return, error);
-    }
-    resetCurrentDebugFiberInDEV();
-  } else {
-    try {
-      beforeActiveInstanceBlur(fiber);
-    } catch (error) {
-      captureCommitPhaseError(fiber, fiber.return, error);
-    }
-  }
-}
-
 let focusedInstanceHandle: null | Fiber = null;
 let shouldFireAfterActiveInstanceBlur: boolean = false;
 
@@ -428,7 +410,7 @@ function commitBeforeMutationEffects_complete() {
           doesFiberContain(fiber, focusedInstanceHandle)
         ) {
           shouldFireAfterActiveInstanceBlur = true;
-          safelyCallBeforeInstanceBlur(fiber);
+          beforeActiveInstanceBlur(fiber);
         }
       }
     }

diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js
@@ -342,24 +342,6 @@ function safelyCallDestroy(
   }
 }
 
-function safelyCallBeforeInstanceBlur(fiber: Fiber) {
-  if (__DEV__) {
-    setCurrentDebugFiberInDEV(fiber);
-    invokeGuardedCallback(null, beforeActiveInstanceBlur, null, fiber);
-    if (hasCaughtError()) {
-      const error = clearCaughtError();
-      captureCommitPhaseError(fiber, fiber.return, error);
-    }
-    resetCurrentDebugFiberInDEV();
-  } else {
-    try {
-      beforeActiveInstanceBlur(fiber);
-    } catch (error) {
-      captureCommitPhaseError(fiber, fiber.return, error);
-    }
-  }
-}
-
 let focusedInstanceHandle: null | Fiber = null;
 let shouldFireAfterActiveInstanceBlur: boolean = false;
 
@@ -428,7 +410,7 @@ function commitBeforeMutationEffects_complete() {
           doesFiberContain(fiber, focusedInstanceHandle)
         ) {
           shouldFireAfterActiveInstanceBlur = true;
-          safelyCallBeforeInstanceBlur(fiber);
+          beforeActiveInstanceBlur(fiber);
         }
       }
     }