Remove closure in checkReactTypeSpec by tracking stack info globally

There's a lot of overlap between ReactCurrentOwner,
ReactDebugCurrentFrame, and ReactDebugCurrentFiber that should
be consolidated.

Author: acdlite

src/isomorphic/classic/element/ReactDebugCurrentFrame.js

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactDebugCurrentFrame
+ * @flow
+ */
+
+'use strict';
+
+import type { Fiber } from 'ReactFiber';
+import type { DebugID } from 'ReactInstanceType';
+
+if (__DEV__) {
+  var {
+    getStackAddendumByID,
+    getStackAddendumByWorkInProgressFiber,
+    getCurrentStackAddendum,
+  } = require('ReactComponentTreeHook');
+}
+
+const ReactDebugCurrentFrame = {
+  // Component that is being worked on
+  current: (null : Fiber | DebugID | null),
+
+  // Element that is being cloned or created
+  element: (null : *),
+
+  getStackAddendum() : string | null {
+    let stack = null;
+    if (__DEV__) {
+      const current = ReactDebugCurrentFrame.current;
+      const element = ReactDebugCurrentFrame.element;
+      if (current !== null) {
+        if (typeof current === 'number') {
+          // DebugID from Stack.
+          const debugID = current;
+          stack = getStackAddendumByID(debugID);
+        } else if (typeof current.tag === 'number') {
+          // This is a Fiber.
+          // The stack will only be correct if this is a work in progress
+          // version and we're calling it during reconciliation.
+          const workInProgress = current;
+          stack = getStackAddendumByWorkInProgressFiber(workInProgress);
+        }
+      } else if (element !== null) {
+        stack = getCurrentStackAddendum(element);
+      }
+    }
+    return stack;
+  },
+};
+
+module.exports = ReactDebugCurrentFrame;

src/isomorphic/classic/element/ReactElementValidator.js

@@ -27,7 +27,11 @@ var checkReactTypeSpec = require('checkReactTypeSpec');
 var canDefineProperty = require('canDefineProperty');
 var getComponentName = require('getComponentName');
 var getIteratorFn = require('getIteratorFn');
-var warning = require('warning');
+
+if (__DEV__) {
+  var warning = require('warning');
+  var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
+}
 
 function getDeclarationErrorAddendum() {
   if (ReactCurrentOwner.current) {
@@ -181,9 +185,7 @@ function validatePropTypes(element) {
       componentClass.propTypes,
       element.props,
       'prop',
-      name,
-      element,
-      null
+      name
     );
   }
   if (typeof componentClass.getDefaultProps === 'function') {
@@ -248,6 +250,10 @@ var ReactElementValidator = {
       return element;
     }
 
+    if (__DEV__) {
+      ReactDebugCurrentFrame.element = element;
+    }
+
     // Skip key warning if the type isn't valid since our key validation logic
     // doesn't expect a non-string/function type and can throw confusing errors.
     // We don't want exception behavior to differ between dev and prod.
@@ -261,6 +267,10 @@ var ReactElementValidator = {
 
     validatePropTypes(element);
 
+    if (__DEV__) {
+      ReactDebugCurrentFrame.element = null;
+    }
+
     return element;
   },
 
@@ -301,10 +311,16 @@ var ReactElementValidator = {
 
   cloneElement: function(element, props, children) {
     var newElement = ReactElement.cloneElement.apply(this, arguments);
+    if (__DEV__) {
+      ReactDebugCurrentFrame.element = newElement;
+    }
     for (var i = 2; i < arguments.length; i++) {
       validateChildKeys(arguments[i], newElement.type);
     }
     validatePropTypes(newElement);
+    if (__DEV__) {
+      ReactDebugCurrentFrame.element = null;
+    }
     return newElement;
   },
 

src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js

@@ -32,7 +32,7 @@ function getPropTypeWarningMessage(propTypes, object, componentName) {
     console.error.calls.reset();
   }
   resetWarningCache();
-  checkReactTypeSpec(propTypes, object, 'prop', 'testComponent', null, null);
+  checkReactTypeSpec(propTypes, object, 'prop', 'testComponent');
   const callCount = console.error.calls.count();
   if (callCount > 1) {
     throw new Error('Too many warnings.');

src/isomorphic/classic/types/checkPropTypes.js

@@ -75,7 +75,7 @@ function checkPropTypes(typeSpecs, values, location, componentName, getStack) {
           'Failed %s type: %s%s',
           location,
           error.message,
-          stack,
+          stack != null ? stack : '',
         );
       }
     }

src/renderers/shared/fiber/ReactFiberContext.js

@@ -34,6 +34,7 @@ const {
 
 if (__DEV__) {
   var checkReactTypeSpec = require('checkReactTypeSpec');
+  var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
   var warnedAboutMissingGetChildContext = {};
 }
 
@@ -91,7 +92,9 @@ exports.getMaskedContext = function(workInProgress : Fiber, unmaskedContext : Ob
 
   if (__DEV__) {
     const name = getComponentName(workInProgress);
-    checkReactTypeSpec(contextTypes, context, 'context', name, null, workInProgress);
+    ReactDebugCurrentFrame.current = workInProgress;
+    checkReactTypeSpec(contextTypes, context, 'context', name);
+    ReactDebugCurrentFrame.current = null;
   }
 
   // Cache unmasked context so we can avoid recreating masked context unless necessary.
@@ -182,7 +185,9 @@ function processChildContext(fiber : Fiber, parentContext : Object, isReconcilin
     // assume anything about the given fiber. We won't pass it down if we aren't sure.
     // TODO: remove this hack when we delete unstable_renderSubtree in Fiber.
     const workInProgress = isReconciling ? fiber : null;
-    checkReactTypeSpec(childContextTypes, childContext, 'child context', name, null, workInProgress);
+    ReactDebugCurrentFrame.current = workInProgress;
+    checkReactTypeSpec(childContextTypes, childContext, 'child context', name);
+    ReactDebugCurrentFrame.current = null;
   }
   return {...parentContext, ...childContext};
 }

src/renderers/shared/stack/reconciler/ReactCompositeComponent.js

@@ -24,6 +24,7 @@ var ReactReconciler = require('ReactReconciler');
 
 if (__DEV__) {
   var checkReactTypeSpec = require('checkReactTypeSpec');
+  var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
   var warningAboutMissingGetChildContext = {};
 }
 
@@ -731,14 +732,14 @@ var ReactCompositeComponent = {
     location: string,
   ) {
     if (__DEV__) {
+      ReactDebugCurrentFrame.current = this._debugID;
       checkReactTypeSpec(
         typeSpecs,
         values,
         location,
-        this.getName(),
-        null,
-        this._debugID
+        this.getName()
       );
+      ReactDebugCurrentFrame.current = null;
     }
   },
 

src/shared/types/checkReactTypeSpec.js

@@ -13,57 +13,21 @@
 
 var checkPropTypes = require('checkPropTypes');
 
-var ReactComponentTreeHook;
-
-if (
-  typeof process !== 'undefined' &&
-  process.env &&
-  process.env.NODE_ENV === 'test'
-) {
-  // Temporary hack.
-  // Inline requires don't work well with Jest:
-  // https://github.com/facebook/react/issues/7240
-  // Remove the inline requires when we don't need them anymore:
-  // https://github.com/facebook/react/pull/7178
-  ReactComponentTreeHook = require('ReactComponentTreeHook');
-}
+var { getStackAddendum } = require('ReactDebugCurrentFrame');
 
 function checkReactTypeSpec(
   typeSpecs,
   values,
   location: string,
-  componentName,
-  element,
-  // It is only safe to pass fiber if it is the work-in-progress version, and
-  // only during reconciliation (begin and complete phase).
-  workInProgressOrDebugID
+  componentName
 ) {
-  function getStack() {
-    let stack = '';
-    if (__DEV__) {
-      if (!ReactComponentTreeHook) {
-        ReactComponentTreeHook = require('ReactComponentTreeHook');
-      }
-      if (workInProgressOrDebugID != null) {
-        if (typeof workInProgressOrDebugID === 'number') {
-          // DebugID from Stack.
-          const debugID = workInProgressOrDebugID;
-          stack = ReactComponentTreeHook.getStackAddendumByID(debugID);
-        } else if (typeof workInProgressOrDebugID.tag === 'number') {
-          // This is a Fiber.
-          // The stack will only be correct if this is a work in progress
-          // version and we're calling it during reconciliation.
-          const workInProgress = workInProgressOrDebugID;
-          stack = ReactComponentTreeHook.getStackAddendumByWorkInProgressFiber(workInProgress);
-        }
-      } else if (element !== null) {
-        stack = ReactComponentTreeHook.getCurrentStackAddendum(element);
-      }
-    }
-    return stack;
-  }
-
-  checkPropTypes(typeSpecs, values, location, componentName, getStack);
+  checkPropTypes(
+    typeSpecs,
+    values,
+    location,
+    componentName,
+    getStackAddendum
+  );
 }
 
 module.exports = checkReactTypeSpec;