Remove null check

facebook · Nov 17, 2022 · ebb8afc · ebb8afc
1 parent d68d6e9
commit ebb8afc
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js
@@ -288,30 +288,30 @@ function safelyDetachRef(current: Fiber, nearestMountedAncestor: Fiber | null) {
   const ref = current.ref;
   const refCleanup = current.refCleanup;
 
-  if (typeof refCleanup === 'function') {
-    try {
-      if (shouldProfile(current)) {
-        try {
-          startLayoutEffectTimer();
+  if (ref !== null) {
+    if (typeof refCleanup === 'function') {
+      try {
+        if (shouldProfile(current)) {
+          try {
+            startLayoutEffectTimer();
+            refCleanup();
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        } else {
           refCleanup();
-        } finally {
-          recordLayoutEffectDuration(current);
         }
-      } else {
-        refCleanup();
-      }
-    } catch (error) {
-      captureCommitPhaseError(current, nearestMountedAncestor, error);
-    } finally {
-      // `refCleanup` has been called. Nullify all references to it to prevent double invocation.
-      current.refCleanup = null;
-      const finishedWork = current.alternate;
-      if (finishedWork != null) {
-        finishedWork.refCleanup = null;
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
+      } finally {
+        // `refCleanup` has been called. Nullify all references to it to prevent double invocation.
+        current.refCleanup = null;
+        const finishedWork = current.alternate;
+        if (finishedWork != null) {
+          finishedWork.refCleanup = null;
+        }
       }
-    }
-  } else if (ref !== null) {
-    if (typeof ref === 'function') {
+    } else if (typeof ref === 'function') {
       let retVal;
       try {
         if (shouldProfile(current)) {

diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js
@@ -288,30 +288,30 @@ function safelyDetachRef(current: Fiber, nearestMountedAncestor: Fiber | null) {
   const ref = current.ref;
   const refCleanup = current.refCleanup;
 
-  if (typeof refCleanup === 'function') {
-    try {
-      if (shouldProfile(current)) {
-        try {
-          startLayoutEffectTimer();
+  if (ref !== null) {
+    if (typeof refCleanup === 'function') {
+      try {
+        if (shouldProfile(current)) {
+          try {
+            startLayoutEffectTimer();
+            refCleanup();
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        } else {
           refCleanup();
-        } finally {
-          recordLayoutEffectDuration(current);
         }
-      } else {
-        refCleanup();
-      }
-    } catch (error) {
-      captureCommitPhaseError(current, nearestMountedAncestor, error);
-    } finally {
-      // `refCleanup` has been called. Nullify all references to it to prevent double invocation.
-      current.refCleanup = null;
-      const finishedWork = current.alternate;
-      if (finishedWork != null) {
-        finishedWork.refCleanup = null;
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
+      } finally {
+        // `refCleanup` has been called. Nullify all references to it to prevent double invocation.
+        current.refCleanup = null;
+        const finishedWork = current.alternate;
+        if (finishedWork != null) {
+          finishedWork.refCleanup = null;
+        }
       }
-    }
-  } else if (ref !== null) {
-    if (typeof ref === 'function') {
+    } else if (typeof ref === 'function') {
       let retVal;
       try {
         if (shouldProfile(current)) {