{"parents":["fba8be3b989d87ca6ce61e4899861eed433cfca2","081feeb2dd97ae0854a7d2448232e651c7330344"],"patch":"diff --git a\/src\/browser\/server\/ReactServerRendering.js b\/src\/browser\/server\/ReactServerRendering.js\nindex b0d9e5897f..d29989e0cb 100644\n--- a\/src\/browser\/server\/ReactServerRendering.js\n+++ b\/src\/browser\/server\/ReactServerRendering.js\n@@ -17,14 +17,17 @@ var ReactMarkupChecksum = require('ReactMarkupChecksum');\n var ReactServerRenderingTransaction =\n require('ReactServerRenderingTransaction');\n \n+var emptyObject = require('emptyObject');\n var instantiateReactComponent = require('instantiateReactComponent');\n var invariant = require('invariant');\n \n \/**\n * @param {ReactElement} element\n+ * @param {?object} context\n * @return {string} the HTML markup\n *\/\n-function renderToString(element) {\n+function renderToString(element, context) {\n+ if(context === undefined) context = emptyObject;\n invariant(\n ReactElement.isValidElement(element),\n 'renderToString(): You must pass a valid ReactElement.'\n@@ -37,7 +40,7 @@ function renderToString(element) {\n \n return transaction.perform(function() {\n var componentInstance = instantiateReactComponent(element, null);\n- var markup = componentInstance.mountComponent(id, transaction, 0);\n+ var markup = componentInstance.mountComponent(id, transaction, 0, context);\n return ReactMarkupChecksum.addChecksumToMarkup(markup);\n }, null);\n } finally {\n@@ -47,10 +50,12 @@ function renderToString(element) {\n \n \/**\n * @param {ReactElement} element\n+ * @param {?object} context\n * @return {string} the HTML markup, without the extra React ID and checksum\n * (for generating static pages)\n *\/\n-function renderToStaticMarkup(element) {\n+function renderToStaticMarkup(element, context) {\n+ if(context === undefined) context = emptyObject;\n invariant(\n ReactElement.isValidElement(element),\n 'renderToStaticMarkup(): You must pass a valid ReactElement.'\n@@ -63,7 +68,7 @@ function renderToStaticMarkup(element) {\n \n return transaction.perform(function() {\n var componentInstance = instantiateReactComponent(element, null);\n- return componentInstance.mountComponent(id, transaction, 0);\n+ return componentInstance.mountComponent(id, transaction, 0, context);\n }, null);\n } finally {\n ReactServerRenderingTransaction.release(transaction);\ndiff --git a\/src\/browser\/ui\/ReactDOMComponent.js b\/src\/browser\/ui\/ReactDOMComponent.js\nindex ac932dc90b..88fbbee471 100644\n--- a\/src\/browser\/ui\/ReactDOMComponent.js\n+++ b\/src\/browser\/ui\/ReactDOMComponent.js\n@@ -168,19 +168,21 @@ ReactDOMComponent.Mixin = {\n mountComponent: ReactPerf.measure(\n 'ReactDOMComponent',\n 'mountComponent',\n- function(rootID, transaction, mountDepth) {\n+ function(rootID, transaction, mountDepth, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n ReactComponent.Mixin.mountComponent.call(\n this,\n rootID,\n transaction,\n- mountDepth\n+ mountDepth,\n+ context\n );\n this._previousStyleCopy = null;\n assertValidProps(this._currentElement.props);\n var closeTag = omittedCloseTags[this._tag] ? '' : '<\/' + this._tag + '>';\n return (\n this._createOpenTagMarkupAndPutListeners(transaction) +\n- this._createContentMarkup(transaction) +\n+ this._createContentMarkup(transaction, context) +\n closeTag\n );\n }\n@@ -242,9 +244,10 @@ ReactDOMComponent.Mixin = {\n *\n * @private\n * @param {ReactReconcileTransaction|ReactServerRenderingTransaction} transaction\n+ * @param {object} context\n * @return {string} Content markup.\n *\/\n- _createContentMarkup: function(transaction) {\n+ _createContentMarkup: function(transaction, context) {\n var prefix = '';\n if (this._tag === 'listing' ||\n this._tag === 'pre' ||\n@@ -272,7 +275,8 @@ ReactDOMComponent.Mixin = {\n } else if (childrenToUse != null) {\n var mountImages = this.mountChildren(\n childrenToUse,\n- transaction\n+ transaction,\n+ context\n );\n return prefix + mountImages.join('');\n }\n@@ -280,7 +284,8 @@ ReactDOMComponent.Mixin = {\n return prefix;\n },\n \n- receiveComponent: function(nextElement, transaction) {\n+ receiveComponent: function(nextElement, transaction, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n if (nextElement === this._currentElement &&\n nextElement._owner != null) {\n \/\/ Since elements are immutable after the owner is rendered,\n@@ -295,7 +300,7 @@ ReactDOMComponent.Mixin = {\n \n var prevElement = this._currentElement;\n this._currentElement = nextElement;\n- this.updateComponent(transaction, prevElement, nextElement);\n+ this.updateComponent(transaction, prevElement, nextElement, context);\n },\n \n \/**\n@@ -311,16 +316,19 @@ ReactDOMComponent.Mixin = {\n updateComponent: ReactPerf.measure(\n 'ReactDOMComponent',\n 'updateComponent',\n- function(transaction, prevElement, nextElement) {\n+ function(transaction, prevElement, nextElement, context) {\n+ if(context === undefined) throw new Error(\"Context required for mounting\");\n+ if(context === null) throw new Error(\"Assert: context is not null\");\n assertValidProps(this._currentElement.props);\n ReactComponent.Mixin.updateComponent.call(\n this,\n transaction,\n prevElement,\n- nextElement\n+ nextElement,\n+ context\n );\n this._updateDOMProperties(prevElement.props, transaction);\n- this._updateDOMChildren(prevElement.props, transaction);\n+ this._updateDOMChildren(prevElement.props, transaction, context);\n }\n ),\n \n@@ -428,7 +436,8 @@ ReactDOMComponent.Mixin = {\n * @param {object} lastProps\n * @param {ReactReconcileTransaction} transaction\n *\/\n- _updateDOMChildren: function(lastProps, transaction) {\n+ _updateDOMChildren: function(lastProps, transaction, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n var nextProps = this._currentElement.props;\n \n var lastContent =\n@@ -452,7 +461,7 @@ ReactDOMComponent.Mixin = {\n var lastHasContentOrHtml = lastContent != null || lastHtml != null;\n var nextHasContentOrHtml = nextContent != null || nextHtml != null;\n if (lastChildren != null && nextChildren == null) {\n- this.updateChildren(null, transaction);\n+ this.updateChildren(null, transaction, context);\n } else if (lastHasContentOrHtml && !nextHasContentOrHtml) {\n this.updateTextContent('');\n }\n@@ -469,7 +478,7 @@ ReactDOMComponent.Mixin = {\n );\n }\n } else if (nextChildren != null) {\n- this.updateChildren(nextChildren, transaction);\n+ this.updateChildren(nextChildren, transaction, context);\n }\n },\n \ndiff --git a\/src\/browser\/ui\/ReactDOMTextComponent.js b\/src\/browser\/ui\/ReactDOMTextComponent.js\nindex 00e18fb851..bd2698bf6a 100644\n--- a\/src\/browser\/ui\/ReactDOMTextComponent.js\n+++ b\/src\/browser\/ui\/ReactDOMTextComponent.js\n@@ -66,7 +66,7 @@ assign(ReactDOMTextComponent.prototype, {\n * @return {string} Markup for this text node.\n * @internal\n *\/\n- mountComponent: function(rootID, transaction, mountDepth) {\n+ mountComponent: function(rootID, transaction, mountDepth, context) {\n this._rootNodeID = rootID;\n var escapedText = escapeTextForBrowser(this._stringText);\n \ndiff --git a\/src\/browser\/ui\/ReactMount.js b\/src\/browser\/ui\/ReactMount.js\nindex edd5c0d0d8..41d5538507 100644\n--- a\/src\/browser\/ui\/ReactMount.js\n+++ b\/src\/browser\/ui\/ReactMount.js\n@@ -22,6 +22,7 @@ var ReactMarkupChecksum = require('ReactMarkupChecksum');\n var ReactPerf = require('ReactPerf');\n var ReactUpdates = require('ReactUpdates');\n \n+var emptyObject = require('emptyObject');\n var containsNode = require('containsNode');\n var deprecated = require('deprecated');\n var getReactRootElementInContainer = require('getReactRootElementInContainer');\n@@ -224,7 +225,7 @@ function mountComponentIntoNode(\n container,\n transaction,\n shouldReuseMarkup) {\n- var markup = this.mountComponent(rootID, transaction, 0);\n+ var markup = this.mountComponent(rootID, transaction, 0, emptyObject);\n ReactMount._mountImageIntoNode(markup, container, shouldReuseMarkup);\n }\n \ndiff --git a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\nindex 58216c236e..5427b832ba 100644\n--- a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n@@ -283,7 +283,7 @@ describe('ReactDOMComponent', function() {\n \n genMarkup = function(props) {\n var transaction = new ReactReconcileTransaction();\n- return (new NodeStub(props))._createContentMarkup(transaction);\n+ return (new NodeStub(props))._createContentMarkup(transaction, {});\n };\n \n this.addMatchers({\n@@ -328,7 +328,7 @@ describe('ReactDOMComponent', function() {\n _owner: null,\n _context: null\n });\n- return stubComponent.mountComponent('test', transaction, 0);\n+ return stubComponent.mountComponent('test', transaction, 0, {});\n };\n });\n \ndiff --git a\/src\/browser\/ui\/dom\/__tests__\/Danger-test.js b\/src\/browser\/ui\/dom\/__tests__\/Danger-test.js\nindex 78f7760b7c..1e2e6f02d3 100644\n--- a\/src\/browser\/ui\/dom\/__tests__\/Danger-test.js\n+++ b\/src\/browser\/ui\/dom\/__tests__\/Danger-test.js\n@@ -32,7 +32,7 @@ describe('Danger', function() {\n it('should render markup', function() {\n var markup = instantiateReactComponent(\n

\n- ).mountComponent('.rX', transaction, 0);\n+ ).mountComponent('.rX', transaction, 0, {});\n var output = Danger.dangerouslyRenderMarkup([markup])[0];\n \n expect(output.nodeName).toBe('DIV');\n@@ -44,7 +44,7 @@ describe('Danger', function() {\n ).mountComponent(\n '.rX',\n transaction,\n- 0\n+ 0, {}\n );\n var output = Danger.dangerouslyRenderMarkup([markup])[0];\n \n@@ -55,7 +55,7 @@ describe('Danger', function() {\n it('should render wrapped markup', function() {\n var markup = instantiateReactComponent(\n \n- ).mountComponent('.rX', transaction, 0);\n+ ).mountComponent('.rX', transaction, 0, {});\n var output = Danger.dangerouslyRenderMarkup([markup])[0];\n \n expect(output.nodeName).toBe('TH');\ndiff --git a\/src\/core\/ReactComponent.js b\/src\/core\/ReactComponent.js\nindex 2e2a30e477..1f27a07104 100644\n--- a\/src\/core\/ReactComponent.js\n+++ b\/src\/core\/ReactComponent.js\n@@ -114,7 +114,6 @@ var ReactComponent = {\n \/\/ We keep the old element and a reference to the pending element\n \/\/ to track updates.\n this._currentElement = element;\n-\n this._rootNodeID = null;\n this._mountIndex = 0;\n this._mountDepth = 0;\n@@ -134,7 +133,8 @@ var ReactComponent = {\n * @return {?string} Rendered markup to be inserted into the DOM.\n * @internal\n *\/\n- mountComponent: function(rootID, transaction, mountDepth) {\n+ mountComponent: function(rootID, transaction, mountDepth, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n var ref = this._currentElement.ref;\n if (ref != null) {\n var owner = this._currentElement._owner;\n@@ -173,7 +173,8 @@ var ReactComponent = {\n * @param {object} nextElement\n * @internal\n *\/\n- updateComponent: function(transaction, prevElement, nextElement) {\n+ updateComponent: function(transaction, prevElement, nextElement, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n \/\/ If either the owner or a `ref` has changed, make sure the newest owner\n \/\/ has stored a reference to `this`, and the previous owner (if different)\n \/\/ has forgotten the reference to `this`. We use the element instead\ndiff --git a\/src\/core\/ReactCompositeComponent.js b\/src\/core\/ReactCompositeComponent.js\nindex 1d4c25c9f1..d636ed5505 100644\n--- a\/src\/core\/ReactCompositeComponent.js\n+++ b\/src\/core\/ReactCompositeComponent.js\n@@ -20,10 +20,12 @@ var ReactPerf = require('ReactPerf');\n var ReactPropTypeLocations = require('ReactPropTypeLocations');\n var ReactUpdates = require('ReactUpdates');\n \n+var emptyObject = require('emptyObject');\n var assign = require('Object.assign');\n var emptyObject = require('emptyObject');\n var invariant = require('invariant');\n var keyMirror = require('keyMirror');\n+var monitorCodeUse = require('monitorCodeUse');\n var shouldUpdateReactComponent = require('shouldUpdateReactComponent');\n var warning = require('warning');\n \n@@ -116,6 +118,7 @@ var ReactCompositeComponentMixin = assign({},\n this._instance.refs = emptyObject;\n \n this._pendingElement = null;\n+ this._pendingContext = null;\n this._pendingState = null;\n this._pendingForceUpdate = false;\n this._compositeLifeCycleState = null;\n@@ -125,6 +128,8 @@ var ReactCompositeComponentMixin = assign({},\n \/\/ Children can be either an array or more than one argument\n ReactComponent.Mixin.construct.apply(this, arguments);\n \n+ this._context = null;\n+\n \/\/ See ReactUpdates.\n this._pendingCallbacks = null;\n },\n@@ -152,14 +157,18 @@ var ReactCompositeComponentMixin = assign({},\n mountComponent: ReactPerf.measure(\n 'ReactCompositeComponent',\n 'mountComponent',\n- function(rootID, transaction, mountDepth) {\n+ function(rootID, transaction, mountDepth, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n ReactComponent.Mixin.mountComponent.call(\n this,\n rootID,\n transaction,\n- mountDepth\n+ mountDepth,\n+ context\n );\n \n+ this._context = context;\n+\n var inst = this._instance;\n \n \/\/ Store a reference from the instance back to the internal representation\n@@ -168,6 +177,9 @@ var ReactCompositeComponentMixin = assign({},\n this._compositeLifeCycleState = CompositeLifeCycle.MOUNTING;\n \n inst.context = this._processContext(this._currentElement._context);\n+ if (__DEV__) {\n+ this._warnIfContextsDiffer(this._currentElement._context, context);\n+ }\n inst.props = this._processProps(this._currentElement.props);\n \n var initialState = inst.getInitialState ? inst.getInitialState() : null;\n@@ -211,7 +223,8 @@ var ReactCompositeComponentMixin = assign({},\n var markup = this._renderedComponent.mountComponent(\n rootID,\n transaction,\n- mountDepth + 1\n+ mountDepth + 1,\n+ this._processChildContext(context)\n );\n if (inst.componentDidMount) {\n transaction.getReactMountReady().enqueue(inst.componentDidMount, inst);\n@@ -246,6 +259,8 @@ var ReactCompositeComponentMixin = assign({},\n \n ReactComponent.Mixin.unmountComponent.call(this);\n \n+ this._context = null;\n+\n \/\/ Delete the reference from the instance to this internal representation\n \/\/ which allow the internals to be properly cleaned up even if the user\n \/\/ leaks a reference to the public instance.\n@@ -403,18 +418,17 @@ var ReactCompositeComponentMixin = assign({},\n _processContext: function(context) {\n var maskedContext = null;\n var contextTypes = this._instance.constructor.contextTypes;\n- if (contextTypes) {\n- maskedContext = {};\n- for (var contextName in contextTypes) {\n- maskedContext[contextName] = context[contextName];\n- }\n- if (__DEV__) {\n- this._checkPropTypes(\n- contextTypes,\n- maskedContext,\n- ReactPropTypeLocations.context\n- );\n- }\n+ if (!contextTypes) return emptyObject;\n+ maskedContext = {};\n+ for (var contextName in contextTypes) {\n+ maskedContext[contextName] = context[contextName];\n+ }\n+ if (__DEV__) {\n+ this._checkPropTypes(\n+ contextTypes,\n+ maskedContext,\n+ ReactPropTypeLocations.context\n+ );\n }\n return maskedContext;\n },\n@@ -502,7 +516,8 @@ var ReactCompositeComponentMixin = assign({},\n }\n },\n \n- receiveComponent: function(nextElement, transaction) {\n+ receiveComponent: function(nextElement, transaction, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n if (nextElement === this._currentElement &&\n nextElement._owner != null) {\n \/\/ Since elements are immutable after the owner is rendered,\n@@ -516,6 +531,7 @@ var ReactCompositeComponentMixin = assign({},\n }\n \n this._pendingElement = nextElement;\n+ this._pendingContext = context;\n this.performUpdateIfNecessary(transaction);\n },\n \n@@ -537,6 +553,7 @@ var ReactCompositeComponentMixin = assign({},\n \n if (this._pendingElement == null &&\n this._pendingState == null &&\n+ this._pendingContext == null &&\n !this._pendingForceUpdate) {\n return;\n }\n@@ -548,13 +565,46 @@ var ReactCompositeComponentMixin = assign({},\n this._pendingElement = null;\n }\n \n+ var prevContext = this._context;\n+ var nextContext = prevContext;\n+ if (this._pendingContext != null) {\n+ nextContext = this._pendingContext;\n+ this._pendingContext = null;\n+ }\n+\n this.updateComponent(\n transaction,\n prevElement,\n- nextElement\n+ nextElement,\n+ prevContext,\n+ nextContext\n );\n },\n \n+ \/**\n+ * Compare two contexts, warning if they are different\n+ * TODO: Remove this check when owner-context is removed\n+ *\/\n+ _warnIfContextsDiffer: function(ownerBasedContext, parentBasedContext) {\n+ invariant(ownerBasedContext !== undefined, \"Owner based context is required parameter\");\n+ invariant(parentBasedContext !== undefined, \"Parent based ontext is required parameter\");\n+ var ownerKeys = Object.keys(ownerBasedContext).sort();\n+ var parentKeys = Object.keys(parentBasedContext).sort();\n+ if (ownerKeys.length != parentKeys.length || ownerKeys.toString() != parentKeys.toString()) {\n+ var message = (\"owner based context (keys: \" +\n+ Object.keys(ownerBasedContext) + \") does not equal parent based\" +\n+ \" context (keys: \"+Object.keys(parentBasedContext)+\")\" +\n+ \" while mounting \" +\n+ (this._instance.constructor.displayName || 'ReactCompositeComponent'));\n+ console.warn(message);\n+ monitorCodeUse('contexts_differ', {\n+ ownerBasedKeys: Object.keys(ownerBasedContext),\n+ parentBasedKeys: Object.keys(parentBasedContext),\n+ mounting: (this._instance.constructor.displayName || 'ReactCompositeComponent')\n+ });\n+ }\n+ },\n+\n \/**\n * Perform an update to a mounted component. The componentWillReceiveProps and\n * shouldComponentUpdate methods are called, then (assuming the update isn't\n@@ -573,13 +623,20 @@ var ReactCompositeComponentMixin = assign({},\n updateComponent: ReactPerf.measure(\n 'ReactCompositeComponent',\n 'updateComponent',\n- function(transaction, prevParentElement, nextParentElement) {\n+ function(\n+ transaction,\n+ prevParentElement,\n+ nextParentElement,\n+ prevUnmaskedContext,\n+ nextUnmaskedContext) {\n \/\/ Update refs regardless of what shouldComponentUpdate returns\n ReactComponent.Mixin.updateComponent.call(\n this,\n transaction,\n prevParentElement,\n- nextParentElement\n+ nextParentElement,\n+ prevUnmaskedContext,\n+ nextUnmaskedContext\n );\n \n var inst = this._instance;\n@@ -623,6 +680,7 @@ var ReactCompositeComponentMixin = assign({},\n \/\/ If it's determined that a component should not update, we still want\n \/\/ to set props and state but we shortcut the rest of the update.\n this._currentElement = nextParentElement;\n+ this._context = nextUnmaskedContext;\n inst.props = nextProps;\n inst.state = nextState;\n inst.context = nextContext;\n@@ -636,7 +694,8 @@ var ReactCompositeComponentMixin = assign({},\n nextProps,\n nextState,\n nextContext,\n- transaction\n+ transaction,\n+ nextUnmaskedContext\n );\n }),\n \n@@ -649,6 +708,7 @@ var ReactCompositeComponentMixin = assign({},\n * @param {?object} nextState Next object to set as state.\n * @param {?object} nextContext Next public object to set as context.\n * @param {ReactReconcileTransaction} transaction\n+ * @param {?object} unmaskedContext\n * @private\n *\/\n _performComponentUpdate: function(\n@@ -656,8 +716,11 @@ var ReactCompositeComponentMixin = assign({},\n nextProps,\n nextState,\n nextContext,\n- transaction\n+ transaction,\n+ unmaskedContext\n ) {\n+ invariant(unmaskedContext !== undefined, \"Context required for mounting\");\n+ invariant(unmaskedContext !== null, \"Context must be non-null\");\n var inst = this._instance;\n \n var prevProps = inst.props;\n@@ -669,11 +732,12 @@ var ReactCompositeComponentMixin = assign({},\n }\n \n this._currentElement = nextElement;\n+ this._context = unmaskedContext;\n inst.props = nextProps;\n inst.state = nextState;\n inst.context = nextContext;\n \n- this._updateRenderedComponent(transaction);\n+ this._updateRenderedComponent(transaction, nextContext);\n \n if (inst.componentDidUpdate) {\n transaction.getReactMountReady().enqueue(\n@@ -689,14 +753,16 @@ var ReactCompositeComponentMixin = assign({},\n * @param {ReactReconcileTransaction} transaction\n * @internal\n *\/\n- _updateRenderedComponent: function(transaction) {\n+ _updateRenderedComponent: function(transaction, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n var prevComponentInstance = this._renderedComponent;\n var prevRenderedElement = prevComponentInstance._currentElement;\n var nextRenderedElement = this._renderValidatedComponent();\n if (shouldUpdateReactComponent(prevRenderedElement, nextRenderedElement)) {\n prevComponentInstance.receiveComponent(\n nextRenderedElement,\n- transaction\n+ transaction,\n+ this._processChildContext(context)\n );\n } else {\n \/\/ These two IDs are actually the same! But nothing should rely on that.\n@@ -711,7 +777,8 @@ var ReactCompositeComponentMixin = assign({},\n var nextMarkup = this._renderedComponent.mountComponent(\n thisID,\n transaction,\n- this._mountDepth + 1\n+ this._mountDepth + 1,\n+ context\n );\n ReactComponent.BackendIDOperations.dangerouslyReplaceNodeWithMarkupByID(\n prevComponentID,\n@@ -828,12 +895,13 @@ var ShallowMixin = assign({},\n * @final\n * @internal\n *\/\n- mountComponent: function(rootID, transaction, mountDepth) {\n+ mountComponent: function(rootID, transaction, mountDepth, context) {\n ReactComponent.Mixin.mountComponent.call(\n this,\n rootID,\n transaction,\n- mountDepth\n+ mountDepth,\n+ context\n );\n \n var inst = this._instance;\ndiff --git a\/src\/core\/ReactContext.js b\/src\/core\/ReactContext.js\nindex 67cb0e80b0..fd2b977c80 100644\n--- a\/src\/core\/ReactContext.js\n+++ b\/src\/core\/ReactContext.js\n@@ -12,6 +12,7 @@\n \"use strict\";\n \n var assign = require('Object.assign');\n+var emptyObject = require('emptyObject');\n \n \/**\n * Keeps track of the current context.\n@@ -25,7 +26,7 @@ var ReactContext = {\n * @internal\n * @type {object}\n *\/\n- current: {},\n+ current: emptyObject,\n \n \/**\n * Temporarily extends the current context while executing scopedCallback.\ndiff --git a\/src\/core\/ReactMultiChild.js b\/src\/core\/ReactMultiChild.js\nindex c02e68eab5..11da634fc0 100644\n--- a\/src\/core\/ReactMultiChild.js\n+++ b\/src\/core\/ReactMultiChild.js\n@@ -17,6 +17,7 @@ var ReactMultiChildUpdateTypes = require('ReactMultiChildUpdateTypes');\n \n var flattenChildren = require('flattenChildren');\n var instantiateReactComponent = require('instantiateReactComponent');\n+var invariant = require('invariant');\n var shouldUpdateReactComponent = require('shouldUpdateReactComponent');\n \n \/**\n@@ -178,7 +179,8 @@ var ReactMultiChild = {\n * @return {array} An array of mounted representations.\n * @internal\n *\/\n- mountChildren: function(nestedChildren, transaction) {\n+ mountChildren: function(nestedChildren, transaction, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n var children = flattenChildren(nestedChildren);\n var mountImages = [];\n var index = 0;\n@@ -195,7 +197,8 @@ var ReactMultiChild = {\n var mountImage = childInstance.mountComponent(\n rootID,\n transaction,\n- this._mountDepth + 1\n+ this._mountDepth + 1,\n+ context\n );\n childInstance._mountIndex = index;\n mountImages.push(mountImage);\n@@ -240,11 +243,12 @@ var ReactMultiChild = {\n * @param {ReactReconcileTransaction} transaction\n * @internal\n *\/\n- updateChildren: function(nextNestedChildren, transaction) {\n+ updateChildren: function(nextNestedChildren, transaction, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n updateDepth++;\n var errorThrown = true;\n try {\n- this._updateChildren(nextNestedChildren, transaction);\n+ this._updateChildren(nextNestedChildren, transaction, context);\n errorThrown = false;\n } finally {\n updateDepth--;\n@@ -263,7 +267,8 @@ var ReactMultiChild = {\n * @final\n * @protected\n *\/\n- _updateChildren: function(nextNestedChildren, transaction) {\n+ _updateChildren: function(nextNestedChildren, transaction, context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n var nextChildren = flattenChildren(nextNestedChildren);\n var prevChildren = this._renderedChildren;\n if (!nextChildren && !prevChildren) {\n@@ -284,7 +289,7 @@ var ReactMultiChild = {\n if (shouldUpdateReactComponent(prevElement, nextElement)) {\n this.moveChild(prevChild, nextIndex, lastIndex);\n lastIndex = Math.max(prevChild._mountIndex, lastIndex);\n- prevChild.receiveComponent(nextElement, transaction);\n+ prevChild.receiveComponent(nextElement, transaction, context);\n prevChild._mountIndex = nextIndex;\n } else {\n if (prevChild) {\n@@ -298,7 +303,7 @@ var ReactMultiChild = {\n null\n );\n this._mountChildByNameAtIndex(\n- nextChildInstance, name, nextIndex, transaction\n+ nextChildInstance, name, nextIndex, transaction, context\n );\n }\n nextIndex++;\n@@ -389,13 +394,20 @@ var ReactMultiChild = {\n * @param {ReactReconcileTransaction} transaction\n * @private\n *\/\n- _mountChildByNameAtIndex: function(child, name, index, transaction) {\n+ _mountChildByNameAtIndex: function(\n+ child,\n+ name,\n+ index,\n+ transaction,\n+ context) {\n+ invariant(context !== undefined, \"Context is required parameter\");\n \/\/ Inlined for performance, see `ReactInstanceHandles.createReactID`.\n var rootID = this._rootNodeID + name;\n var mountImage = child.mountComponent(\n rootID,\n transaction,\n- this._mountDepth + 1\n+ this._mountDepth + 1,\n+ context\n );\n child._mountIndex = index;\n this.createChild(child, mountImage);\ndiff --git a\/src\/core\/ReactUpdates.js b\/src\/core\/ReactUpdates.js\nindex d9d6f8cc45..f57353731d 100644\n--- a\/src\/core\/ReactUpdates.js\n+++ b\/src\/core\/ReactUpdates.js\n@@ -140,6 +140,7 @@ function runBatchedUpdates(transaction) {\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+\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\ndiff --git a\/src\/core\/__tests__\/ReactCompositeComponent-test.js b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\nindex 9c4a4c0722..1510af6011 100644\n--- a\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n@@ -961,6 +961,29 @@ describe('ReactCompositeComponent', function() {\n reactComponentExpect(grandchildInstance).scalarContextEqual({foo: 'bar', depth: 1});\n });\n \n+ it('warn if contexts differ', function() {\n+ var Component = React.createClass({\n+ contextTypes: {\n+ foo: ReactPropTypes.string.isRequired\n+ },\n+\n+ render: function() {\n+ return

;\n+ }\n+ });\n+\n+ React.withContext({foo: 'bar'}, function() {\n+ ReactTestUtils.renderIntoDocument();\n+ });\n+\n+ expect(console.warn.mock.calls.length).toBe(2);\n+ expect(console.warn.mock.calls[1][0]).toBe(\n+ 'owner based context (keys: foo) does not equal parent based ' +\n+ 'context (keys: ) while mounting ReactCompositeComponent'\n+ );\n+\n+ });\n+\n it('should check context types', function() {\n var Component = React.createClass({\n contextTypes: {\n@@ -979,21 +1002,50 @@ describe('ReactCompositeComponent', function() {\n 'Warning: Required context `foo` was not specified in `Component`.'\n );\n \n- React.withContext({foo: 'bar'}, function() {\n- ReactTestUtils.renderIntoDocument();\n+ var ComponentInFooStringContext = React.createClass({\n+ childContextTypes: {\n+ foo: ReactPropTypes.string\n+ },\n+\n+ getChildContext: function() {\n+ return {\n+ foo: this.props.fooValue\n+ };\n+ },\n+\n+ render: function() {\n+ return ;\n+ }\n });\n \n+ ReactTestUtils.renderIntoDocument();\n+\n \/\/ Previous call should not error\n expect(console.warn.mock.calls.length).toBe(1);\n \n- React.withContext({foo: 123}, function() {\n- ReactTestUtils.renderIntoDocument();\n+ var ComponentInFooNumberContext = React.createClass({\n+ childContextTypes: {\n+ foo: ReactPropTypes.number\n+ },\n+\n+ getChildContext: function() {\n+ return {\n+ foo: this.props.fooValue\n+ };\n+ },\n+\n+ render: function() {\n+ return ;\n+ }\n });\n \n+ ReactTestUtils.renderIntoDocument();\n+\n expect(console.warn.mock.calls.length).toBe(2);\n expect(console.warn.mock.calls[1][0]).toBe(\n 'Warning: Invalid context `foo` of type `number` supplied ' +\n- 'to `Component`, expected `string`.'\n+ 'to `Component`, expected `string`.' +\n+ ' Check the render method of `ComponentInFooNumberContext`.'\n );\n });\n \n@@ -1014,16 +1066,18 @@ describe('ReactCompositeComponent', function() {\n });\n \n ReactTestUtils.renderIntoDocument();\n-\n- expect(console.warn.mock.calls.length).toBe(1);\n+ expect(console.warn.mock.calls.length).toBe(2);\n expect(console.warn.mock.calls[0][0]).toBe(\n 'Warning: Required child context `foo` was not specified in `Component`.'\n );\n+ expect(console.warn.mock.calls[1][0]).toBe(\n+ 'Warning: Required child context `foo` was not specified in `Component`.'\n+ );\n \n ReactTestUtils.renderIntoDocument();\n \n- expect(console.warn.mock.calls.length).toBe(2);\n- expect(console.warn.mock.calls[1][0]).toBe(\n+ expect(console.warn.mock.calls.length).toBe(4);\n+ expect(console.warn.mock.calls[3][0]).toBe(\n 'Warning: Invalid child context `foo` of type `number` ' +\n 'supplied to `Component`, expected `string`.'\n );\n@@ -1037,7 +1091,7 @@ describe('ReactCompositeComponent', function() {\n );\n \n \/\/ Previous calls should not log errors\n- expect(console.warn.mock.calls.length).toBe(2);\n+ expect(console.warn.mock.calls.length).toBe(4);\n });\n \n it('should filter out context not in contextTypes', function() {\n@@ -1051,11 +1105,26 @@ describe('ReactCompositeComponent', function() {\n }\n });\n \n- var instance = React.withContext({foo: 'abc', bar: 123}, function() {\n- return ;\n+ var ComponentInFooBarContext = React.createClass({\n+ childContextTypes: {\n+ foo: ReactPropTypes.string,\n+ bar: ReactPropTypes.number\n+ },\n+\n+ getChildContext: function() {\n+ return {\n+ foo: 'abc',\n+ bar: 123\n+ };\n+ },\n+\n+ render: function() {\n+ return ;\n+ }\n });\n- instance = ReactTestUtils.renderIntoDocument(instance);\n- reactComponentExpect(instance).scalarContextEqual({foo: 'abc'});\n+\n+ var instance = ReactTestUtils.renderIntoDocument();\n+ reactComponentExpect(instance).expectRenderedChild().scalarContextEqual({foo: 'abc'});\n });\n \n it('should filter context properly in callbacks', function() {\ndiff --git a\/src\/core\/__tests__\/ReactElement-test.js b\/src\/core\/__tests__\/ReactElement-test.js\nindex 1a8f530838..c4c348fff1 100644\n--- a\/src\/core\/__tests__\/ReactElement-test.js\n+++ b\/src\/core\/__tests__\/ReactElement-test.js\n@@ -81,7 +81,7 @@ describe('ReactElement', function() {\n expect(element.props).toEqual({foo:'56'});\n });\n \n- it('preserves the context on the element', function() {\n+ it('preserves the legacy context on the element', function() {\n var Component = React.createFactory(ComponentClass);\n var element;\n \n@@ -108,12 +108,6 @@ describe('ReactElement', function() {\n var element;\n \n var Wrapper = React.createClass({\n- childContextTypes: {\n- foo: React.PropTypes.string\n- },\n- getChildContext: function() {\n- return { foo: 'bar' };\n- },\n render: function() {\n element = Component();\n return element;\ndiff --git a\/src\/test\/ReactTestUtils.js b\/src\/test\/ReactTestUtils.js\nindex d1069f7dd5..9b148d188f 100644\n--- a\/src\/test\/ReactTestUtils.js\n+++ b\/src\/test\/ReactTestUtils.js\n@@ -328,23 +328,23 @@ assign(\n ReactCompositeComponent.ShallowMixin\n );\n \n-ReactShallowRenderer.prototype.render = function(element) {\n+ReactShallowRenderer.prototype.render = function(element, context) {\n var transaction = ReactUpdates.ReactReconcileTransaction.getPooled();\n- this._render(element, transaction);\n+ this._render(element, transaction, context);\n ReactUpdates.ReactReconcileTransaction.release(transaction);\n };\n \n-ReactShallowRenderer.prototype._render = function(element, transaction) {\n+ReactShallowRenderer.prototype._render = function(element, transaction, context) {\n if (!this._instance) {\n var rootID = ReactInstanceHandles.createReactRootID();\n var instance = new ShallowComponentWrapper(new element.type(element.props));\n instance.construct(element);\n \n- instance.mountComponent(rootID, transaction, 0);\n+ instance.mountComponent(rootID, transaction, 0, context);\n \n this._instance = instance;\n } else {\n- this._instance.receiveComponent(element, transaction);\n+ this._instance.receiveComponent(element, transaction, context);\n }\n };\n \ndiff --git a\/src\/test\/__tests__\/ReactTestUtils-test.js b\/src\/test\/__tests__\/ReactTestUtils-test.js\nindex a68ffbf265..0026a4efe2 100644\n--- a\/src\/test\/__tests__\/ReactTestUtils-test.js\n+++ b\/src\/test\/__tests__\/ReactTestUtils-test.js\n@@ -46,7 +46,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render();\n+ shallowRenderer.render(, {});\n \n var result = shallowRenderer.getRenderOutput();\n \n@@ -91,7 +91,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render();\n+ shallowRenderer.render(, {});\n var result = shallowRenderer.getRenderOutput();\n expect(result.type).toBe('div');\n expect(result.props.children).toEqual([\n@@ -99,7 +99,7 @@ describe('ReactTestUtils', function() {\n \n ]);\n \n- shallowRenderer.render();\n+ shallowRenderer.render(, {});\n var updatedResult = shallowRenderer.getRenderOutput();\n expect(updatedResult.type).toBe('a');\n \n","commit":{"shortRevision":"89aaf73ae8","authorEmail":"jsproch@fb.com","authorName":"Jim","authoredAt":"2014-11-17T17:08:18-08:00","subject":"Merge pull request #2509 from jsfb\/use-parent-context","revision":"89aaf73ae8802af3c83651a1b1db92bd48c2c156"},"body":"Initial implementation of issue #2112","files":[{"path":"src\/browser\/server\/ReactServerRendering.js","status":"M"},{"path":"src\/browser\/ui\/ReactDOMComponent.js","status":"M"},{"path":"src\/browser\/ui\/ReactDOMTextComponent.js","status":"M"},{"path":"src\/browser\/ui\/ReactMount.js","status":"M"},{"path":"src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js","status":"M"},{"path":"src\/browser\/ui\/dom\/__tests__\/Danger-test.js","status":"M"},{"path":"src\/core\/ReactComponent.js","status":"M"},{"path":"src\/core\/ReactCompositeComponent.js","status":"M"},{"path":"src\/core\/ReactContext.js","status":"M"},{"path":"src\/core\/ReactMultiChild.js","status":"M"},{"path":"src\/core\/ReactUpdates.js","status":"M"},{"path":"src\/core\/__tests__\/ReactCompositeComponent-test.js","status":"M"},{"path":"src\/core\/__tests__\/ReactElement-test.js","status":"M"},{"path":"src\/test\/ReactTestUtils.js","status":"M"},{"path":"src\/test\/__tests__\/ReactTestUtils-test.js","status":"M"}]}

dillon1000/react

Files changed