\n@@ -532,7 +532,7 @@ describe('ReactComponentTreeDevtool', () => {\n });\n \n describe('update', () => {\n- describe('native component', () => {\n+ describe('host component', () => {\n it('updates text of a single text child', () => {\n var elementBefore =

Hi.<\/div>;\n var treeBefore = {\n@@ -869,7 +869,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates native nodes when reordering with keys', () => {\n+ it('updates host nodes when reordering with keys', () => {\n var elementBefore = (\n

Hi.<\/div>\n@@ -922,7 +922,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates native nodes when reordering without keys', () => {\n+ it('updates host nodes when reordering without keys', () => {\n var elementBefore = (\n

Hi.<\/div>\n@@ -1172,7 +1172,7 @@ describe('ReactComponentTreeDevtool', () => {\n });\n \n describe('functional component', () => {\n- it('updates with a native child', () => {\n+ it('updates with a host child', () => {\n function Foo({ children }) {\n return children;\n }\n@@ -1201,7 +1201,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from null to a native child', () => {\n+ it('updates from null to a host child', () => {\n function Foo({ children }) {\n return children;\n }\n@@ -1227,7 +1227,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a native child to null', () => {\n+ it('updates from a host child to null', () => {\n function Foo({ children }) {\n return children;\n }\n@@ -1253,7 +1253,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a native child to a composite child', () => {\n+ it('updates from a host child to a composite child', () => {\n function Bar() {\n return null;\n }\n@@ -1286,7 +1286,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a composite child to a native child', () => {\n+ it('updates from a composite child to a host child', () => {\n function Bar() {\n return null;\n }\n@@ -1381,7 +1381,7 @@ describe('ReactComponentTreeDevtool', () => {\n });\n \n describe('class component', () => {\n- it('updates with a native child', () => {\n+ it('updates with a host child', () => {\n var Foo = React.createClass({\n render() {\n return this.props.children;\n@@ -1412,7 +1412,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from null to a native child', () => {\n+ it('updates from null to a host child', () => {\n var Foo = React.createClass({\n render() {\n return this.props.children;\n@@ -1440,7 +1440,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a native child to null', () => {\n+ it('updates from a host child to null', () => {\n var Foo = React.createClass({\n render() {\n return this.props.children;\n@@ -1468,7 +1468,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a native child to a composite child', () => {\n+ it('updates from a host child to a composite child', () => {\n var Bar = React.createClass({\n render() {\n return null;\n@@ -1505,7 +1505,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a composite child to a native child', () => {\n+ it('updates from a composite child to a host child', () => {\n var Bar = React.createClass({\n render() {\n return null;\ndiff --git a\/src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.native.js b\/src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.native.js\nindex f3b026b459..6841cbd0c6 100644\n--- a\/src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.native.js\n+++ b\/src\/isomorphic\/devtools\/__tests__\/ReactComponentTreeDevtool-test.native.js\n@@ -300,7 +300,7 @@ describe('ReactComponentTreeDevtool', () => {\n assertTreeMatches([element, tree]);\n });\n \n- it('reports a native tree correctly', () => {\n+ it('reports a host tree correctly', () => {\n var element = (\n \n \n@@ -540,7 +540,7 @@ describe('ReactComponentTreeDevtool', () => {\n });\n \n describe('update', () => {\n- describe('native component', () => {\n+ describe('host component', () => {\n it('updates text of a single text child', () => {\n var elementBefore = Hi.<\/Text>;\n var treeBefore = {\n@@ -792,7 +792,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates native nodes when reordering with keys', () => {\n+ it('updates host nodes when reordering with keys', () => {\n var elementBefore = (\n \n Hi.<\/Text>\n@@ -857,7 +857,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates native nodes when reordering with keys', () => {\n+ it('updates host nodes when reordering with keys', () => {\n var elementBefore = (\n \n Hi.<\/Text>\n@@ -1137,7 +1137,7 @@ describe('ReactComponentTreeDevtool', () => {\n });\n \n describe('functional component', () => {\n- it('updates with a native child', () => {\n+ it('updates with a host child', () => {\n function Foo({ children }) {\n return children;\n }\n@@ -1166,7 +1166,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from null to a native child', () => {\n+ it('updates from null to a host child', () => {\n function Foo({ children }) {\n return children;\n }\n@@ -1192,7 +1192,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a native child to null', () => {\n+ it('updates from a host child to null', () => {\n function Foo({ children }) {\n return children;\n }\n@@ -1218,7 +1218,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a native child to a composite child', () => {\n+ it('updates from a host child to a composite child', () => {\n function Bar() {\n return null;\n }\n@@ -1251,7 +1251,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a composite child to a native child', () => {\n+ it('updates from a composite child to a host child', () => {\n function Bar() {\n return null;\n }\n@@ -1346,7 +1346,7 @@ describe('ReactComponentTreeDevtool', () => {\n });\n \n describe('class component', () => {\n- it('updates with a native child', () => {\n+ it('updates with a host child', () => {\n var Foo = React.createClass({\n render() {\n return this.props.children;\n@@ -1377,7 +1377,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from null to a native child', () => {\n+ it('updates from null to a host child', () => {\n var Foo = React.createClass({\n render() {\n return this.props.children;\n@@ -1405,7 +1405,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a native child to null', () => {\n+ it('updates from a host child to null', () => {\n var Foo = React.createClass({\n render() {\n return this.props.children;\n@@ -1433,7 +1433,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a native child to a composite child', () => {\n+ it('updates from a host child to a composite child', () => {\n var Bar = React.createClass({\n render() {\n return null;\n@@ -1470,7 +1470,7 @@ describe('ReactComponentTreeDevtool', () => {\n ]);\n });\n \n- it('updates from a composite child to a native child', () => {\n+ it('updates from a composite child to a host child', () => {\n var Bar = React.createClass({\n render() {\n return null;\ndiff --git a\/src\/isomorphic\/devtools\/__tests__\/ReactNativeOperationHistoryDevtool-test.js b\/src\/isomorphic\/devtools\/__tests__\/ReactHostOperationHistoryDevtool-test.js\nsimilarity index 90%\nrename from src\/isomorphic\/devtools\/__tests__\/ReactNativeOperationHistoryDevtool-test.js\nrename to src\/isomorphic\/devtools\/__tests__\/ReactHostOperationHistoryDevtool-test.js\nindex 769fe675b1..11638f3eda 100644\n--- a\/src\/isomorphic\/devtools\/__tests__\/ReactNativeOperationHistoryDevtool-test.js\n+++ b\/src\/isomorphic\/devtools\/__tests__\/ReactHostOperationHistoryDevtool-test.js\n@@ -11,12 +11,12 @@\n \n 'use strict';\n \n-describe('ReactNativeOperationHistoryDevtool', () => {\n+describe('ReactHostOperationHistoryDevtool', () => {\n var React;\n var ReactDOM;\n var ReactDOMComponentTree;\n var ReactDOMFeatureFlags;\n- var ReactNativeOperationHistoryDevtool;\n+ var ReactHostOperationHistoryDevtool;\n \n beforeEach(() => {\n jest.resetModuleRegistry();\n@@ -25,18 +25,18 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM = require('ReactDOM');\n ReactDOMComponentTree = require('ReactDOMComponentTree');\n ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n- ReactNativeOperationHistoryDevtool = require('ReactNativeOperationHistoryDevtool');\n+ ReactHostOperationHistoryDevtool = require('ReactHostOperationHistoryDevtool');\n });\n \n function assertHistoryMatches(expectedHistory) {\n- var actualHistory = ReactNativeOperationHistoryDevtool.getHistory();\n+ var actualHistory = ReactHostOperationHistoryDevtool.getHistory();\n expect(actualHistory).toEqual(expectedHistory);\n }\n \n describe('mount', () => {\n- it('gets recorded for native roots', () => {\n+ it('gets recorded for host roots', () => {\n var node = document.createElement('div');\n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

Hi.<\/p><\/div>, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -55,7 +55,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n }\n var node = document.createElement('div');\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -75,7 +75,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n }\n var node = document.createElement('div');\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(, node);\n \n \/\/ Empty DOM components should be invisible to devtools.\n@@ -88,7 +88,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n return element;\n }\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n \n var node = document.createElement('div');\n element = null;\n@@ -112,7 +112,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n it('gets recorded during mount', () => {\n var node = document.createElement('div');\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

{\n ReactDOM.render(

, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

, node);\n ReactDOM.render(

{\n ReactDOM.render(

{\n it('gets recorded during mount', () => {\n var node = document.createElement('div');\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -239,7 +239,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

, node);\n ReactDOM.render(

, node);\n@@ -274,7 +274,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

, node);\n ReactDOM.render(

, node);\n \n@@ -294,7 +294,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n it('gets recorded during mount', () => {\n var node = document.createElement('div');\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -327,7 +327,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

, node);\n ReactDOM.render(

, node);\n@@ -360,7 +360,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n it('gets recorded during mount', () => {\n var node = document.createElement('div');\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(, node);\n \n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n@@ -393,7 +393,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(, node);\n ReactDOM.render(, node);\n ReactDOM.render(, node);\n@@ -430,7 +430,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

Hi.<\/div>, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

Bye.<\/div>, node);\n \n assertHistoryMatches([{\n@@ -445,7 +445,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

Bye.<\/div>, node);\n \n assertHistoryMatches([{\n@@ -460,7 +460,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

<\/div>, node);\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

Bye.<\/div>, node);\n \n assertHistoryMatches([{\n@@ -482,7 +482,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n var node = document.createElement('div');\n ReactDOM.render(

Hi.<\/div>, node);\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

Hi.<\/div>, node);\n \n assertHistoryMatches([]);\n@@ -496,7 +496,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n var inst1 = ReactDOMComponentTree.getInstanceFromNode(node.firstChild.childNodes[0]);\n var inst2 = ReactDOMComponentTree.getInstanceFromNode(node.firstChild.childNodes[3]);\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

{'Bye.'}{43}<\/div>, node);\n \n assertHistoryMatches([{\n@@ -514,7 +514,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n var node = document.createElement('div');\n ReactDOM.render(

{'Hi.'}{42}<\/div>, node);\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(

{'Hi.'}{42}<\/div>, node);\n \n assertHistoryMatches([]);\n@@ -536,7 +536,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n \n element = ;\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(, node);\n \n assertHistoryMatches([{\n@@ -559,7 +559,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n element = null;\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(, node);\n \n assertHistoryMatches([{\n@@ -581,7 +581,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n \n element =

;\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(, node);\n \n assertHistoryMatches([]);\n@@ -594,7 +594,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

,\n node\n@@ -615,7 +615,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n );\n var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(\n

,\n node\n@@ -633,7 +633,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

,\n node\n@@ -661,7 +661,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n node\n );\n \n- ReactNativeOperationHistoryDevtool._preventClearing = true;\n+ ReactHostOperationHistoryDevtool._preventClearing = true;\n ReactDOM.render(\n

,\n node\n@@ -677,7 +677,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

<\/div>, node);\n \n assertHistoryMatches([{\n@@ -694,7 +694,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

<\/div>, node);\n \n assertHistoryMatches([{\n@@ -711,7 +711,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {\n ReactDOM.render(

<\/div>, node);\n \n assertHistoryMatches([{\ndiff --git a\/src\/renderers\/dom\/ReactDOM.js b\/src\/renderers\/dom\/ReactDOM.js\nindex 7e7fbe4639..1619bfd4d4 100644\n--- a\/src\/renderers\/dom\/ReactDOM.js\n+++ b\/src\/renderers\/dom\/ReactDOM.js\n@@ -21,7 +21,7 @@ var ReactUpdates = require('ReactUpdates');\n var ReactVersion = require('ReactVersion');\n \n var findDOMNode = require('findDOMNode');\n-var getNativeComponentFromComposite = require('getNativeComponentFromComposite');\n+var getHostComponentFromComposite = require('getHostComponentFromComposite');\n var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');\n var warning = require('warning');\n \n@@ -51,7 +51,7 @@ if (\n getNodeFromInstance: function(inst) {\n \/\/ inst is an internal instance (but could be a composite)\n if (inst._renderedComponent) {\n- inst = getNativeComponentFromComposite(inst);\n+ inst = getHostComponentFromComposite(inst);\n }\n if (inst) {\n return ReactDOMComponentTree.getNodeFromInstance(inst);\ndiff --git a\/src\/renderers\/dom\/client\/ReactDOMComponentTree.js b\/src\/renderers\/dom\/client\/ReactDOMComponentTree.js\nindex ec95b26c63..4d9b8315c8 100644\n--- a\/src\/renderers\/dom\/client\/ReactDOMComponentTree.js\n+++ b\/src\/renderers\/dom\/client\/ReactDOMComponentTree.js\n@@ -23,13 +23,13 @@ var internalInstanceKey =\n '__reactInternalInstance$' + Math.random().toString(36).slice(2);\n \n \/**\n- * Drill down (through composites and empty components) until we get a native or\n- * native text component.\n+ * Drill down (through composites and empty components) until we get a host or\n+ * host text component.\n *\n * This is pretty polymorphic but unavoidable with the current structure we have\n * for `_renderedChildren`.\n *\/\n-function getRenderedNativeOrTextFromComponent(component) {\n+function getRenderedHostOrTextFromComponent(component) {\n var rendered;\n while ((rendered = component._renderedComponent)) {\n component = rendered;\n@@ -38,25 +38,25 @@ function getRenderedNativeOrTextFromComponent(component) {\n }\n \n \/**\n- * Populate `_nativeNode` on the rendered native\/text component with the given\n+ * Populate `_hostNode` on the rendered host\/text component with the given\n * DOM node. The passed `inst` can be a composite.\n *\/\n function precacheNode(inst, node) {\n- var nativeInst = getRenderedNativeOrTextFromComponent(inst);\n- nativeInst._nativeNode = node;\n- node[internalInstanceKey] = nativeInst;\n+ var hostInst = getRenderedHostOrTextFromComponent(inst);\n+ hostInst._hostNode = node;\n+ node[internalInstanceKey] = hostInst;\n }\n \n function uncacheNode(inst) {\n- var node = inst._nativeNode;\n+ var node = inst._hostNode;\n if (node) {\n delete node[internalInstanceKey];\n- inst._nativeNode = null;\n+ inst._hostNode = null;\n }\n }\n \n \/**\n- * Populate `_nativeNode` on each child of `inst`, assuming that the children\n+ * Populate `_hostNode` on each child of `inst`, assuming that the children\n * match up with the DOM (element) children of `node`.\n *\n * We cache entire levels at once to avoid an n^2 problem where we access the\n@@ -80,7 +80,7 @@ function precacheChildNodes(inst, node) {\n continue;\n }\n var childInst = children[name];\n- var childID = getRenderedNativeOrTextFromComponent(childInst)._domID;\n+ var childID = getRenderedHostOrTextFromComponent(childInst)._domID;\n if (childID == null) {\n \/\/ We're currently unmounting this child in ReactMultiChild; skip it.\n continue;\n@@ -143,7 +143,7 @@ function getClosestInstanceFromNode(node) {\n *\/\n function getInstanceFromNode(node) {\n var inst = getClosestInstanceFromNode(node);\n- if (inst != null && inst._nativeNode === node) {\n+ if (inst != null && inst._hostNode === node) {\n return inst;\n } else {\n return null;\n@@ -158,32 +158,32 @@ function getNodeFromInstance(inst) {\n \/\/ Without this first invariant, passing a non-DOM-component triggers the next\n \/\/ invariant for a missing parent, which is super confusing.\n invariant(\n- inst._nativeNode !== undefined,\n+ inst._hostNode !== undefined,\n 'getNodeFromInstance: Invalid argument.'\n );\n \n- if (inst._nativeNode) {\n- return inst._nativeNode;\n+ if (inst._hostNode) {\n+ return inst._hostNode;\n }\n \n \/\/ Walk up the tree until we find an ancestor whose DOM node we have cached.\n var parents = [];\n- while (!inst._nativeNode) {\n+ while (!inst._hostNode) {\n parents.push(inst);\n invariant(\n- inst._nativeParent,\n+ inst._hostParent,\n 'React DOM tree root should always have a node reference.'\n );\n- inst = inst._nativeParent;\n+ inst = inst._hostParent;\n }\n \n \/\/ Now parents contains each ancestor that does *not* have a cached native\n \/\/ node, and `inst` is the deepest ancestor that does.\n for (; parents.length; inst = parents.pop()) {\n- precacheChildNodes(inst, inst._nativeNode);\n+ precacheChildNodes(inst, inst._hostNode);\n }\n \n- return inst._nativeNode;\n+ return inst._hostNode;\n }\n \n var ReactDOMComponentTree = {\ndiff --git a\/src\/renderers\/dom\/client\/ReactDOMTreeTraversal.js b\/src\/renderers\/dom\/client\/ReactDOMTreeTraversal.js\nindex c4767736bb..9cbc39f3a2 100644\n--- a\/src\/renderers\/dom\/client\/ReactDOMTreeTraversal.js\n+++ b\/src\/renderers\/dom\/client\/ReactDOMTreeTraversal.js\n@@ -18,27 +18,27 @@ var invariant = require('invariant');\n * different trees.\n *\/\n function getLowestCommonAncestor(instA, instB) {\n- invariant('_nativeNode' in instA, 'getNodeFromInstance: Invalid argument.');\n- invariant('_nativeNode' in instB, 'getNodeFromInstance: Invalid argument.');\n+ invariant('_hostNode' in instA, 'getNodeFromInstance: Invalid argument.');\n+ invariant('_hostNode' in instB, 'getNodeFromInstance: Invalid argument.');\n \n var depthA = 0;\n- for (var tempA = instA; tempA; tempA = tempA._nativeParent) {\n+ for (var tempA = instA; tempA; tempA = tempA._hostParent) {\n depthA++;\n }\n var depthB = 0;\n- for (var tempB = instB; tempB; tempB = tempB._nativeParent) {\n+ for (var tempB = instB; tempB; tempB = tempB._hostParent) {\n depthB++;\n }\n \n \/\/ If A is deeper, crawl up.\n while (depthA - depthB > 0) {\n- instA = instA._nativeParent;\n+ instA = instA._hostParent;\n depthA--;\n }\n \n \/\/ If B is deeper, crawl up.\n while (depthB - depthA > 0) {\n- instB = instB._nativeParent;\n+ instB = instB._hostParent;\n depthB--;\n }\n \n@@ -48,8 +48,8 @@ function getLowestCommonAncestor(instA, instB) {\n if (instA === instB) {\n return instA;\n }\n- instA = instA._nativeParent;\n- instB = instB._nativeParent;\n+ instA = instA._hostParent;\n+ instB = instB._hostParent;\n }\n return null;\n }\n@@ -58,14 +58,14 @@ function getLowestCommonAncestor(instA, instB) {\n * Return if A is an ancestor of B.\n *\/\n function isAncestor(instA, instB) {\n- invariant('_nativeNode' in instA, 'isAncestor: Invalid argument.');\n- invariant('_nativeNode' in instB, 'isAncestor: Invalid argument.');\n+ invariant('_hostNode' in instA, 'isAncestor: Invalid argument.');\n+ invariant('_hostNode' in instB, 'isAncestor: Invalid argument.');\n \n while (instB) {\n if (instB === instA) {\n return true;\n }\n- instB = instB._nativeParent;\n+ instB = instB._hostParent;\n }\n return false;\n }\n@@ -74,9 +74,9 @@ function isAncestor(instA, instB) {\n * Return the parent instance of the passed-in instance.\n *\/\n function getParentInstance(inst) {\n- invariant('_nativeNode' in inst, 'getParentInstance: Invalid argument.');\n+ invariant('_hostNode' in inst, 'getParentInstance: Invalid argument.');\n \n- return inst._nativeParent;\n+ return inst._hostParent;\n }\n \n \/**\n@@ -86,7 +86,7 @@ function traverseTwoPhase(inst, fn, arg) {\n var path = [];\n while (inst) {\n path.push(inst);\n- inst = inst._nativeParent;\n+ inst = inst._hostParent;\n }\n var i;\n for (i = path.length; i-- > 0;) {\n@@ -109,12 +109,12 @@ function traverseEnterLeave(from, to, fn, argFrom, argTo) {\n var pathFrom = [];\n while (from && from !== common) {\n pathFrom.push(from);\n- from = from._nativeParent;\n+ from = from._hostParent;\n }\n var pathTo = [];\n while (to && to !== common) {\n pathTo.push(to);\n- to = to._nativeParent;\n+ to = to._hostParent;\n }\n var i;\n for (i = 0; i < pathFrom.length; i++) {\ndiff --git a\/src\/renderers\/dom\/client\/ReactEventListener.js b\/src\/renderers\/dom\/client\/ReactEventListener.js\nindex bbdbbcf291..be78b7c131 100644\n--- a\/src\/renderers\/dom\/client\/ReactEventListener.js\n+++ b\/src\/renderers\/dom\/client\/ReactEventListener.js\n@@ -29,8 +29,8 @@ function findParent(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._nativeParent) {\n- inst = inst._nativeParent;\n+ while (inst._hostParent) {\n+ inst = inst._hostParent;\n }\n var rootNode = ReactDOMComponentTree.getNodeFromInstance(inst);\n var container = rootNode.parentNode;\ndiff --git a\/src\/renderers\/dom\/client\/ReactMount.js b\/src\/renderers\/dom\/client\/ReactMount.js\nindex 6ec60a21fa..4f45156704 100644\n--- a\/src\/renderers\/dom\/client\/ReactMount.js\n+++ b\/src\/renderers\/dom\/client\/ReactMount.js\n@@ -195,23 +195,23 @@ function hasNonRootReactChild(container) {\n var rootEl = getReactRootElementInContainer(container);\n if (rootEl) {\n var inst = ReactDOMComponentTree.getInstanceFromNode(rootEl);\n- return !!(inst && inst._nativeParent);\n+ return !!(inst && inst._hostParent);\n }\n }\n \n-function getNativeRootInstanceInContainer(container) {\n+function getHostRootInstanceInContainer(container) {\n var rootEl = getReactRootElementInContainer(container);\n- var prevNativeInstance =\n+ var prevHostInstance =\n rootEl && ReactDOMComponentTree.getInstanceFromNode(rootEl);\n return (\n- prevNativeInstance && !prevNativeInstance._nativeParent ?\n- prevNativeInstance : null\n+ prevHostInstance && !prevHostInstance._hostParent ?\n+ prevHostInstance : null\n );\n }\n \n function getTopLevelWrapperInContainer(container) {\n- var root = getNativeRootInstanceInContainer(container);\n- return root ? root._nativeContainerInfo._topLevelWrapper : null;\n+ var root = getHostRootInstanceInContainer(container);\n+ return root ? root._hostContainerInfo._topLevelWrapper : null;\n }\n \n \/**\n@@ -701,10 +701,10 @@ var ReactMount = {\n }\n \n if (__DEV__) {\n- var nativeNode = ReactDOMComponentTree.getInstanceFromNode(container.firstChild);\n- if (nativeNode._debugID !== 0) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n- nativeNode._debugID,\n+ var hostNode = ReactDOMComponentTree.getInstanceFromNode(container.firstChild);\n+ if (hostNode._debugID !== 0) {\n+ ReactInstrumentation.debugTool.onHostOperation(\n+ hostNode._debugID,\n 'mount',\n markup.toString()\n );\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/inputValueTracking-test.js b\/src\/renderers\/dom\/client\/__tests__\/inputValueTracking-test.js\nindex b03c04552c..e9f42a1444 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/inputValueTracking-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/inputValueTracking-test.js\n@@ -22,7 +22,7 @@ describe('inputValueTracking', function() {\n input.type = 'text';\n checkbox = document.createElement('input');\n checkbox.type = 'checkbox';\n- mockComponent = { _nativeNode: input, _wrapperState: {} };\n+ mockComponent = { _hostNode: input, _wrapperState: {} };\n });\n \n it('should attach tracker to wrapper state', function() {\n@@ -42,7 +42,7 @@ describe('inputValueTracking', function() {\n });\n \n it('should define `checked` on the instance node', function() {\n- mockComponent._nativeNode = checkbox;\n+ mockComponent._hostNode = checkbox;\n inputValueTracking.track(mockComponent);\n \n expect(checkbox.hasOwnProperty('checked')).toBe(true);\n@@ -59,7 +59,7 @@ describe('inputValueTracking', function() {\n });\n \n it('should initialize with the current `checked`', function() {\n- mockComponent._nativeNode = checkbox;\n+ mockComponent._hostNode = checkbox;\n checkbox.checked = true;\n inputValueTracking.track(mockComponent);\n \n@@ -80,7 +80,7 @@ describe('inputValueTracking', function() {\n });\n \n it('should tracked`checked` changes', function() {\n- mockComponent._nativeNode = checkbox;\n+ mockComponent._hostNode = checkbox;\n checkbox.checked = true;\n inputValueTracking.track(mockComponent);\n \ndiff --git a\/src\/renderers\/dom\/client\/findDOMNode.js b\/src\/renderers\/dom\/client\/findDOMNode.js\nindex 9c2a3b9ea5..238b5938d4 100644\n--- a\/src\/renderers\/dom\/client\/findDOMNode.js\n+++ b\/src\/renderers\/dom\/client\/findDOMNode.js\n@@ -15,7 +15,7 @@ var ReactCurrentOwner = require('ReactCurrentOwner');\n var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactInstanceMap = require('ReactInstanceMap');\n \n-var getNativeComponentFromComposite = require('getNativeComponentFromComposite');\n+var getHostComponentFromComposite = require('getHostComponentFromComposite');\n var invariant = require('invariant');\n var warning = require('warning');\n \n@@ -52,7 +52,7 @@ function findDOMNode(componentOrElement) {\n \n var inst = ReactInstanceMap.get(componentOrElement);\n if (inst) {\n- inst = getNativeComponentFromComposite(inst);\n+ inst = getHostComponentFromComposite(inst);\n return inst ? ReactDOMComponentTree.getNodeFromInstance(inst) : null;\n }\n \ndiff --git a\/src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js b\/src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js\nindex 4f0da4b7cc..a4541646d1 100644\n--- a\/src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js\n+++ b\/src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js\n@@ -23,7 +23,7 @@ var setTextContent = require('setTextContent');\n \n function getNodeAfter(parentNode, node) {\n \/\/ Special case for text components, which return [open, close] comments\n- \/\/ from getNativeNode.\n+ \/\/ from getHostNode.\n if (Array.isArray(node)) {\n node = node[1];\n }\n@@ -123,7 +123,7 @@ function replaceDelimitedText(openingComment, closingComment, stringText) {\n }\n \n if (__DEV__) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n+ ReactInstrumentation.debugTool.onHostOperation(\n ReactDOMComponentTree.getInstanceFromNode(openingComment)._debugID,\n 'replace text',\n stringText\n@@ -136,7 +136,7 @@ if (__DEV__) {\n dangerouslyReplaceNodeWithMarkup = function(oldChild, markup, prevInstance) {\n Danger.dangerouslyReplaceNodeWithMarkup(oldChild, markup);\n if (prevInstance._debugID !== 0) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n+ ReactInstrumentation.debugTool.onHostOperation(\n prevInstance._debugID,\n 'replace with',\n markup.toString()\n@@ -144,7 +144,7 @@ if (__DEV__) {\n } else {\n var nextInstance = ReactDOMComponentTree.getInstanceFromNode(markup.node);\n if (nextInstance._debugID !== 0) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n+ ReactInstrumentation.debugTool.onHostOperation(\n nextInstance._debugID,\n 'mount',\n markup.toString()\n@@ -186,7 +186,7 @@ var DOMChildrenOperations = {\n getNodeAfter(parentNode, update.afterNode)\n );\n if (__DEV__) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n+ ReactInstrumentation.debugTool.onHostOperation(\n parentNodeDebugID,\n 'insert child',\n {toIndex: update.toIndex, content: update.content.toString()}\n@@ -200,7 +200,7 @@ var DOMChildrenOperations = {\n getNodeAfter(parentNode, update.afterNode)\n );\n if (__DEV__) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n+ ReactInstrumentation.debugTool.onHostOperation(\n parentNodeDebugID,\n 'move child',\n {fromIndex: update.fromIndex, toIndex: update.toIndex}\n@@ -213,7 +213,7 @@ var DOMChildrenOperations = {\n update.content\n );\n if (__DEV__) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n+ ReactInstrumentation.debugTool.onHostOperation(\n parentNodeDebugID,\n 'replace children',\n update.content.toString()\n@@ -226,7 +226,7 @@ var DOMChildrenOperations = {\n update.content\n );\n if (__DEV__) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n+ ReactInstrumentation.debugTool.onHostOperation(\n parentNodeDebugID,\n 'replace text',\n update.content.toString()\n@@ -236,7 +236,7 @@ var DOMChildrenOperations = {\n case ReactMultiChildUpdateTypes.REMOVE_NODE:\n removeChild(parentNode, update.fromNode);\n if (__DEV__) {\n- ReactInstrumentation.debugTool.onNativeOperation(\n+ ReactInstrumentation.debugTool.onHostOperation(\n parentNodeDebugID,\n 'remove child',\n {fromIndex: update.fromIndex}\ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/DisabledInputUtils.js b\/src\/renderers\/dom\/client\/wrappers\/DisabledInputUtils.js\nindex 37f8028351..1393a14b4e 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/DisabledInputUtils.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/DisabledInputUtils.js\n@@ -26,24 +26,24 @@ var disableableMouseListenerNames = {\n };\n \n \/**\n- * Implements a native component that does not receive mouse events\n+ * Implements a host component that does not receive mouse events\n * when `disabled` is set.\n *\/\n var DisabledInputUtils = {\n- getNativeProps: function(inst, props) {\n+ getHostProps: function(inst, props) {\n if (!props.disabled) {\n return props;\n }\n \n \/\/ Copy the props, except the mouse listeners\n- var nativeProps = {};\n+ var hostProps = {};\n for (var key in props) {\n if (!disableableMouseListenerNames[key] && props.hasOwnProperty(key)) {\n- nativeProps[key] = props[key];\n+ hostProps[key] = props[key];\n }\n }\n \n- return nativeProps;\n+ return hostProps;\n },\n };\n \ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMButton.js b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMButton.js\nindex 961a1ebebc..09879c9397 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMButton.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMButton.js\n@@ -14,11 +14,11 @@\n var DisabledInputUtils = require('DisabledInputUtils');\n \n \/**\n- * Implements a

dillon1000/react

Files changed