{"parents":["a749083b853451eaa6ff8cf55a5187c52f0420c7"],"patch":"diff --git a\/src\/renderers\/__tests__\/refs-test.js b\/src\/renderers\/__tests__\/refs-test.js\nindex 17d6b5a63a..8cf2c5aa7a 100644\n--- a\/src\/renderers\/__tests__\/refs-test.js\n+++ b\/src\/renderers\/__tests__\/refs-test.js\n@@ -16,81 +16,78 @@ var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n var ReactTestUtils = require('ReactTestUtils');\n \n \/**\n- * Render a TestRefsComponent and ensure that the main refs are wired up.\n- * we also define the classes in this function to ensure that they are\n- * wired up properly in accordance to how the test suite might resetModules()\n- * between test runs\n+ * Counts clicks and has a renders an item for each click. Each item rendered\n+ * has a ref of the form \"clickLogN\".\n *\/\n-function renderTestRefsComponent() {\n- \/**\n- * Only purpose is to test that refs are tracked even when applied to a\n- * component that is injected down several layers. Ref systems are difficult to\n- * build in such a way that ownership is maintained in an airtight manner.\n- *\/\n- class GeneralContainerComponent extends React.Component {\n- render() {\n- return

{this.props.children}<\/div>;\n- }\n- }\n-\n- \/**\n- * Counts clicks and has a renders an item for each click. Each item rendered\n- * has a ref of the form \"clickLogN\".\n- *\/\n- class ClickCounter extends React.Component {\n- state = {count: this.props.initialCount};\n-\n- triggerReset = () => {\n- this.setState({count: this.props.initialCount});\n- };\n-\n- handleClick = () => {\n- this.setState({count: this.state.count + 1});\n- };\n-\n- render() {\n- var children = [];\n- var i;\n- for (i = 0; i < this.state.count; i++) {\n- children.push(\n- \n- );\n- }\n- return (\n- \n- {children}\n- <\/span>\n+class ClickCounter extends React.Component {\n+ state = {count: this.props.initialCount};\n+\n+ triggerReset = () => {\n+ this.setState({count: this.props.initialCount});\n+ };\n+\n+ handleClick = () => {\n+ this.setState({count: this.state.count + 1});\n+ };\n+\n+ render() {\n+ var children = [];\n+ var i;\n+ for (i = 0; i < this.state.count; i++) {\n+ children.push(\n+ \n );\n }\n+ return (\n+ \n+ {children}\n+ <\/span>\n+ );\n }\n+}\n \n- \/**\n- * Notice how refs ownership is maintained even when injecting a component\n- * into a different parent.\n- *\/\n- class TestRefsComponent extends React.Component {\n- doReset = () => {\n- this.refs.myCounter.triggerReset();\n- };\n+\/**\n+ * Only purpose is to test that refs are tracked even when applied to a\n+ * component that is injected down several layers. Ref systems are difficult to\n+ * build in such a way that ownership is maintained in an airtight manner.\n+ *\/\n+class GeneralContainerComponent extends React.Component {\n+ render() {\n+ return

{this.props.children}<\/div>;\n+ }\n+}\n \n- render() {\n- return (\n-

\n-

\n- Reset Me By Clicking This.\n- <\/div>\n- \n- \n- <\/GeneralContainerComponent>\n+\/**\n+ * Notice how refs ownership is maintained even when injecting a component\n+ * into a different parent.\n+ *\/\n+class TestRefsComponent extends React.Component {\n+ doReset = () => {\n+ this.refs.myCounter.triggerReset();\n+ };\n+\n+ render() {\n+ return (\n+

\n+

\n+ Reset Me By Clicking This.\n <\/div>\n- );\n- }\n+ \n+ \n+ <\/GeneralContainerComponent>\n+ <\/div>\n+ );\n }\n+}\n \n+\/**\n+ * Render a TestRefsComponent and ensure that the main refs are wired up.\n+ *\/\n+var renderTestRefsComponent = function() {\n var testRefsComponent =\n ReactTestUtils.renderIntoDocument();\n expect(testRefsComponent instanceof TestRefsComponent).toBe(true);\n@@ -149,8 +146,11 @@ describe('reactiverefs', () => {\n expectClickLogsLengthToBe(testRefsComponent, 1);\n \n });\n+\n });\n \n+\n+\n \/**\n * Tests that when a ref hops around children, we can track that correctly.\n *\/\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\nindex 87f3426099..cd47bd488c 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n@@ -291,6 +291,7 @@ module.exports = function(\n \n instance.props = props;\n instance.state = state;\n+ instance.refs = emptyObject;\n instance.context = getMaskedContext(workInProgress, unmaskedContext);\n \n if (typeof instance.componentWillMount === 'function') {\n","body":"","files":[{"status":"M","path":"src\/renderers\/__tests__\/refs-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js"}],"commit":{"subject":"mountClassInstance() now re-assigns instance.refs to emptyObject","revision":"25f4abc9d5f63ae640cb07d4a23d664e9b1880ab","authorName":"Dominic Gannaway","authorEmail":"dg@domgan.com","shortRevision":"25f4abc9d5","authoredAt":"2017-02-23T12:58:37+00:00"}}

dillon1000/react

Files changed