{"files":[{"path":"scripts\/fiber\/tests-failing.txt","status":"M"},{"path":"scripts\/fiber\/tests-passing-except-dev.txt","status":"M"},{"path":"scripts\/fiber\/tests-passing.txt","status":"M"},{"path":"src\/renderers\/dom\/fiber\/ReactDOMFiber.js","status":"M"},{"path":"src\/renderers\/dom\/fiber\/ReactDOMFiberComponent.js","status":"M"},{"path":"src\/renderers\/dom\/fiber\/wrappers\/ReactDOMFiberInput.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/ReactEventListener.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js","status":"M"},{"path":"src\/renderers\/dom\/stack\/client\/ReactDOMComponent.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberReconciler.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js","status":"M"},{"path":"src\/renderers\/shared\/shared\/event\/EventPluginHub.js","status":"M"},{"path":"src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactEmptyComponent-test.js","status":"M"},{"path":"src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js","status":"M"},{"path":"src\/test\/ReactTestUtils.js","status":"M"}],"parents":["9da0bf53f78d06c65274fc039a6cfc3bd9d8b424","d71bd59a4e95c28ffa6419c0f9ee497e13857efe"],"patch":"diff --git a\/scripts\/fiber\/tests-failing.txt b\/scripts\/fiber\/tests-failing.txt\nindex eaddb72087..1c87996514 100644\n--- a\/scripts\/fiber\/tests-failing.txt\n+++ b\/scripts\/fiber\/tests-failing.txt\n@@ -24,24 +24,7 @@ src\/renderers\/art\/__tests__\/ReactART-test.js\n * resolves refs before componentDidMount\n * resolves refs before componentDidUpdate\n \n-src\/renderers\/dom\/shared\/__tests__\/ReactBrowserEventEmitter-test.js\n-* should store a listener correctly\n-* should retrieve a listener correctly\n-* should clear all handlers when asked to\n-* should invoke a simple handler registered on a node\n-* should not invoke handlers if ReactBrowserEventEmitter is disabled\n-* should bubble simply\n-* should continue bubbling if an error is thrown\n-* should set currentTarget\n-* should not stopPropagation if false is returned\n-* should have mouse enter simulated by test utils\n-* should infer onTouchTap from a touchStart\/End\n-* should infer onTouchTap from when dragging below threshold\n-* should bubble onTouchTap\n-\n src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n-* should update styles when mutating style object\n-* should warn when mutating style\n * should empty element when removing innerHTML\n * should transition from innerHTML to children in nested el\n * should warn for children on void elements\n@@ -59,31 +42,8 @@ src\/renderers\/dom\/shared\/__tests__\/ReactDOMTextComponent-test.js\n * can reconcile text arbitrarily split into multiple nodes\n * can reconcile text arbitrarily split into multiple nodes on some substitutions only\n \n-src\/renderers\/dom\/shared\/__tests__\/ReactEventIndependence-test.js\n-* does not when event fired on unmounted tree\n-\n src\/renderers\/dom\/shared\/__tests__\/ReactEventListener-test.js\n * should batch between handlers from different roots\n-* should not fire duplicate events for a React DOM tree\n-\n-src\/renderers\/dom\/shared\/eventPlugins\/__tests__\/ChangeEventPlugin-test.js\n-* should not fire change when setting checked programmatically\n-\n-src\/renderers\/dom\/shared\/eventPlugins\/__tests__\/SimpleEventPlugin-test.js\n-* A non-interactive tags clicks bubble when disabled\n-* triggers parent captured click events when target is a child of a disabled elements\n-* should forward clicks when it becomes not disabled\n-* should not forward clicks when it becomes disabled\n-* should work correctly if the listener is changed\n-* should forward clicks when it becomes not disabled\n-* should not forward clicks when it becomes disabled\n-* should work correctly if the listener is changed\n-* should forward clicks when it becomes not disabled\n-* should not forward clicks when it becomes disabled\n-* should work correctly if the listener is changed\n-* should forward clicks when it becomes not disabled\n-* should not forward clicks when it becomes disabled\n-* should work correctly if the listener is changed\n \n src\/renderers\/dom\/shared\/wrappers\/__tests__\/ReactDOMInput-test.js\n * should control a value in reentrant events\n@@ -137,18 +97,13 @@ src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactCompositeComponent-test.js\n * should warn about `setState` in render\n * should warn about `setState` in getChildContext\n * should update refs if shouldComponentUpdate gives false\n-* should support objects with prototypes as state\n \n src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactCompositeComponentNestedState-test.js\n * should provide up to date values for props\n \n src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactEmptyComponent-test.js\n * should still throw when rendering to undefined\n-* should be able to switch between rendering null and a normal tag\n-* should be able to switch in a list of children\n-* should distinguish between a script placeholder and an actual script tag\n * throws when rendering null at the top level\n-* preserves the dom node during updates\n \n src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactMultiChildText-test.js\n * should correctly handle all possible children for render and update\n@@ -159,7 +114,6 @@ src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactStatelessComponent-test.js\n * should warn when using non-React functions in JSX\n \n src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js\n-* should share reconcile transaction across different roots\n * should queue mount-ready handlers across different roots\n * should queue updates from during mount\n * marks top-level updates\n@@ -171,4 +125,5 @@ src\/renderers\/shared\/stack\/reconciler\/__tests__\/refs-test.js\n * Should increase refs with an increase in divs\n \n src\/test\/__tests__\/ReactTestUtils-test.js\n+* traverses children in the correct order\n * should support injected wrapper components as DOM components\ndiff --git a\/scripts\/fiber\/tests-passing-except-dev.txt b\/scripts\/fiber\/tests-passing-except-dev.txt\nindex 247e5287cb..3e077e6251 100644\n--- a\/scripts\/fiber\/tests-passing-except-dev.txt\n+++ b\/scripts\/fiber\/tests-passing-except-dev.txt\n@@ -131,9 +131,15 @@ src\/renderers\/shared\/hooks\/__tests__\/ReactHostOperationHistoryHook-test.js\n * gets recorded for composite roots\n * gets recorded when a native is mounted deeply instead of null\n * gets recorded during mount\n+* gets recorded during an update\n+* gets ignored if the styles are shallowly equal\n * gets recorded during mount\n+* gets recorded during an update\n+* gets recorded as a removal during an update\n * gets recorded during mount\n+* gets recorded during an update\n * gets recorded during mount\n+* gets recorded during an update\n * gets recorded during an update from text content\n * gets recorded during an update from html\n * gets recorded during an update from children\ndiff --git a\/scripts\/fiber\/tests-passing.txt b\/scripts\/fiber\/tests-passing.txt\nindex 3c3452f310..a85f28bc5d 100644\n--- a\/scripts\/fiber\/tests-passing.txt\n+++ b\/scripts\/fiber\/tests-passing.txt\n@@ -534,19 +534,34 @@ src\/renderers\/dom\/shared\/__tests__\/DOMPropertyOperations-test.js\n * should support custom attributes\n \n src\/renderers\/dom\/shared\/__tests__\/ReactBrowserEventEmitter-test.js\n+* should store a listener correctly\n+* should retrieve a listener correctly\n+* should clear all handlers when asked to\n+* should invoke a simple handler registered on a node\n+* should not invoke handlers if ReactBrowserEventEmitter is disabled\n+* should bubble simply\n+* should continue bubbling if an error is thrown\n+* should set currentTarget\n * should support stopPropagation()\n * should stop after first dispatch if stopPropagation\n+* should not stopPropagation if false is returned\n * should invoke handlers that were removed while bubbling\n * should not invoke newly inserted handlers while bubbling\n+* should have mouse enter simulated by test utils\n+* should infer onTouchTap from a touchStart\/End\n+* should infer onTouchTap from when dragging below threshold\n * should not onTouchTap from when dragging beyond threshold\n * should listen to events only once\n * should work with event plugins without dependencies\n * should work with event plugins with dependencies\n+* should bubble onTouchTap\n * should not crash ensureScrollValueMonitoring when createEvent returns null\n \n src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n * should handle className\n * should gracefully handle various style value types\n+* should not update styles when mutating a proxy style object\n+* should throw when mutating style objectsd\n * should not warn for \"0\" as a unitless style value\n * should warn nicely about NaN in style\n * should update styles if initially null\n@@ -625,12 +640,14 @@ src\/renderers\/dom\/shared\/__tests__\/ReactDOMTextComponent-test.js\n src\/renderers\/dom\/shared\/__tests__\/ReactEventIndependence-test.js\n * does not crash with other react inside\n * does not crash with other react outside\n+* does not when event fired on unmounted tree\n \n src\/renderers\/dom\/shared\/__tests__\/ReactEventListener-test.js\n * should dispatch events from outside React tree\n * should propagate events one level down\n * should propagate events two levels down\n * should not get confused by disappearing elements\n+* should not fire duplicate events for a React DOM tree\n \n src\/renderers\/dom\/shared\/__tests__\/escapeTextContentForBrowser-test.js\n * should escape boolean to string\n@@ -672,6 +689,7 @@ src\/renderers\/dom\/shared\/eventPlugins\/__tests__\/ChangeEventPlugin-test.js\n * should fire change for checkbox input\n * should catch setting the value programmatically\n * should not fire change when setting the value programmatically\n+* should not fire change when setting checked programmatically\n * should unmount\n * should only fire change for checked radio button once\n * should deduplicate input value change events\n@@ -696,17 +714,31 @@ src\/renderers\/dom\/shared\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\n \n src\/renderers\/dom\/shared\/eventPlugins\/__tests__\/SimpleEventPlugin-test.js\n * A non-interactive tags click when disabled\n+* A non-interactive tags clicks bubble when disabled\n * does not register a click when clicking a child of a disabled element\n * triggers click events for children of disabled elements\n+* triggers parent captured click events when target is a child of a disabled elements\n * triggers captured click events for children of disabled elements\n * should forward clicks when it starts out not disabled\n * should not forward clicks when it starts out disabled\n+* should forward clicks when it becomes not disabled\n+* should not forward clicks when it becomes disabled\n+* should work correctly if the listener is changed\n * should forward clicks when it starts out not disabled\n * should not forward clicks when it starts out disabled\n+* should forward clicks when it becomes not disabled\n+* should not forward clicks when it becomes disabled\n+* should work correctly if the listener is changed\n * should forward clicks when it starts out not disabled\n * should not forward clicks when it starts out disabled\n+* should forward clicks when it becomes not disabled\n+* should not forward clicks when it becomes disabled\n+* should work correctly if the listener is changed\n * should forward clicks when it starts out not disabled\n * should not forward clicks when it starts out disabled\n+* should forward clicks when it becomes not disabled\n+* should not forward clicks when it becomes disabled\n+* should work correctly if the listener is changed\n * does not add a local click to interactive elements\n * adds a local click listener to non-interactive elements\n \n@@ -1157,12 +1189,6 @@ src\/renderers\/shared\/hooks\/__tests__\/ReactComponentTreeHook-test.native.js\n \n src\/renderers\/shared\/hooks\/__tests__\/ReactHostOperationHistoryHook-test.js\n * gets ignored for composite roots that return null\n-* gets recorded during an update\n-* gets ignored if the styles are shallowly equal\n-* gets recorded during an update\n-* gets recorded as a removal during an update\n-* gets recorded during an update\n-* gets recorded during an update\n * gets ignored if new text is equal\n * gets ignored if new text is equal\n * gets ignored if the type has not changed\n@@ -1271,6 +1297,7 @@ src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactCompositeComponent-test.js\n * should allow access to findDOMNode in componentWillUnmount\n * context should be passed down from the parent\n * should replace state\n+* should support objects with prototypes as state\n * should not warn about unmounting during unmounting\n * should only call componentWillUnmount once\n \n@@ -1285,9 +1312,13 @@ src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactCompositeComponentState-tes\n \n src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactEmptyComponent-test.js\n * should not produce child DOM nodes for null and false\n+* should be able to switch between rendering null and a normal tag\n+* should be able to switch in a list of children\n+* should distinguish between a script placeholder and an actual script tag\n * should have findDOMNode return null when multiple layers of composite components render to the same null placeholder\n * works when switching components\n * does not break when updating during mount\n+* preserves the dom node during updates\n \n src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactErrorBoundaries-test.js\n * does not swallow exceptions on mounting without boundaries\n@@ -1414,6 +1445,7 @@ src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js\n * should update children even if parent blocks updates\n * should not reconcile children passed via props\n * should flow updates correctly\n+* should share reconcile transaction across different roots\n * should flush updates in the correct order\n * should flush updates in the correct order across roots\n * should queue nested updates\n@@ -1523,7 +1555,6 @@ src\/test\/__tests__\/ReactTestUtils-test.js\n * can scryRenderedDOMComponentsWithClass with TextComponent\n * can scryRenderedDOMComponentsWithClass with className contains \\n\n * can scryRenderedDOMComponentsWithClass with multiple classes\n-* traverses children in the correct order\n * should change the value of an input field\n * should change the value of an input field in a component\n * should throw when attempting to use ReactTestUtils.Simulate with shallow rendering\ndiff --git a\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js b\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\nindex 4cc6c2ac91..ffd4a75244 100644\n--- a\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\n+++ b\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\n@@ -104,9 +104,17 @@ var DOMRenderer = ReactFiberReconciler({\n return true;\n },\n \n- commitUpdate(domElement : Instance, oldProps : Props, newProps : Props) : void {\n+ commitUpdate(\n+ domElement : Instance,\n+ oldProps : Props,\n+ newProps : Props,\n+ internalInstanceHandle : Object\n+ ) : void {\n var type = domElement.tagName.toLowerCase(); \/\/ HACK\n var root = document.body; \/\/ HACK\n+ \/\/ Update the internal instance handle so that we know which props are\n+ \/\/ the current ones.\n+ precacheFiberNode(internalInstanceHandle, domElement);\n updateProperties(domElement, type, oldProps, newProps, root);\n },\n \ndiff --git a\/src\/renderers\/dom\/fiber\/ReactDOMFiberComponent.js b\/src\/renderers\/dom\/fiber\/ReactDOMFiberComponent.js\nindex a516224031..7c6ebd9b3c 100644\n--- a\/src\/renderers\/dom\/fiber\/ReactDOMFiberComponent.js\n+++ b\/src\/renderers\/dom\/fiber\/ReactDOMFiberComponent.js\n@@ -552,9 +552,6 @@ var ReactDOMFiberComponent = {\n case 'input':\n ReactDOMFiberInput.mountWrapper(domElement, rawProps);\n props = ReactDOMFiberInput.getHostProps(domElement, rawProps);\n- \/\/ TODO: Make sure we check if this is still unmounted or do any clean\n- \/\/ up necessary since we never stop tracking anymore.\n- inputValueTracking.trackNode((domElement : any));\n trapBubbledEventsLocal(domElement, tag);\n \/\/ For controlled components we always need to ensure we're listening\n \/\/ to onChange. Even if there is no listener.\n@@ -575,7 +572,6 @@ var ReactDOMFiberComponent = {\n case 'textarea':\n ReactDOMFiberTextarea.mountWrapper(domElement, rawProps);\n props = ReactDOMFiberTextarea.getHostProps(domElement, rawProps);\n- inputValueTracking.trackNode((domElement : any));\n trapBubbledEventsLocal(domElement, tag);\n \/\/ For controlled components we always need to ensure we're listening\n \/\/ to onChange. Even if there is no listener.\n@@ -600,12 +596,18 @@ var ReactDOMFiberComponent = {\n \/\/ DOM yet. We need a special effect to handle this.\n switch (tag) {\n case 'input':\n+ \/\/ TODO: Make sure we check if this is still unmounted or do any clean\n+ \/\/ up necessary since we never stop tracking anymore.\n+ inputValueTracking.trackNode((domElement : any));\n ReactDOMFiberInput.postMountWrapper(domElement, rawProps);\n if (props.autoFocus) {\n focusNode(domElement);\n }\n break;\n case 'textarea':\n+ \/\/ TODO: Make sure we check if this is still unmounted or do any clean\n+ \/\/ up necessary since we never stop tracking anymore.\n+ inputValueTracking.trackNode((domElement : any));\n ReactDOMFiberTextarea.postMountWrapper(domElement, rawProps);\n if (props.autoFocus) {\n focusNode(domElement);\ndiff --git a\/src\/renderers\/dom\/fiber\/wrappers\/ReactDOMFiberInput.js b\/src\/renderers\/dom\/fiber\/wrappers\/ReactDOMFiberInput.js\nindex 67e859bd07..8b5b4121ac 100644\n--- a\/src\/renderers\/dom\/fiber\/wrappers\/ReactDOMFiberInput.js\n+++ b\/src\/renderers\/dom\/fiber\/wrappers\/ReactDOMFiberInput.js\n@@ -293,7 +293,6 @@ function updateNamedCousins(rootNode, props) {\n \/\/ That's probably okay; we don't support it just as we don't support\n \/\/ mixing React radio buttons with non-React ones.\n var otherInstance = ReactDOMComponentTree.getInstanceFromNode(otherNode);\n- \/\/ TODO: Ensure that otherInstance is the current Fiber instead of wip.\n invariant(\n otherInstance,\n 'ReactDOMInput: Mixing React and non-React radio inputs with the ' +\ndiff --git a\/src\/renderers\/dom\/shared\/ReactEventListener.js b\/src\/renderers\/dom\/shared\/ReactEventListener.js\nindex 68b8876b76..2856f7de3b 100644\n--- a\/src\/renderers\/dom\/shared\/ReactEventListener.js\n+++ b\/src\/renderers\/dom\/shared\/ReactEventListener.js\n@@ -16,25 +16,38 @@ var ExecutionEnvironment = require('ExecutionEnvironment');\n var PooledClass = require('PooledClass');\n var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactGenericBatching = require('ReactGenericBatching');\n+var ReactTypeOfWork = require('ReactTypeOfWork');\n \n var getEventTarget = require('getEventTarget');\n var getUnboundedScrollPosition = require('getUnboundedScrollPosition');\n \n+var { HostContainer } = ReactTypeOfWork;\n+\n \/**\n * Find the deepest React component completely containing the root of the\n * passed-in instance (for use when entire React trees are nested within each\n * other). If React trees are not nested, returns null.\n *\/\n-function findParent(inst) {\n+function findRootContainerNode(inst) {\n \/\/ TODO: It may be a good idea to cache this to prevent unnecessary DOM\n \/\/ traversal, but caching is difficult to do correctly without using a\n \/\/ mutation observer to listen for all DOM changes.\n- while (inst._hostParent) {\n- inst = inst._hostParent;\n+ if (typeof inst.tag === 'number') {\n+ while (inst.return) {\n+ inst = inst.return;\n+ }\n+ if (inst.tag !== HostContainer) {\n+ \/\/ This can happen if we're in a detached tree.\n+ return null;\n+ }\n+ return inst.stateNode.containerInfo;\n+ } else {\n+ while (inst._hostParent) {\n+ inst = inst._hostParent;\n+ }\n+ var rootNode = ReactDOMComponentTree.getNodeFromInstance(inst);\n+ return rootNode.parentNode;\n }\n- var rootNode = ReactDOMComponentTree.getNodeFromInstance(inst);\n- var container = rootNode.parentNode;\n- return ReactDOMComponentTree.getClosestInstanceFromNode(container);\n }\n \n \/\/ Used to store ancestor hierarchy in top level callback\n@@ -66,8 +79,18 @@ function handleTopLevelImpl(bookKeeping) {\n \/\/ inconsistencies with ReactMount's node cache. See #1105.\n var ancestor = targetInst;\n do {\n+ if (!ancestor) {\n+ bookKeeping.ancestors.push(ancestor);\n+ break;\n+ }\n+ var root = findRootContainerNode(ancestor);\n+ if (!root) {\n+ break;\n+ }\n bookKeeping.ancestors.push(ancestor);\n- ancestor = ancestor && findParent(ancestor);\n+ ancestor = ReactDOMComponentTree.getClosestInstanceFromNode(\n+ root\n+ );\n } while (ancestor);\n \n for (var i = 0; i < bookKeeping.ancestors.length; i++) {\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\nindex c3be319d54..a9fa96b116 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n@@ -72,12 +72,30 @@ describe('ReactDOMComponent', () => {\n expect(stubStyle.fontFamily).toEqual('');\n });\n \n- \/\/ TODO: (poshannessy) deprecate this pattern.\n- it('should update styles when mutating style object', () => {\n- \/\/ not actually used. Just to suppress the style mutation warning\n- spyOn(console, 'error');\n-\n- var styles = {display: 'none', fontFamily: 'Arial', lineHeight: 1.2};\n+ it('should not update styles when mutating a proxy style object', () => {\n+ var styleStore = {display: 'none', fontFamily: 'Arial', lineHeight: 1.2};\n+ \/\/ We use a proxy style object so that we can mutate it even if it is\n+ \/\/ frozen in DEV.\n+ var styles = {\n+ get display() {\n+ return styleStore.display;\n+ },\n+ set display(v) {\n+ styleStore.display = v;\n+ },\n+ get fontFamily() {\n+ return styleStore.fontFamily;\n+ },\n+ set fontFamily(v) {\n+ styleStore.fontFamily = v;\n+ },\n+ get lineHeight() {\n+ return styleStore.lineHeight;\n+ },\n+ set lineHeight(v) {\n+ styleStore.lineHeight = v;\n+ },\n+ };\n var container = document.createElement('div');\n ReactDOM.render(

, container);\n \n@@ -88,23 +106,23 @@ describe('ReactDOMComponent', () => {\n styles.display = 'block';\n \n ReactDOM.render(

, container);\n- expect(stubStyle.display).toEqual('block');\n+ expect(stubStyle.display).toEqual('none');\n expect(stubStyle.fontFamily).toEqual('Arial');\n expect(stubStyle.lineHeight).toEqual('1.2');\n \n styles.fontFamily = 'Helvetica';\n \n ReactDOM.render(

, container);\n- expect(stubStyle.display).toEqual('block');\n- expect(stubStyle.fontFamily).toEqual('Helvetica');\n+ expect(stubStyle.display).toEqual('none');\n+ expect(stubStyle.fontFamily).toEqual('Arial');\n expect(stubStyle.lineHeight).toEqual('1.2');\n \n styles.lineHeight = 0.5;\n \n ReactDOM.render(

, container);\n- expect(stubStyle.display).toEqual('block');\n- expect(stubStyle.fontFamily).toEqual('Helvetica');\n- expect(stubStyle.lineHeight).toEqual('0.5');\n+ expect(stubStyle.display).toEqual('none');\n+ expect(stubStyle.fontFamily).toEqual('Arial');\n+ expect(stubStyle.lineHeight).toEqual('1.2');\n \n ReactDOM.render(

, container);\n expect(stubStyle.display).toBe('');\n@@ -112,9 +130,7 @@ describe('ReactDOMComponent', () => {\n expect(stubStyle.lineHeight).toBe('');\n });\n \n- it('should warn when mutating style', () => {\n- spyOn(console, 'error');\n-\n+ it('should throw when mutating style objectsd', () => {\n var style = {border: '1px solid black'};\n \n class App extends React.Component {\n@@ -125,31 +141,8 @@ describe('ReactDOMComponent', () => {\n }\n }\n \n- var stub = ReactTestUtils.renderIntoDocument();\n- style.position = 'absolute';\n- stub.setState({style: style});\n- expectDev(console.error.calls.count()).toBe(1);\n- expectDev(console.error.calls.argsFor(0)[0]).toEqual(\n- 'Warning: `div` was passed a style object that has previously been ' +\n- 'mutated. Mutating `style` is deprecated. Consider cloning it ' +\n- 'beforehand. Check the `render` of `App`. Previous style: ' +\n- '{border: \"1px solid black\"}. Mutated style: ' +\n- '{border: \"1px solid black\", position: \"absolute\"}.'\n- );\n-\n- style = {background: 'red'};\n- stub = ReactTestUtils.renderIntoDocument();\n- style.background = 'green';\n- stub.setState({style: {background: 'green'}});\n- \/\/ already warned once for the same component and owner\n- expectDev(console.error.calls.count()).toBe(1);\n-\n- style = {background: 'red'};\n- var div = document.createElement('div');\n- ReactDOM.render(, div);\n- style.background = 'blue';\n- ReactDOM.render(, div);\n- expectDev(console.error.calls.count()).toBe(2);\n+ ReactTestUtils.renderIntoDocument();\n+ expectDev(() => style.position = 'absolute').toThrow();\n });\n \n it('should warn for unknown prop', () => {\ndiff --git a\/src\/renderers\/dom\/stack\/client\/ReactDOMComponent.js b\/src\/renderers\/dom\/stack\/client\/ReactDOMComponent.js\nindex cebcc047e8..0992b42f08 100644\n--- a\/src\/renderers\/dom\/stack\/client\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/stack\/client\/ReactDOMComponent.js\n@@ -35,7 +35,6 @@ var emptyFunction = require('emptyFunction');\n var escapeTextContentForBrowser = require('escapeTextContentForBrowser');\n var invariant = require('invariant');\n var isEventSupported = require('isEventSupported');\n-var shallowEqual = require('shallowEqual');\n var inputValueTracking = require('inputValueTracking');\n var validateDOMNesting = require('validateDOMNesting');\n var warning = require('warning');\n@@ -74,69 +73,6 @@ function getDeclarationErrorAddendum(internalInstance) {\n return '';\n }\n \n-function friendlyStringify(obj) {\n- if (typeof obj === 'object') {\n- if (Array.isArray(obj)) {\n- return '[' + obj.map(friendlyStringify).join(', ') + ']';\n- } else {\n- var pairs = [];\n- for (var key in obj) {\n- if (Object.prototype.hasOwnProperty.call(obj, key)) {\n- var keyEscaped = \/^[a-z$_][\\w$_]*$\/i.test(key) ?\n- key :\n- JSON.stringify(key);\n- pairs.push(keyEscaped + ': ' + friendlyStringify(obj[key]));\n- }\n- }\n- return '{' + pairs.join(', ') + '}';\n- }\n- } else if (typeof obj === 'string') {\n- return JSON.stringify(obj);\n- } else if (typeof obj === 'function') {\n- return '[function object]';\n- }\n- \/\/ Differs from JSON.stringify in that undefined because undefined and that\n- \/\/ inf and nan don't become null\n- return String(obj);\n-}\n-\n-var styleMutationWarning = {};\n-\n-function checkAndWarnForMutatedStyle(style1, style2, component) {\n- if (style1 == null || style2 == null) {\n- return;\n- }\n- if (shallowEqual(style1, style2)) {\n- return;\n- }\n-\n- var componentName = component._tag;\n- var owner = component._currentElement._owner;\n- var ownerName;\n- if (owner) {\n- ownerName = owner.getName();\n- }\n-\n- var hash = ownerName + '|' + componentName;\n-\n- if (styleMutationWarning.hasOwnProperty(hash)) {\n- return;\n- }\n-\n- styleMutationWarning[hash] = true;\n-\n- warning(\n- false,\n- '`%s` was passed a style object that has previously been mutated. ' +\n- 'Mutating `style` is deprecated. Consider cloning it beforehand. Check ' +\n- 'the `render` %s. Previous style: %s. Mutated style: %s.',\n- componentName,\n- owner ? 'of `' + ownerName + '`' : 'using <' + componentName + '>',\n- friendlyStringify(style1),\n- friendlyStringify(style2)\n- );\n-}\n-\n \/**\n * @param {object} component\n * @param {?object} props\n@@ -482,8 +418,6 @@ function ReactDOMComponent(element) {\n this._tag = tag.toLowerCase();\n this._namespaceURI = null;\n this._renderedChildren = null;\n- this._previousStyle = null;\n- this._previousStyleCopy = null;\n this._hostNode = null;\n this._hostParent = null;\n this._rootNodeID = 0;\n@@ -763,10 +697,8 @@ ReactDOMComponent.Mixin = {\n if (propKey === STYLE) {\n if (propValue) {\n if (__DEV__) {\n- \/\/ See `_updateDOMProperties`. style block\n- this._previousStyle = propValue;\n+ Object.freeze(propValue);\n }\n- propValue = this._previousStyleCopy = Object.assign({}, props.style);\n }\n propValue = CSSPropertyOperations.createMarkupForStyles(propValue, this);\n }\n@@ -1003,14 +935,13 @@ ReactDOMComponent.Mixin = {\n continue;\n }\n if (propKey === STYLE) {\n- var lastStyle = this._previousStyleCopy;\n+ var lastStyle = lastProps[STYLE];\n for (styleName in lastStyle) {\n if (lastStyle.hasOwnProperty(styleName)) {\n styleUpdates = styleUpdates || {};\n styleUpdates[styleName] = '';\n }\n }\n- this._previousStyleCopy = null;\n } else if (registrationNameModules.hasOwnProperty(propKey)) {\n \/\/ Do nothing for event names.\n } else if (isCustomComponent(this._tag, lastProps)) {\n@@ -1028,9 +959,7 @@ ReactDOMComponent.Mixin = {\n }\n for (propKey in nextProps) {\n var nextProp = nextProps[propKey];\n- var lastProp =\n- propKey === STYLE ? this._previousStyleCopy :\n- lastProps != null ? lastProps[propKey] : undefined;\n+ var lastProp = lastProps != null ? lastProps[propKey] : undefined;\n if (!nextProps.hasOwnProperty(propKey) ||\n nextProp === lastProp ||\n nextProp == null && lastProp == null) {\n@@ -1039,16 +968,8 @@ ReactDOMComponent.Mixin = {\n if (propKey === STYLE) {\n if (nextProp) {\n if (__DEV__) {\n- checkAndWarnForMutatedStyle(\n- this._previousStyleCopy,\n- this._previousStyle,\n- this\n- );\n- this._previousStyle = nextProp;\n+ Object.freeze(nextProp);\n }\n- nextProp = this._previousStyleCopy = Object.assign({}, nextProp);\n- } else {\n- this._previousStyleCopy = null;\n }\n if (lastProp) {\n \/\/ Unset styles on `lastProp` but not on `nextProp`.\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\nindex 6886f5ce2e..be8f661da4 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\n@@ -282,7 +282,7 @@ module.exports = function(\n \/\/ Commit the work prepared earlier.\n const newProps = finishedWork.memoizedProps;\n const oldProps = current.memoizedProps;\n- commitUpdate(instance, oldProps, newProps);\n+ commitUpdate(instance, oldProps, newProps, finishedWork);\n }\n detachRefIfNeeded(current, finishedWork);\n return;\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\nindex b1344c4121..8b13bcdd5b 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n@@ -54,7 +54,7 @@ export type HostConfig = {\n \n createInstance(type : T, props : P, children : HostChildren, internalInstanceHandle : OpaqueNode) : I,\n prepareUpdate(instance : I, oldProps : P, newProps : P) : boolean,\n- commitUpdate(instance : I, oldProps : P, newProps : P) : void,\n+ commitUpdate(instance : I, oldProps : P, newProps : P, internalInstanceHandle : OpaqueNode) : void,\n \n createTextInstance(text : string, internalInstanceHandle : OpaqueNode) : TI,\n commitTextUpdate(textInstance : TI, oldText : string, newText : string) : void,\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js b\/src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js\nindex ff042c2720..e0bddd3907 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js\n@@ -85,6 +85,12 @@ exports.findCurrentHostFiber = function(parent : Fiber) : Fiber | null {\n \n let didTryOtherTree = false;\n \n+ \/\/ If the component doesn't have a child we first check the alternate to see\n+ \/\/ if it has any and if so, if those were just recently inserted.\n+ if (!parent.child && parent.alternate) {\n+ parent = parent.alternate;\n+ }\n+\n \/\/ Next we'll drill down this component to find the first HostComponent\/Text.\n let node : Fiber = parent;\n while (true) {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js b\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\nindex 83d8542f51..784e8b8a6b 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\n@@ -87,19 +87,30 @@ exports.callCallbacks = function(queue : UpdateQueue, context : any) : Error | n\n return firstError;\n };\n \n+function getStateFromNode(node, instance, state, props) {\n+ if (typeof node.partialState === 'function') {\n+ const updateFn = node.partialState;\n+ return updateFn.call(instance, state, props);\n+ } else {\n+ return node.partialState;\n+ }\n+}\n+\n exports.mergeUpdateQueue = function(queue : UpdateQueue, instance : any, prevState : any, props : any) : any {\n let node : ?UpdateQueueNode = queue;\n+ if (queue.isReplace) {\n+ \/\/ replaceState is always first in the queue.\n+ prevState = getStateFromNode(queue, instance, prevState, props);\n+ node = queue.next;\n+ if (!node) {\n+ \/\/ If there is no more work, we replace the raw object instead of cloning.\n+ return prevState;\n+ }\n+ }\n let state = Object.assign({}, prevState);\n while (node) {\n- state = node.isReplace ? null : state;\n- let partialState;\n- if (typeof node.partialState === 'function') {\n- const updateFn = node.partialState;\n- partialState = updateFn.call(instance, state, props);\n- } else {\n- partialState = node.partialState;\n- }\n- state = Object.assign(state || {}, partialState);\n+ let partialState = getStateFromNode(node, instance, state, props);\n+ Object.assign(state, partialState);\n node = node.next;\n }\n return state;\ndiff --git a\/src\/renderers\/shared\/shared\/event\/EventPluginHub.js b\/src\/renderers\/shared\/shared\/event\/EventPluginHub.js\nindex efd13e7169..4023354278 100644\n--- a\/src\/renderers\/shared\/shared\/event\/EventPluginHub.js\n+++ b\/src\/renderers\/shared\/shared\/event\/EventPluginHub.js\n@@ -127,7 +127,10 @@ var EventPluginHub = {\n \/\/ live here; needs to be moved to a better place soon\n if (typeof inst.tag === 'number') {\n \/\/ TODO: This is not safe because we might want the *other* Fiber's\n- \/\/ props depending on which is the current one.\n+ \/\/ props depending on which is the current one. This will usually be the\n+ \/\/ current Fiber but if we're walking up the tree using TreeTraversal for\n+ \/\/ bubbling, we will not be guaranteed to walk up the current tree when\n+ \/\/ a Fiber has been reused.\n const props = inst.memoizedProps;\n listener = props[registrationName];\n if (shouldPreventMouseEvent(registrationName, inst.type, props)) {\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactEmptyComponent-test.js b\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactEmptyComponent-test.js\nindex 21b8f41c94..e75ad783c6 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactEmptyComponent-test.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactEmptyComponent-test.js\n@@ -13,6 +13,7 @@\n \n var React;\n var ReactDOM;\n+var ReactDOMFeatureFlags;\n var ReactTestUtils;\n var TogglingComponent;\n \n@@ -24,6 +25,7 @@ describe('ReactEmptyComponent', () => {\n \n React = require('React');\n ReactDOM = require('ReactDOM');\n+ ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n ReactTestUtils = require('ReactTestUtils');\n \n log = jasmine.createSpy();\n@@ -303,12 +305,20 @@ describe('ReactEmptyComponent', () => {\n \n ReactDOM.render(, container);\n var noscript1 = container.firstChild;\n- expect(noscript1.nodeName).toBe('#comment');\n+ if (ReactDOMFeatureFlags.useFiber) {\n+ expect(noscript1).toBe(null);\n+ } else {\n+ expect(noscript1.nodeName).toBe('#comment');\n+ }\n \n \/\/ This update shouldn't create a DOM node\n ReactDOM.render(, container);\n var noscript2 = container.firstChild;\n- expect(noscript2.nodeName).toBe('#comment');\n+ if (ReactDOMFeatureFlags.useFiber) {\n+ expect(noscript1).toBe(null);\n+ } else {\n+ expect(noscript2.nodeName).toBe('#comment');\n+ }\n \n expect(noscript1).toBe(noscript2);\n });\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js b\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js\nindex 5812ce35c0..97f72a2e2a 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js\n@@ -13,6 +13,7 @@\n \n var React;\n var ReactDOM;\n+var ReactDOMFeatureFlags;\n var ReactTestUtils;\n var ReactUpdates;\n \n@@ -20,6 +21,7 @@ describe('ReactUpdates', () => {\n beforeEach(() => {\n React = require('React');\n ReactDOM = require('ReactDOM');\n+ ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n ReactTestUtils = require('ReactTestUtils');\n ReactUpdates = require('ReactUpdates');\n });\n@@ -506,6 +508,9 @@ describe('ReactUpdates', () => {\n });\n \n it('should share reconcile transaction across different roots', () => {\n+ if (ReactDOMFeatureFlags.useFiber) {\n+ return;\n+ }\n var ReconcileTransaction = ReactUpdates.ReactReconcileTransaction;\n spyOn(ReconcileTransaction, 'getPooled').and.callThrough();\n \ndiff --git a\/src\/test\/ReactTestUtils.js b\/src\/test\/ReactTestUtils.js\nindex 1100759ed7..55ea9eeb74 100644\n--- a\/src\/test\/ReactTestUtils.js\n+++ b\/src\/test\/ReactTestUtils.js\n@@ -22,6 +22,7 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');\n var ReactInstanceMap = require('ReactInstanceMap');\n var ReactTypeOfWork = require('ReactTypeOfWork');\n+var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect');\n var ReactGenericBatching = require('ReactGenericBatching');\n var SyntheticEvent = require('SyntheticEvent');\n var ReactShallowRenderer = require('ReactShallowRenderer');\n@@ -34,9 +35,12 @@ var {\n ClassComponent,\n FunctionalComponent,\n HostComponent,\n- HostContainer,\n HostText,\n } = ReactTypeOfWork;\n+var {\n+ NoEffect,\n+ Placement,\n+} = ReactTypeOfSideEffect;\n \n function Event(suffix) {}\n \n@@ -88,6 +92,12 @@ function findAllInRenderedFiberTreeInternal(fiber, test) {\n ) {\n return [];\n }\n+ if ((fiber.effectTag & Placement) !== NoEffect || !fiber.return) {\n+ \/\/ If any node along the way was deleted, or is an insertion, that means\n+ \/\/ that we're actually in a work in progress to update this component with\n+ \/\/ a different component. We need to look in the \"current\" fiber instead.\n+ return null;\n+ }\n var publicInst = fiber.stateNode;\n var ret = publicInst && test(publicInst) ? [publicInst] : [];\n var child = fiber.child;\n@@ -213,14 +223,20 @@ var ReactTestUtils = {\n var internalInstance = ReactInstanceMap.get(inst);\n if (internalInstance && typeof internalInstance.tag === 'number') {\n var fiber = internalInstance;\n- var root = fiber;\n- while (root.return) {\n- root = root.return;\n+ if (!fiber.child && fiber.alternate) {\n+ \/\/ When we don't have children, we try the alternate first to see if it\n+ \/\/ has any current children first.\n+ fiber = fiber.alternate;\n+ }\n+ var results = findAllInRenderedFiberTreeInternal(fiber, test);\n+ if (results === null) {\n+ \/\/ Null is a sentinel that indicates that this was the wrong fiber.\n+ results = findAllInRenderedFiberTreeInternal(fiber.alternate, test);\n+ if (results === null) {\n+ throw new Error('This should never happen.');\n+ }\n }\n- var isRootCurrent = root.tag === HostContainer && root.stateNode.current === root;\n- \/\/ Make sure we're introspecting the current tree\n- var current = isRootCurrent ? fiber : fiber.alternate;\n- return findAllInRenderedFiberTreeInternal(current, test);\n+ return results;\n } else {\n return findAllInRenderedStackTreeInternal(internalInstance, test);\n }\n","commit":{"revision":"6beb87eb73cb7a5e390c47614b5f796afdfa3f65","authorName":"Sebastian Markbåge","authoredAt":"2016-11-22T16:19:15-08:00","authorEmail":"sebastian@calyptus.eu","shortRevision":"6beb87eb73","subject":"Merge pull request #8365 from sebmarkbage\/fiberdom"},"body":"[Fiber] Fix more tests"}

dillon1000/react

Files changed