{"files":[{"status":"M","path":"src\/browser\/__tests__\/ReactDOM-test.js"},{"status":"M","path":"src\/browser\/findDOMNode.js"},{"status":"M","path":"src\/classic\/class\/ReactClass.js"},{"status":"M","path":"src\/classic\/element\/ReactElementValidator.js"},{"status":"M","path":"src\/classic\/element\/__tests__\/ReactElementValidator-test.js"},{"status":"M","path":"src\/core\/__tests__\/ReactComponent-test.js"},{"status":"M","path":"src\/core\/__tests__\/ReactComponentLifeCycle-test.js"},{"status":"M","path":"src\/core\/instantiateReactComponent.js"},{"status":"M","path":"src\/utils\/__tests__\/traverseAllChildren-test.js"},{"status":"M","path":"src\/utils\/traverseAllChildren.js"}],"parents":["f6920ba377b5f93cc8f02571fa16856839752428","2490289c4adda494cc774d6a30c90de0db41db6f"],"body":"Moar Warnings","patch":"diff --git a\/src\/browser\/__tests__\/ReactDOM-test.js b\/src\/browser\/__tests__\/ReactDOM-test.js\nindex 2feace23ad..0e0e5d4e85 100644\n--- a\/src\/browser\/__tests__\/ReactDOM-test.js\n+++ b\/src\/browser\/__tests__\/ReactDOM-test.js\n@@ -118,4 +118,5 @@ describe('ReactDOM', function() {\n expect(element.type).toBe('div');\n expect(console.warn.argsForCall.length).toBe(0);\n });\n+\n });\ndiff --git a\/src\/browser\/findDOMNode.js b\/src\/browser\/findDOMNode.js\nindex 730580bf65..f7f75ef775 100644\n--- a\/src\/browser\/findDOMNode.js\n+++ b\/src\/browser\/findDOMNode.js\n@@ -11,11 +11,14 @@\n *\/\n \n 'use strict';\n+\n+var ReactCurrentOwner = require('ReactCurrentOwner');\n var ReactInstanceMap = require('ReactInstanceMap');\n var ReactMount = require('ReactMount');\n \n var invariant = require('invariant');\n var isNode = require('isNode');\n+var warning = require('warning');\n \n \/**\n * Returns the DOM node rendered by this element.\n@@ -24,6 +27,21 @@ var isNode = require('isNode');\n * @return {DOMElement} The root node of this element.\n *\/\n function findDOMNode(componentOrElement) {\n+ if (__DEV__) {\n+ var owner = ReactCurrentOwner.current;\n+ if (owner !== null) {\n+ warning(\n+ owner._warnedAboutRefsInRender,\n+ '%s is accessing getDOMNode or findDOMNode inside its render(). ' +\n+ 'render() should be a pure function of props and state. It should ' +\n+ 'never access something that requires stale data from the previous ' +\n+ 'render, such as refs. Move this logic to componentDidMount and ' +\n+ 'componentDidUpdate instead.',\n+ owner.getName() || 'A component'\n+ );\n+ owner._warnedAboutRefsInRender = true;\n+ }\n+ }\n if (componentOrElement == null) {\n return null;\n }\ndiff --git a\/src\/classic\/class\/ReactClass.js b\/src\/classic\/class\/ReactClass.js\nindex e8136d909a..db58d92806 100644\n--- a\/src\/classic\/class\/ReactClass.js\n+++ b\/src\/classic\/class\/ReactClass.js\n@@ -12,6 +12,7 @@\n 'use strict';\n \n var ReactComponent = require('ReactComponent');\n+var ReactCurrentOwner = require('ReactCurrentOwner');\n var ReactElement = require('ReactElement');\n var ReactErrorUtils = require('ReactErrorUtils');\n var ReactInstanceMap = require('ReactInstanceMap');\n@@ -746,6 +747,21 @@ var ReactClassMixin = {\n * @final\n *\/\n isMounted: function() {\n+ if (__DEV__) {\n+ var owner = ReactCurrentOwner.current;\n+ if (owner !== null) {\n+ warning(\n+ owner._warnedAboutRefsInRender,\n+ '%s is accessing isMounted inside its render() function. ' +\n+ 'render() should be a pure function of props and state. It should ' +\n+ 'never access something that requires stale data from the previous ' +\n+ 'render, such as refs. Move this logic to componentDidMount and ' +\n+ 'componentDidUpdate instead.',\n+ owner.getName() || 'A component'\n+ );\n+ owner._warnedAboutRefsInRender = true;\n+ }\n+ }\n var internalInstance = ReactInstanceMap.get(this);\n return (\n internalInstance &&\ndiff --git a\/src\/classic\/element\/ReactElementValidator.js b\/src\/classic\/element\/ReactElementValidator.js\nindex c4d2e314ad..23572ddb69 100644\n--- a\/src\/classic\/element\/ReactElementValidator.js\n+++ b\/src\/classic\/element\/ReactElementValidator.js\n@@ -387,6 +387,33 @@ var ReactElementValidator = {\n );\n \/\/ Legacy hook TODO: Warn if this is accessed\n validatedFactory.type = type;\n+\n+ if (__DEV__) {\n+ try {\n+ Object.defineProperty(\n+ validatedFactory,\n+ 'type',\n+ {\n+ enumerable: false,\n+ get: function() {\n+ warning(\n+ false,\n+ 'Factory.type is deprecated. Access the class directly ' +\n+ 'before passing it to createFactory.'\n+ );\n+ Object.defineProperty(this, 'type', {\n+ value: type\n+ });\n+ return type;\n+ }\n+ }\n+ );\n+ } catch (x) {\n+ \/\/ IE will fail on defineProperty (es5-shim\/sham too)\n+ }\n+ }\n+\n+\n return validatedFactory;\n }\n \ndiff --git a\/src\/classic\/element\/__tests__\/ReactElementValidator-test.js b\/src\/classic\/element\/__tests__\/ReactElementValidator-test.js\nindex 5781db76ad..2ee825da0c 100644\n--- a\/src\/classic\/element\/__tests__\/ReactElementValidator-test.js\n+++ b\/src\/classic\/element\/__tests__\/ReactElementValidator-test.js\n@@ -330,4 +330,23 @@ describe('ReactElementValidator', function() {\n expect(console.warn.calls[0].args[0]).toContain('use of a keyed object');\n });\n \n+ it('should warn when accessing .type on an element factory', function() {\n+ spyOn(console, 'warn');\n+ var TestComponent = React.createClass({\n+ render: function() {\n+ return

;\n+ }\n+ });\n+ var TestFactory = React.createFactory(TestComponent);\n+ expect(TestFactory.type).toBe(TestComponent);\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ expect(console.warn.argsForCall[0][0]).toBe(\n+ 'Warning: Factory.type is deprecated. Access the class directly before ' +\n+ 'passing it to createFactory.'\n+ );\n+ \/\/ Warn once, not again\n+ expect(TestFactory.type).toBe(TestComponent);\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ });\n+\n });\ndiff --git a\/src\/core\/__tests__\/ReactComponent-test.js b\/src\/core\/__tests__\/ReactComponent-test.js\nindex 2a2be2a974..7dd26652b6 100644\n--- a\/src\/core\/__tests__\/ReactComponent-test.js\n+++ b\/src\/core\/__tests__\/ReactComponent-test.js\n@@ -254,26 +254,6 @@ describe('ReactComponent', function() {\n ]);\n });\n \n- it('should correctly determine if a component is mounted', function() {\n- var Component = React.createClass({\n- componentWillMount: function() {\n- expect(this.isMounted()).toBeFalsy();\n- },\n- componentDidMount: function() {\n- expect(this.isMounted()).toBeTruthy();\n- },\n- render: function() {\n- expect(this.isMounted()).toBeFalsy()\n- return ;\n- }\n- });\n-\n- var element = ;\n-\n- var instance = ReactTestUtils.renderIntoDocument(element);\n- expect(instance.isMounted()).toBeTruthy();\n- });\n-\n it('fires the callback after a component is rendered', function() {\n var callback = mocks.getMockFunction();\n var container = document.createElement('div');\ndiff --git a\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js b\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\nindex 929d1438d4..c665a2f24b 100644\n--- a\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\n+++ b\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\n@@ -261,16 +261,54 @@ describe('ReactComponentLifeCycle', function() {\n );\n });\n \n- it('is not mounted inside initial render', function() {\n- var InitialRender = React.createClass({\n+ it('should correctly determine if a component is mounted', function() {\n+ spyOn(console, 'warn');\n+ var Component = React.createClass({\n+ componentWillMount: function() {\n+ expect(this.isMounted()).toBeFalsy();\n+ },\n+ componentDidMount: function() {\n+ expect(this.isMounted()).toBeTruthy();\n+ },\n render: function() {\n- expect(this.isMounted()).toBe(false);\n- return (\n-

<\/div>\n- );\n+ expect(this.isMounted()).toBeFalsy()\n+ return ;\n }\n });\n- ReactTestUtils.renderIntoDocument();\n+\n+ var element = ;\n+\n+ var instance = ReactTestUtils.renderIntoDocument(element);\n+ expect(instance.isMounted()).toBeTruthy();\n+\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ expect(console.warn.argsForCall[0][0]).toContain(\n+ 'Component is accessing isMounted inside its render()'\n+ );\n+ });\n+\n+ it('warns if getDOMNode is used inside render', function() {\n+ spyOn(console, 'warn');\n+ var Component = React.createClass({\n+ getInitialState: function() {\n+ return { isMounted: false };\n+ },\n+ componentDidMount: function() {\n+ this.setState({ isMounted: true });\n+ },\n+ render: function() {\n+ if (this.state.isMounted) {\n+ expect(this.getDOMNode().tagName).toBe('DIV');\n+ }\n+ return ;\n+ }\n+ });\n+\n+ ReactTestUtils.renderIntoDocument();\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ expect(console.warn.argsForCall[0][0]).toContain(\n+ 'Component is accessing getDOMNode or findDOMNode inside its render()'\n+ );\n });\n \n it('should carry through each of the phases of setup', function() {\ndiff --git a\/src\/core\/instantiateReactComponent.js b\/src\/core\/instantiateReactComponent.js\nindex ffdfbc92fd..69732ce2bb 100644\n--- a\/src\/core\/instantiateReactComponent.js\n+++ b\/src\/core\/instantiateReactComponent.js\n@@ -116,6 +116,7 @@ function instantiateReactComponent(node, parentCompositeType) {\n \n if (__DEV__) {\n instance._isOwnerNecessary = false;\n+ instance._warnedAboutRefsInRender = false;\n }\n \n \/\/ Internal instances should fully constructed at this point, so they should\ndiff --git a\/src\/utils\/__tests__\/traverseAllChildren-test.js b\/src\/utils\/__tests__\/traverseAllChildren-test.js\nindex 84feb171f7..0d940c062f 100644\n--- a\/src\/utils\/__tests__\/traverseAllChildren-test.js\n+++ b\/src\/utils\/__tests__\/traverseAllChildren-test.js\n@@ -396,6 +396,8 @@ describe('traverseAllChildren', function() {\n });\n \n it('should use keys from entry iterables', function() {\n+ spyOn(console, 'warn');\n+\n var threeDivEntryIterable = {\n '@@iterator': function() {\n var i = 0;\n@@ -445,6 +447,13 @@ describe('traverseAllChildren', function() {\n '.$#3:0',\n 2\n );\n+\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ expect(console.warn.argsForCall[0][0]).toContain(\n+ 'Warning: Using Maps as children is not yet fully supported. It is an ' +\n+ 'experimental feature that might be removed. Convert it to a sequence ' +\n+ '\/ iterable of keyed ReactElements instead.'\n+ );\n });\n \n });\ndiff --git a\/src\/utils\/traverseAllChildren.js b\/src\/utils\/traverseAllChildren.js\nindex da8fd53bb9..e547237a5a 100644\n--- a\/src\/utils\/traverseAllChildren.js\n+++ b\/src\/utils\/traverseAllChildren.js\n@@ -17,6 +17,7 @@ var ReactInstanceHandles = require('ReactInstanceHandles');\n \n var getIteratorFn = require('getIteratorFn');\n var invariant = require('invariant');\n+var warning = require('warning');\n \n var SEPARATOR = ReactInstanceHandles.SEPARATOR;\n var SUBSEPARATOR = ':';\n@@ -34,6 +35,8 @@ var userProvidedKeyEscaperLookup = {\n \n var userProvidedKeyEscapeRegex = \/[=.:]\/g;\n \n+var didWarnAboutMaps = false;\n+\n function userProvidedKeyEscaper(match) {\n return userProvidedKeyEscaperLookup[match];\n }\n@@ -158,6 +161,15 @@ function traverseAllChildrenImpl(\n );\n }\n } else {\n+ if (__DEV__) {\n+ warning(\n+ didWarnAboutMaps,\n+ 'Using Maps as children is not yet fully supported. It is an ' +\n+ 'experimental feature that might be removed. Convert it to a ' +\n+ 'sequence \/ iterable of keyed ReactElements instead.'\n+ );\n+ didWarnAboutMaps = true;\n+ }\n \/\/ Iterator will provide entry [k,v] tuples rather than values.\n while (!(step = iterator.next()).done) {\n var entry = step.value;\n","commit":{"shortRevision":"cf4bef8bd7","authoredAt":"2015-02-17T15:09:33-08:00","authorName":"Sebastian Markbåge","subject":"Merge pull request #3171 from sebmarkbage\/moarwarnings","authorEmail":"sebastian@calyptus.eu","revision":"cf4bef8bd7e62e96775992417db436ac6f5809b7"}}

dillon1000/react

Files changed