{"patch":"diff --git a\/scripts\/fiber\/tests-passing.txt b\/scripts\/fiber\/tests-passing.txt\nindex 34f94bffee..82b33be0f6 100644\n--- a\/scripts\/fiber\/tests-passing.txt\n+++ b\/scripts\/fiber\/tests-passing.txt\n@@ -49,6 +49,8 @@ src\/addons\/__tests__\/renderSubtreeIntoContainer-test.js\n * should update context if it changes due to setState\n * should update context if it changes due to re-render\n * should render portal with non-context-provider parent\n+* should get context through non-context-provider parent\n+* should get context through middle non-context-provider layer\n \n src\/addons\/__tests__\/update-test.js\n * pushes\ndiff --git a\/src\/addons\/__tests__\/renderSubtreeIntoContainer-test.js b\/src\/addons\/__tests__\/renderSubtreeIntoContainer-test.js\nindex 7ed20edeea..95db6c2435 100644\n--- a\/src\/addons\/__tests__\/renderSubtreeIntoContainer-test.js\n+++ b\/src\/addons\/__tests__\/renderSubtreeIntoContainer-test.js\n@@ -215,4 +215,86 @@ describe('renderSubtreeIntoContainer', () => {\n expect(portal.firstChild.innerHTML).toBe('hello');\n });\n \n+ it('should get context through non-context-provider parent', () => {\n+ var container = document.createElement('div');\n+ document.body.appendChild(container);\n+ var portal = document.createElement('div');\n+\n+ class Parent extends React.Component {\n+ render() {\n+ return ;\n+ }\n+ getChildContext() {\n+ return {value: this.props.value};\n+ }\n+ static childContextTypes = {\n+ value: React.PropTypes.string.isRequired,\n+ };\n+ }\n+\n+ class Middle extends React.Component {\n+ render() {\n+ return null;\n+ }\n+ componentDidMount() {\n+ renderSubtreeIntoContainer(this, , portal);\n+ }\n+ }\n+\n+ class Child extends React.Component {\n+ static contextTypes = {\n+ value: React.PropTypes.string.isRequired,\n+ };\n+ render() {\n+ return

{this.context.value}<\/div>;\n+ }\n+ }\n+\n+ ReactDOM.render(, container);\n+ expect(portal.textContent).toBe('foo');\n+ });\n+\n+ it('should get context through middle non-context-provider layer', () => {\n+ var container = document.createElement('div');\n+ document.body.appendChild(container);\n+ var portal1 = document.createElement('div');\n+ var portal2 = document.createElement('div');\n+\n+ class Parent extends React.Component {\n+ render() {\n+ return null;\n+ }\n+ getChildContext() {\n+ return {value: this.props.value};\n+ }\n+ componentDidMount() {\n+ renderSubtreeIntoContainer(this, , portal1);\n+ }\n+ static childContextTypes = {\n+ value: React.PropTypes.string.isRequired,\n+ };\n+ }\n+\n+ class Middle extends React.Component {\n+ render() {\n+ return null;\n+ }\n+ componentDidMount() {\n+ renderSubtreeIntoContainer(this, , portal2);\n+ }\n+ }\n+\n+ class Child extends React.Component {\n+ static contextTypes = {\n+ value: React.PropTypes.string.isRequired,\n+ };\n+ render() {\n+ return

{this.context.value}<\/div>;\n+ }\n+ }\n+\n+ ReactDOM.render(, container);\n+ expect(portal2.textContent).toBe('foo');\n+ });\n+\n });\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberContext.js b\/src\/renderers\/shared\/fiber\/ReactFiberContext.js\nindex e18e35e270..6cb171c672 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberContext.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberContext.js\n@@ -22,6 +22,7 @@ var {\n } = require('ReactFiberTreeReflection');\n var {\n ClassComponent,\n+ HostContainer,\n } = require('ReactTypeOfWork');\n \n if (__DEV__) {\n@@ -137,12 +138,14 @@ exports.findCurrentUnmaskedContext = function(fiber: Fiber) : Object {\n 'Expected subtree parent to be a mounted class component'\n );\n \n- let node : ?Fiber = parent;\n- while (node) {\n- if (isContextProvider(fiber)) {\n- return fiber.stateNode.__reactInternalMemoizedMergedChildContext;\n+ let node : Fiber = fiber;\n+ while (node.tag !== HostContainer) {\n+ if (isContextProvider(node)) {\n+ return node.stateNode.__reactInternalMemoizedMergedChildContext;\n }\n- node = node.return;\n+ const parent = node.return;\n+ invariant(parent, 'Found unexpected detached subtree parent');\n+ node = parent;\n }\n- return emptyObject;\n+ return node.stateNode.context;\n };\n","files":[{"status":"M","path":"scripts\/fiber\/tests-passing.txt"},{"status":"M","path":"src\/addons\/__tests__\/renderSubtreeIntoContainer-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberContext.js"}],"commit":{"revision":"492057c76f9afb8e923d054d2a0b42be14a4ccca","authoredAt":"2016-11-28T18:33:46-08:00","authorName":"Ben Alpert","authorEmail":"ben@benalpert.com","shortRevision":"492057c76f","subject":"Fix context getting (#8407)"},"body":"","parents":["a98e8227b88741fec0f0b9c7541beacbe624fcf9"]}

dillon1000/react

Files changed