{"files":[{"status":"M","path":"src\/browser\/ui\/ReactDOMComponent.js"},{"status":"M","path":"src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js"},{"status":"M","path":"src\/core\/ReactComponent.js"},{"status":"M","path":"src\/core\/ReactCompositeComponent.js"},{"status":"M","path":"src\/core\/ReactElementValidator.js"},{"status":"M","path":"src\/core\/ReactOwner.js"},{"status":"M","path":"src\/core\/ReactUpdates.js"},{"status":"M","path":"src\/core\/__tests__\/ReactComponentLifeCycle-test.js"},{"status":"M","path":"src\/core\/__tests__\/ReactElement-test.js"},{"status":"M","path":"src\/core\/__tests__\/ReactUpdates-test.js"},{"status":"M","path":"src\/test\/ReactDefaultPerf.js"}],"parents":["a194e51af0c1f62d5b994f203c61bbe9a75e5c55","63644d5e71356d422603c0faef6b664c1bdb1f42"],"commit":{"authorName":"Sebastian Markbåge","subject":"Merge pull request #2539 from sebmarkbage\/cleanupinternals","authoredAt":"2014-11-16T21:13:07-08:00","authorEmail":"sebastian@calyptus.eu","revision":"e4218cb7dcc4383679c2e4736675a9d32836e0cd","shortRevision":"e4218cb7dc"},"body":"Clean up a bunch of internal methods and fields that are now unnecessary","patch":"diff --git a\/src\/browser\/ui\/ReactDOMComponent.js b\/src\/browser\/ui\/ReactDOMComponent.js\nindex 862e1af6a1..3bdae4cb36 100644\n--- a\/src\/browser\/ui\/ReactDOMComponent.js\n+++ b\/src\/browser\/ui\/ReactDOMComponent.js\n@@ -173,8 +173,8 @@ ReactDOMComponent.Mixin = {\n transaction,\n mountDepth\n );\n- assertValidProps(this.props);\n this._previousStyleCopy = null;\n+ assertValidProps(this._currentElement.props);\n var closeTag = omittedCloseTags[this._tag] ? '' : '<\/' + this._tag + '>';\n return (\n this._createOpenTagMarkupAndPutListeners(transaction) +\n@@ -197,7 +197,7 @@ ReactDOMComponent.Mixin = {\n * @return {string} Markup of opening tag.\n *\/\n _createOpenTagMarkupAndPutListeners: function(transaction) {\n- var props = this.props;\n+ var props = this._currentElement.props;\n var ret = '<' + this._tag;\n \n for (var propKey in props) {\n@@ -253,16 +253,18 @@ ReactDOMComponent.Mixin = {\n prefix = '\\n';\n }\n \n+ var props = this._currentElement.props;\n+\n \/\/ Intentional use of != to avoid catching zero\/false.\n- var innerHTML = this.props.dangerouslySetInnerHTML;\n+ var innerHTML = props.dangerouslySetInnerHTML;\n if (innerHTML != null) {\n if (innerHTML.__html != null) {\n return prefix + innerHTML.__html;\n }\n } else {\n var contentToUse =\n- CONTENT_TYPES[typeof this.props.children] ? this.props.children : null;\n- var childrenToUse = contentToUse != null ? null : this.props.children;\n+ CONTENT_TYPES[typeof props.children] ? props.children : null;\n+ var childrenToUse = contentToUse != null ? null : props.children;\n if (contentToUse != null) {\n return prefix + escapeTextForBrowser(contentToUse);\n } else if (childrenToUse != null) {\n@@ -338,7 +340,7 @@ ReactDOMComponent.Mixin = {\n * @param {ReactReconcileTransaction} transaction\n *\/\n _updateDOMProperties: function(lastProps, transaction) {\n- var nextProps = this.props;\n+ var nextProps = this._currentElement.props;\n var propKey;\n var styleName;\n var styleUpdates;\n@@ -427,7 +429,7 @@ ReactDOMComponent.Mixin = {\n * @param {ReactReconcileTransaction} transaction\n *\/\n _updateDOMChildren: function(lastProps, transaction) {\n- var nextProps = this.props;\n+ var nextProps = this._currentElement.props;\n \n var lastContent =\n CONTENT_TYPES[typeof lastProps.children] ? lastProps.children : null;\ndiff --git a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\nindex 3ab38722bf..58216c236e 100644\n--- a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n@@ -226,7 +226,7 @@ describe('ReactDOMComponent', function() {\n var ReactReconcileTransaction = require('ReactReconcileTransaction');\n \n var NodeStub = function(initialProps) {\n- this.props = initialProps || {};\n+ this._currentElement = { props: initialProps };\n this._rootNodeID = 'test';\n };\n assign(NodeStub.prototype, ReactDOMComponent.Mixin);\n@@ -276,7 +276,7 @@ describe('ReactDOMComponent', function() {\n var ReactReconcileTransaction = require('ReactReconcileTransaction');\n \n var NodeStub = function(initialProps) {\n- this.props = initialProps || {};\n+ this._currentElement = { props: initialProps };\n this._rootNodeID = 'test';\n };\n assign(NodeStub.prototype, ReactDOMComponent.Mixin);\ndiff --git a\/src\/core\/ReactComponent.js b\/src\/core\/ReactComponent.js\nindex 564c7311cc..39f7381ccb 100644\n--- a\/src\/core\/ReactComponent.js\n+++ b\/src\/core\/ReactComponent.js\n@@ -20,21 +20,6 @@ var assign = require('Object.assign');\n var invariant = require('invariant');\n var keyMirror = require('keyMirror');\n \n-\/**\n- * Every React component is in one of these life cycles.\n- *\/\n-var ComponentLifeCycle = keyMirror({\n- \/**\n- * Mounted components have a DOM node representation and are capable of\n- * receiving new props.\n- *\/\n- MOUNTED: null,\n- \/**\n- * Unmounted components are inactive and cannot receive new props.\n- *\/\n- UNMOUNTED: null\n-});\n-\n var injected = false;\n \n \/**\n@@ -115,11 +100,6 @@ var ReactComponent = {\n }\n },\n \n- \/**\n- * @internal\n- *\/\n- LifeCycle: ComponentLifeCycle,\n-\n \/**\n * Injected module that provides ability to mutate individual properties.\n * Injected into the base class because many different subclasses need access\n@@ -137,17 +117,6 @@ var ReactComponent = {\n *\/\n Mixin: {\n \n- \/**\n- * Checks whether or not this component is mounted.\n- *\n- * @return {boolean} True if mounted, false otherwise.\n- * @final\n- * @protected\n- *\/\n- isMounted: function() {\n- return this._lifeCycleState === ComponentLifeCycle.MOUNTED;\n- },\n-\n \/**\n * Sets a subset of the props.\n *\n@@ -175,10 +144,6 @@ var ReactComponent = {\n * @public\n *\/\n replaceProps: function(props, callback) {\n- invariant(\n- this.isMounted(),\n- 'replaceProps(...): Can only update a mounted component.'\n- );\n invariant(\n this._mountDepth === 0,\n 'replaceProps(...): You called `setProps` or `replaceProps` on a ' +\n@@ -225,19 +190,6 @@ var ReactComponent = {\n * @internal\n *\/\n construct: function(element) {\n- \/\/ This is the public exposed props object after it has been processed\n- \/\/ with default props. The element's props represents the true internal\n- \/\/ state of the props.\n- this.props = element.props;\n- \/\/ Record the component responsible for creating this component.\n- \/\/ This is accessible through the element but we maintain an extra\n- \/\/ field for compatibility with devtools and as a way to make an\n- \/\/ incremental update. TODO: Consider deprecating this field.\n- this._owner = element._owner;\n-\n- \/\/ All components start unmounted.\n- this._lifeCycleState = ComponentLifeCycle.UNMOUNTED;\n-\n \/\/ See ReactUpdates.\n this._pendingCallbacks = null;\n \n@@ -262,20 +214,12 @@ var ReactComponent = {\n * @internal\n *\/\n mountComponent: function(rootID, transaction, mountDepth) {\n- invariant(\n- !this.isMounted(),\n- 'mountComponent(%s, ...): Can only mount an unmounted component. ' +\n- 'Make sure to avoid storing components between renders or reusing a ' +\n- 'single component instance in multiple places.',\n- rootID\n- );\n var ref = this._currentElement.ref;\n if (ref != null) {\n var owner = this._currentElement._owner;\n attachRef(ref, this, owner);\n }\n this._rootNodeID = rootID;\n- this._lifeCycleState = ComponentLifeCycle.MOUNTED;\n this._mountDepth = mountDepth;\n \/\/ Effectively: return '';\n },\n@@ -291,17 +235,15 @@ var ReactComponent = {\n * @internal\n *\/\n unmountComponent: function() {\n- invariant(\n- this.isMounted(),\n- 'unmountComponent(): Can only unmount a mounted component.'\n- );\n var ref = this._currentElement.ref;\n if (ref != null) {\n- detachRef(ref, this, this._owner);\n+ detachRef(ref, this, this._currentElement._owner);\n }\n unmountIDFromEnvironment(this._rootNodeID);\n+ \/\/ Reset all fields\n this._rootNodeID = null;\n- this._lifeCycleState = ComponentLifeCycle.UNMOUNTED;\n+ this._pendingCallbacks = null;\n+ this._pendingElement = null;\n },\n \n \/**\n@@ -316,10 +258,6 @@ var ReactComponent = {\n * @internal\n *\/\n receiveComponent: function(nextElement, transaction) {\n- invariant(\n- this.isMounted(),\n- 'receiveComponent(...): Can only update a mounted component.'\n- );\n this._pendingElement = nextElement;\n this.performUpdateIfNecessary(transaction);\n },\n@@ -337,8 +275,6 @@ var ReactComponent = {\n var prevElement = this._currentElement;\n var nextElement = this._pendingElement;\n this._currentElement = nextElement;\n- this.props = nextElement.props;\n- this._owner = nextElement._owner;\n this._pendingElement = null;\n this.updateComponent(transaction, prevElement, nextElement);\n },\n@@ -416,34 +352,6 @@ var ReactComponent = {\n mountImageIntoNode(markup, container, shouldReuseMarkup);\n },\n \n- \/**\n- * Checks if this component is owned by the supplied `owner` component.\n- *\n- * @param {ReactComponent} owner Component to check.\n- * @return {boolean} True if `owners` owns this component.\n- * @final\n- * @internal\n- *\/\n- isOwnedBy: function(owner) {\n- return this._owner === owner;\n- },\n-\n- \/**\n- * Gets another component, that shares the same owner as this one, by ref.\n- *\n- * @param {string} ref of a sibling Component.\n- * @return {?ReactComponent} the actual sibling Component.\n- * @final\n- * @internal\n- *\/\n- getSiblingByRef: function(ref) {\n- var owner = this._owner;\n- if (!owner || !owner.refs) {\n- return null;\n- }\n- return owner.refs[ref];\n- },\n-\n \/**\n * Get the publicly accessible representation of this component - i.e. what\n * is exposed by refs and renderComponent. Can be null for stateless\ndiff --git a\/src\/core\/ReactCompositeComponent.js b\/src\/core\/ReactCompositeComponent.js\nindex 7d5e66e5fe..b0284cc7ae 100644\n--- a\/src\/core\/ReactCompositeComponent.js\n+++ b\/src\/core\/ReactCompositeComponent.js\n@@ -16,19 +16,19 @@ var ReactContext = require('ReactContext');\n var ReactCurrentOwner = require('ReactCurrentOwner');\n var ReactElement = require('ReactElement');\n var ReactInstanceMap = require('ReactInstanceMap');\n-var ReactOwner = require('ReactOwner');\n var ReactPerf = require('ReactPerf');\n var ReactPropTypeLocations = require('ReactPropTypeLocations');\n var ReactUpdates = require('ReactUpdates');\n \n var assign = require('Object.assign');\n+var emptyObject = require('emptyObject');\n var invariant = require('invariant');\n var keyMirror = require('keyMirror');\n var shouldUpdateReactComponent = require('shouldUpdateReactComponent');\n var warning = require('warning');\n \n function getDeclarationErrorAddendum(component) {\n- var owner = component._owner || null;\n+ var owner = component._currentElement._owner || null;\n if (owner) {\n var constructor = owner._instance.constructor;\n if (constructor && constructor.displayName) {\n@@ -56,8 +56,8 @@ function validateLifeCycleOnReplaceState(instance) {\n * `ReactCompositeComponent` maintains an auxiliary life cycle state in\n * `this._compositeLifeCycleState` (which can be null).\n *\n- * This is different from the life cycle state maintained by `ReactComponent` in\n- * `this._lifeCycleState`. The following diagram shows how the states overlap in\n+ * This is different from the life cycle state maintained by `ReactComponent`.\n+ * The following diagram shows how the states overlap in\n * time. There are times when the CompositeLifeCycle is null - at those times it\n * is only meaningful to look at ComponentLifeCycle alone.\n *\n@@ -100,8 +100,7 @@ var CompositeLifeCycle = keyMirror({\n * @lends {ReactCompositeComponent.prototype}\n *\/\n var ReactCompositeComponentMixin = assign({},\n- ReactComponent.Mixin,\n- ReactOwner.Mixin, {\n+ ReactComponent.Mixin, {\n \n \/**\n * Base constructor for all composite component.\n@@ -114,13 +113,13 @@ var ReactCompositeComponentMixin = assign({},\n this._instance.props = element.props;\n this._instance.state = null;\n this._instance.context = null;\n+ this._instance.refs = emptyObject;\n \n this._pendingState = null;\n this._compositeLifeCycleState = null;\n \n \/\/ Children can be either an array or more than one argument\n ReactComponent.Mixin.construct.apply(this, arguments);\n- ReactOwner.Mixin.construct.apply(this, arguments);\n },\n \n \/**\n@@ -130,8 +129,7 @@ var ReactCompositeComponentMixin = assign({},\n * @final\n *\/\n isMounted: function() {\n- return ReactComponent.Mixin.isMounted.call(this) &&\n- this._compositeLifeCycleState !== CompositeLifeCycle.MOUNTING;\n+ return this._compositeLifeCycleState !== CompositeLifeCycle.MOUNTING;\n },\n \n \/**\n@@ -233,6 +231,9 @@ var ReactCompositeComponentMixin = assign({},\n this._renderedComponent.unmountComponent();\n this._renderedComponent = null;\n \n+ \/\/ Reset pending fields\n+ this._pendingState = null;\n+ this._pendingForceUpdate = false;\n ReactComponent.Mixin.unmountComponent.call(this);\n \n \/\/ Delete the reference from the instance to this internal representation\n@@ -555,11 +556,6 @@ var ReactCompositeComponentMixin = assign({},\n inst.props = nextProps;\n inst.state = nextState;\n inst.context = nextContext;\n-\n- \/\/ Owner cannot change because shouldUpdateReactComponent doesn't allow\n- \/\/ it. TODO: Remove this._owner completely.\n- this._owner = nextParentElement._owner;\n-\n return;\n }\n \n@@ -607,10 +603,6 @@ var ReactCompositeComponentMixin = assign({},\n inst.state = nextState;\n inst.context = nextContext;\n \n- \/\/ Owner cannot change because shouldUpdateReactComponent doesn't allow\n- \/\/ it. TODO: Remove this._owner completely.\n- this._owner = nextElement._owner;\n-\n this._updateRenderedComponent(transaction);\n \n if (inst.componentDidUpdate) {\n@@ -699,6 +691,32 @@ var ReactCompositeComponentMixin = assign({},\n }\n ),\n \n+ \/**\n+ * Lazily allocates the refs object and stores `component` as `ref`.\n+ *\n+ * @param {string} ref Reference name.\n+ * @param {component} component Component to store as `ref`.\n+ * @final\n+ * @private\n+ *\/\n+ attachRef: function(ref, component) {\n+ var inst = this.getPublicInstance();\n+ var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;\n+ refs[ref] = component.getPublicInstance();\n+ },\n+\n+ \/**\n+ * Detaches a reference name.\n+ *\n+ * @param {string} ref Name to dereference.\n+ * @final\n+ * @private\n+ *\/\n+ detachRef: function(ref) {\n+ var refs = this.getPublicInstance().refs;\n+ delete refs[ref];\n+ },\n+\n \/**\n * Get the publicly accessible representation of this component - i.e. what\n * is exposed by refs and renderComponent. Can be null for stateless\ndiff --git a\/src\/core\/ReactElementValidator.js b\/src\/core\/ReactElementValidator.js\nindex e93dae340f..51866856dd 100644\n--- a\/src\/core\/ReactElementValidator.js\n+++ b\/src\/core\/ReactElementValidator.js\n@@ -160,7 +160,7 @@ function monitorUseOfObjectMap() {\n }\n \n \/**\n- * Ensure that every component either is passed in a static location, in an\n+ * Ensure that every element either is passed in a static location, in an\n * array with an explicit keys property defined, or in an object literal\n * with valid key property.\n *\ndiff --git a\/src\/core\/ReactOwner.js b\/src\/core\/ReactOwner.js\nindex 22e493493e..29da2705a9 100644\n--- a\/src\/core\/ReactOwner.js\n+++ b\/src\/core\/ReactOwner.js\n@@ -11,7 +11,6 @@\n \n \"use strict\";\n \n-var emptyObject = require('emptyObject');\n var invariant = require('invariant');\n \n \/**\n@@ -103,53 +102,6 @@ var ReactOwner = {\n if (owner.getPublicInstance().refs[ref] === component.getPublicInstance()) {\n owner.detachRef(ref);\n }\n- },\n-\n- \/**\n- * A ReactComponent must mix this in to have refs.\n- *\n- * @lends {ReactOwner.prototype}\n- *\/\n- Mixin: {\n-\n- construct: function() {\n- var inst = this.getPublicInstance();\n- inst.refs = emptyObject;\n- },\n-\n- \/**\n- * Lazily allocates the refs object and stores `component` as `ref`.\n- *\n- * @param {string} ref Reference name.\n- * @param {component} component Component to store as `ref`.\n- * @final\n- * @private\n- *\/\n- attachRef: function(ref, component) {\n- \/\/ TODO: Remove this invariant. This is never exposed and cannot be called\n- \/\/ by user code. The unit test is already removed.\n- invariant(\n- component.isOwnedBy(this),\n- 'attachRef(%s, ...): Only a component\\'s owner can store a ref to it.',\n- ref\n- );\n- var inst = this.getPublicInstance();\n- var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;\n- refs[ref] = component.getPublicInstance();\n- },\n-\n- \/**\n- * Detaches a reference name.\n- *\n- * @param {string} ref Name to dereference.\n- * @final\n- * @private\n- *\/\n- detachRef: function(ref) {\n- var refs = this.getPublicInstance().refs;\n- delete refs[ref];\n- }\n-\n }\n \n };\ndiff --git a\/src\/core\/ReactUpdates.js b\/src\/core\/ReactUpdates.js\nindex 7486e3ac67..d9d6f8cc45 100644\n--- a\/src\/core\/ReactUpdates.js\n+++ b\/src\/core\/ReactUpdates.js\n@@ -136,24 +136,23 @@ function runBatchedUpdates(transaction) {\n dirtyComponents.sort(mountDepthComparator);\n \n for (var i = 0; i < len; i++) {\n- \/\/ If a component is unmounted before pending changes apply, ignore them\n- \/\/ TODO: Queue unmounts in the same list to avoid this happening at all\n+ \/\/ If a component is unmounted before pending changes apply, it will still\n+ \/\/ be here, but we assume that it has cleared its _pendingCallbacks and\n+ \/\/ that performUpdateIfNecessary is a noop.\n var component = dirtyComponents[i];\n- if (component.isMounted()) {\n- \/\/ If performUpdateIfNecessary happens to enqueue any new updates, we\n- \/\/ shouldn't execute the callbacks until the next render happens, so\n- \/\/ stash the callbacks first\n- var callbacks = component._pendingCallbacks;\n- component._pendingCallbacks = null;\n- component.performUpdateIfNecessary(transaction.reconcileTransaction);\n-\n- if (callbacks) {\n- for (var j = 0; j < callbacks.length; j++) {\n- transaction.callbackQueue.enqueue(\n- callbacks[j],\n- component\n- );\n- }\n+ \/\/ If performUpdateIfNecessary happens to enqueue any new updates, we\n+ \/\/ shouldn't execute the callbacks until the next render happens, so\n+ \/\/ stash the callbacks first\n+ var callbacks = component._pendingCallbacks;\n+ component._pendingCallbacks = null;\n+ component.performUpdateIfNecessary(transaction.reconcileTransaction);\n+\n+ if (callbacks) {\n+ for (var j = 0; j < callbacks.length; j++) {\n+ transaction.callbackQueue.enqueue(\n+ callbacks[j],\n+ component\n+ );\n }\n }\n }\ndiff --git a\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js b\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\nindex 214b18d017..8f145924fe 100644\n--- a\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\n+++ b\/src\/core\/__tests__\/ReactComponentLifeCycle-test.js\n@@ -11,12 +11,13 @@\n \n \"use strict\";\n \n+var keyMirror = require('keyMirror');\n+\n var React;\n var ReactTestUtils;\n var ReactComponent;\n var ReactCompositeComponent;\n var ReactInstanceMap;\n-var ComponentLifeCycle;\n var CompositeComponentLifeCycle;\n \n var getCompositeLifeCycle;\n@@ -69,6 +70,21 @@ var POST_WILL_UNMOUNT_STATE = {\n hasWillUnmountCompleted: true\n };\n \n+\/**\n+ * Every React component is in one of these life cycles.\n+ *\/\n+var ComponentLifeCycle = keyMirror({\n+ \/**\n+ * Mounted components have a DOM node representation and are capable of\n+ * receiving new props.\n+ *\/\n+ MOUNTED: null,\n+ \/**\n+ * Unmounted components are inactive and cannot receive new props.\n+ *\/\n+ UNMOUNTED: null\n+});\n+\n \/**\n * TODO: We should make any setState calls fail in\n * `getInitialState` and `componentWillMount`. They will usually fail\n@@ -83,7 +99,6 @@ describe('ReactComponentLifeCycle', function() {\n ReactTestUtils = require('ReactTestUtils');\n ReactComponent = require('ReactComponent');\n ReactCompositeComponent = require('ReactCompositeComponent');\n- ComponentLifeCycle = ReactComponent.LifeCycle;\n CompositeComponentLifeCycle = ReactCompositeComponent.LifeCycle;\n \n ReactInstanceMap = require('ReactInstanceMap');\n@@ -94,13 +109,11 @@ describe('ReactComponentLifeCycle', function() {\n \n getLifeCycleState = function(instance) {\n var internalInstance = ReactInstanceMap.get(instance);\n- if (!internalInstance) {\n- \/\/ Once a component is fully unmounted, we cannot actually get to the\n- \/\/ internal instance. It's already dereferenced and possibly GC:ed.\n- \/\/ So the unmounted life cycle hook doesn't exist anymore.\n- return ComponentLifeCycle.UNMOUNTED;\n- }\n- return internalInstance._lifeCycleState;\n+ \/\/ Once a component gets mounted, it has an internal instance, once it\n+ \/\/ gets unmounted, it loses that internal instance.\n+ return internalInstance ?\n+ ComponentLifeCycle.MOUNTED :\n+ ComponentLifeCycle.UNMOUNTED;\n };\n });\n \ndiff --git a\/src\/core\/__tests__\/ReactElement-test.js b\/src\/core\/__tests__\/ReactElement-test.js\nindex 38772a90e9..1a8f530838 100644\n--- a\/src\/core\/__tests__\/ReactElement-test.js\n+++ b\/src\/core\/__tests__\/ReactElement-test.js\n@@ -173,6 +173,36 @@ describe('ReactElement', function() {\n );\n });\n \n+ it('warns for keys for arrays of elements in rest args', function() {\n+ spyOn(console, 'warn');\n+ var Component = React.createFactory(ComponentClass);\n+\n+ var InnerClass = React.createClass({\n+ displayName: 'InnerClass',\n+ render: function() {\n+ return Component(null, this.props.childSet);\n+ }\n+ });\n+\n+ var InnerComponent = React.createFactory(InnerClass);\n+\n+ var ComponentWrapper = React.createClass({\n+ displayName: 'ComponentWrapper',\n+ render: function() {\n+ return InnerComponent({ childSet: [ Component(), Component() ] });\n+ }\n+ });\n+\n+ ReactTestUtils.renderIntoDocument();\n+\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ expect(console.warn.argsForCall[0][0]).toContain(\n+ 'Each child in an array or iterator should have a unique \"key\" prop. ' +\n+ 'Check the render method of InnerClass. ' +\n+ 'It was passed a child from ComponentWrapper. '\n+ );\n+ });\n+\n it('warns for keys for iterables of elements in rest args', function() {\n spyOn(console, 'warn');\n var Component = React.createFactory(ComponentClass);\ndiff --git a\/src\/core\/__tests__\/ReactUpdates-test.js b\/src\/core\/__tests__\/ReactUpdates-test.js\nindex 5774560007..816ec2e053 100644\n--- a\/src\/core\/__tests__\/ReactUpdates-test.js\n+++ b\/src\/core\/__tests__\/ReactUpdates-test.js\n@@ -815,4 +815,46 @@ describe('ReactUpdates', function() {\n 'asap-1.2'\n ]);\n });\n+\n+ it('does not call render after a component as been deleted', function() {\n+\n+ var renderCount = 0;\n+ var componentB = null;\n+\n+ var B = React.createClass({\n+ getInitialState: function() {\n+ return { updates: 0 };\n+ },\n+ componentDidMount: function() {\n+ componentB = this;\n+ },\n+ render: function() {\n+ renderCount++;\n+ return

;\n+ }\n+ });\n+\n+ var A = React.createClass({\n+ getInitialState: function() {\n+ return { showB: true };\n+ },\n+ render: function() {\n+ return this.state.showB ? :
;\n+ }\n+ });\n+\n+ var container = document.createElement('div');\n+\n+ var component = React.render(, container);\n+\n+ ReactUpdates.batchedUpdates(function() {\n+ \/\/ B will have scheduled an update but the batching should ensure that its\n+ \/\/ update never fires.\n+ componentB.setState({ updates: 1 });\n+ component.setState({ showB: false });\n+ });\n+\n+ expect(renderCount).toBe(1);\n+ });\n+\n });\ndiff --git a\/src\/test\/ReactDefaultPerf.js b\/src\/test\/ReactDefaultPerf.js\nindex ce10bc6a52..d91a61d70e 100644\n--- a\/src\/test\/ReactDefaultPerf.js\n+++ b\/src\/test\/ReactDefaultPerf.js\n@@ -244,7 +244,8 @@ var ReactDefaultPerf = {\n \n entry.displayNames[rootNodeID] = {\n current: this.constructor.displayName,\n- owner: this._owner ? this._owner.constructor.displayName : ''\n+ owner: this._currentElement._owner ?\n+ this._currentElement._owner.constructor.displayName : ''\n };\n \n return rv;\n"}

dillon1000/react

Files changed