{"files":[{"path":"src\/isomorphic\/modern\/class\/ReactBaseClasses.js","status":"M"},{"path":"src\/renderers\/__tests__\/refs-test.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactChildFiber.js","status":"M"}],"patch":"diff --git a\/src\/isomorphic\/modern\/class\/ReactBaseClasses.js b\/src\/isomorphic\/modern\/class\/ReactBaseClasses.js\nindex 22bc3efd85..506840289e 100644\n--- a\/src\/isomorphic\/modern\/class\/ReactBaseClasses.js\n+++ b\/src\/isomorphic\/modern\/class\/ReactBaseClasses.js\n@@ -14,6 +14,7 @@\n var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');\n \n var canDefineProperty = require('canDefineProperty');\n+var emptyObject = require('emptyObject');\n var invariant = require('invariant');\n var warning = require('warning');\n \n@@ -23,8 +24,7 @@ var warning = require('warning');\n function ReactComponent(props, context, updater) {\n this.props = props;\n this.context = context;\n- \/\/ emptyObject is inlined to help avoid module mocking referential mismatches\n- this.refs = require('emptyObject');\n+ this.refs = emptyObject;\n \/\/ We initialize the default updater but the real one gets injected by the\n \/\/ renderer.\n this.updater = updater || ReactNoopUpdateQueue;\n@@ -133,8 +133,7 @@ function ReactPureComponent(props, context, updater) {\n \/\/ Duplicated from ReactComponent.\n this.props = props;\n this.context = context;\n- \/\/ emptyObject is inlined to help avoid module mocking referential mismatches\n- this.refs = require('emptyObject');\n+ this.refs = emptyObject;\n \/\/ We initialize the default updater but the real one gets injected by the\n \/\/ renderer.\n this.updater = updater || ReactNoopUpdateQueue;\ndiff --git a\/src\/renderers\/__tests__\/refs-test.js b\/src\/renderers\/__tests__\/refs-test.js\nindex 8cf2c5aa7a..d6f132a194 100644\n--- a\/src\/renderers\/__tests__\/refs-test.js\n+++ b\/src\/renderers\/__tests__\/refs-test.js\n@@ -16,78 +16,80 @@ var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n var ReactTestUtils = require('ReactTestUtils');\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+ * 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 Jest might auto mock modules\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+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- return (\n- \n- {children}\n- <\/span>\n- );\n }\n-}\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+ * 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+ );\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- render() {\n- return (\n-

\n-

\n- Reset Me By Clicking This.\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+ <\/GeneralContainerComponent>\n <\/div>\n- \n- \n- <\/GeneralContainerComponent>\n- <\/div>\n- );\n+ );\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@@ -146,11 +148,8 @@ 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\/ReactChildFiber.js b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\nindex 822f1f9b93..79f80c9e40 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n@@ -32,6 +32,7 @@ var ReactFiber = require('ReactFiber');\n var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect');\n var ReactTypeOfWork = require('ReactTypeOfWork');\n \n+var emptyObject = require('emptyObject');\n var getIteratorFn = require('getIteratorFn');\n var invariant = require('invariant');\n var ReactFeatureFlags = require('ReactFeatureFlags');\n@@ -100,8 +101,7 @@ function coerceRef(current: Fiber | null, element: ReactElement) {\n return current.ref;\n }\n const ref = function(value) {\n- \/\/ emptyObject is inlined to help avoid module mocking referential mismatches\n- const refs = inst.refs === require('emptyObject') ? (inst.refs = {}) : inst.refs;\n+ const refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;\n if (value === null) {\n delete refs[stringRef];\n } else {\n","commit":{"authorEmail":"dg@domgan.com","subject":"reverts previous changes to inlining requires and fixes test suite instead","revision":"724ae9b35a287dc183894f60f2750fdb2815684f","authoredAt":"2017-02-23T12:31:58+00:00","authorName":"Dominic Gannaway","shortRevision":"724ae9b35a"},"body":"","parents":["b8cf75a5b43be21224e6b0291baaf30fa261b261"]}

dillon1000/react

Files changed