Move checks inside

facebook · Aug 2, 2019 · 892df46 · 892df46
1 parent 133a4b5
commit 892df46
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js
@@ -134,13 +134,11 @@ function hasContextChanged(): boolean {
 }
 
 function isContextProvider(type: Function): boolean {
-  const childContextTypes = type.childContextTypes;
-  const hasChildContextTypes =
-    childContextTypes !== null && childContextTypes !== undefined;
   if (disableLegacyContext) {
     return false;
   } else {
-    return hasChildContextTypes;
+    const childContextTypes = type.childContextTypes;
+    return childContextTypes !== null && childContextTypes !== undefined;
   }
 }
 
@@ -154,7 +152,9 @@ function popContext(fiber: Fiber): void {
 }
 
 function popTopLevelContextObject(fiber: Fiber): void {
-  if (!disableLegacyContext) {
+  if (disableLegacyContext) {
+    return;
+  } else {
     pop(didPerformWorkStackCursor, fiber);
     pop(contextStackCursor, fiber);
   }
@@ -165,7 +165,9 @@ function pushTopLevelContextObject(
   context: Object,
   didChange: boolean,
 ): void {
-  if (!disableLegacyContext) {
+  if (disableLegacyContext) {
+    return;
+  } else {
     invariant(
       contextStackCursor.current === emptyContextObject,
       'Unexpected context found on stack. ' +