diff --git a/src/isomorphic/ReactDebugTool.js b/src/isomorphic/ReactDebugTool.js
index f88513b387..63f3251847 100644
--- a/src/isomorphic/ReactDebugTool.js
+++ b/src/isomorphic/ReactDebugTool.js
@@ -50,7 +50,7 @@ var currentTimerType = null;
function clearHistory() {
ReactComponentTreeDevtool.purgeUnmountedComponents();
- ReactNativeOperationHistoryDevtool.clearHistory();
+ ReactHostOperationHistoryDevtool.clearHistory();
}
function getTreeSnapshot(registeredIDs) {
@@ -74,7 +74,7 @@ function resetMeasurements() {
if (__DEV__) {
var previousStartTime = currentFlushStartTime;
var previousMeasurements = currentFlushMeasurements || [];
- var previousOperations = ReactNativeOperationHistoryDevtool.getHistory();
+ var previousOperations = ReactHostOperationHistoryDevtool.getHistory();
if (!isProfiling || currentFlushNesting === 0) {
currentFlushStartTime = null;
@@ -214,9 +214,9 @@ var ReactDebugTool = {
onEndProcessingChildContext() {
emitEvent('onEndProcessingChildContext');
},
- onNativeOperation(debugID, type, payload) {
+ onHostOperation(debugID, type, payload) {
checkDebugID(debugID);
- emitEvent('onNativeOperation', debugID, type, payload);
+ emitEvent('onHostOperation', debugID, type, payload);
},
onSetState() {
emitEvent('onSetState');
@@ -260,11 +260,11 @@ var ReactDebugTool = {
if (__DEV__) {
var ReactInvalidSetStateWarningDevTool = require('ReactInvalidSetStateWarningDevTool');
- var ReactNativeOperationHistoryDevtool = require('ReactNativeOperationHistoryDevtool');
+ var ReactHostOperationHistoryDevtool = require('ReactHostOperationHistoryDevtool');
var ReactComponentTreeDevtool = require('ReactComponentTreeDevtool');
ReactDebugTool.addDevtool(ReactInvalidSetStateWarningDevTool);
ReactDebugTool.addDevtool(ReactComponentTreeDevtool);
- ReactDebugTool.addDevtool(ReactNativeOperationHistoryDevtool);
+ ReactDebugTool.addDevtool(ReactHostOperationHistoryDevtool);
var url = (ExecutionEnvironment.canUseDOM && window.location.href) || '';
if ((/[?&]react_perf\b/).test(url)) {
ReactDebugTool.beginProfiling();
diff --git a/src/isomorphic/ReactPerf.js b/src/isomorphic/ReactPerf.js
index 4c631a7f13..01f1aee388 100644
--- a/src/isomorphic/ReactPerf.js
+++ b/src/isomorphic/ReactPerf.js
@@ -167,7 +167,7 @@ function getWasted(flushHistory = getFlushHistory()) {
var {measurements, treeSnapshot, operations} = flush;
var isDefinitelyNotWastedByID = {};
- // Find native components associated with an operation in this batch.
+ // Find host components associated with an operation in this batch.
// Mark all components in their parent tree as definitely not wasted.
operations.forEach(operation => {
var {instanceID} = operation;
diff --git a/src/isomorphic/classic/class/ReactClass.js b/src/isomorphic/classic/class/ReactClass.js
index fe82510b89..01bd6df587 100644
--- a/src/isomorphic/classic/class/ReactClass.js
+++ b/src/isomorphic/classic/class/ReactClass.js
@@ -55,7 +55,7 @@ var injectedMixins = [];
/**
* Composite components are higher-level components that compose other composite
- * or native components.
+ * or host components.
*
* To create a new type of `ReactClass`, pass a specification of
* your new class to `React.createClass`. The only requirement of your class
diff --git a/src/isomorphic/devtools/ReactNativeOperationHistoryDevtool.js b/src/isomorphic/devtools/ReactHostOperationHistoryDevtool.js
similarity index 69%
rename from src/isomorphic/devtools/ReactNativeOperationHistoryDevtool.js
rename to src/isomorphic/devtools/ReactHostOperationHistoryDevtool.js
index 46b8194465..475f1bace8 100644
--- a/src/isomorphic/devtools/ReactNativeOperationHistoryDevtool.js
+++ b/src/isomorphic/devtools/ReactHostOperationHistoryDevtool.js
@@ -6,15 +6,15 @@
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
- * @providesModule ReactNativeOperationHistoryDevtool
+ * @providesModule ReactHostOperationHistoryDevtool
*/
'use strict';
var history = [];
-var ReactNativeOperationHistoryDevtool = {
- onNativeOperation(debugID, type, payload) {
+var ReactHostOperationHistoryDevtool = {
+ onHostOperation(debugID, type, payload) {
history.push({
instanceID: debugID,
type,
@@ -23,7 +23,7 @@ var ReactNativeOperationHistoryDevtool = {
},
clearHistory() {
- if (ReactNativeOperationHistoryDevtool._preventClearing) {
+ if (ReactHostOperationHistoryDevtool._preventClearing) {
// Should only be used for tests.
return;
}
@@ -36,4 +36,4 @@ var ReactNativeOperationHistoryDevtool = {
},
};
-module.exports = ReactNativeOperationHistoryDevtool;
+module.exports = ReactHostOperationHistoryDevtool;
diff --git a/src/isomorphic/devtools/__tests__/ReactComponentTreeDevtool-test.js b/src/isomorphic/devtools/__tests__/ReactComponentTreeDevtool-test.js
index 1c5cdb7049..a600c79e59 100644
--- a/src/isomorphic/devtools/__tests__/ReactComponentTreeDevtool-test.js
+++ b/src/isomorphic/devtools/__tests__/ReactComponentTreeDevtool-test.js
@@ -289,7 +289,7 @@ describe('ReactComponentTreeDevtool', () => {
assertTreeMatches([element, tree]);
});
- it('reports a native tree correctly', () => {
+ it('reports a host tree correctly', () => {
var element = (
@@ -532,7 +532,7 @@ describe('ReactComponentTreeDevtool', () => {
});
describe('update', () => {
- describe('native component', () => {
+ describe('host component', () => {
it('updates text of a single text child', () => {
var elementBefore =
Hi.
;
var treeBefore = {
@@ -869,7 +869,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates native nodes when reordering with keys', () => {
+ it('updates host nodes when reordering with keys', () => {
var elementBefore = (
Hi.
@@ -922,7 +922,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates native nodes when reordering without keys', () => {
+ it('updates host nodes when reordering without keys', () => {
var elementBefore = (
Hi.
@@ -1172,7 +1172,7 @@ describe('ReactComponentTreeDevtool', () => {
});
describe('functional component', () => {
- it('updates with a native child', () => {
+ it('updates with a host child', () => {
function Foo({ children }) {
return children;
}
@@ -1201,7 +1201,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from null to a native child', () => {
+ it('updates from null to a host child', () => {
function Foo({ children }) {
return children;
}
@@ -1227,7 +1227,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a native child to null', () => {
+ it('updates from a host child to null', () => {
function Foo({ children }) {
return children;
}
@@ -1253,7 +1253,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a native child to a composite child', () => {
+ it('updates from a host child to a composite child', () => {
function Bar() {
return null;
}
@@ -1286,7 +1286,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a composite child to a native child', () => {
+ it('updates from a composite child to a host child', () => {
function Bar() {
return null;
}
@@ -1381,7 +1381,7 @@ describe('ReactComponentTreeDevtool', () => {
});
describe('class component', () => {
- it('updates with a native child', () => {
+ it('updates with a host child', () => {
var Foo = React.createClass({
render() {
return this.props.children;
@@ -1412,7 +1412,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from null to a native child', () => {
+ it('updates from null to a host child', () => {
var Foo = React.createClass({
render() {
return this.props.children;
@@ -1440,7 +1440,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a native child to null', () => {
+ it('updates from a host child to null', () => {
var Foo = React.createClass({
render() {
return this.props.children;
@@ -1468,7 +1468,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a native child to a composite child', () => {
+ it('updates from a host child to a composite child', () => {
var Bar = React.createClass({
render() {
return null;
@@ -1505,7 +1505,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a composite child to a native child', () => {
+ it('updates from a composite child to a host child', () => {
var Bar = React.createClass({
render() {
return null;
diff --git a/src/isomorphic/devtools/__tests__/ReactComponentTreeDevtool-test.native.js b/src/isomorphic/devtools/__tests__/ReactComponentTreeDevtool-test.native.js
index f3b026b459..6841cbd0c6 100644
--- a/src/isomorphic/devtools/__tests__/ReactComponentTreeDevtool-test.native.js
+++ b/src/isomorphic/devtools/__tests__/ReactComponentTreeDevtool-test.native.js
@@ -300,7 +300,7 @@ describe('ReactComponentTreeDevtool', () => {
assertTreeMatches([element, tree]);
});
- it('reports a native tree correctly', () => {
+ it('reports a host tree correctly', () => {
var element = (
@@ -540,7 +540,7 @@ describe('ReactComponentTreeDevtool', () => {
});
describe('update', () => {
- describe('native component', () => {
+ describe('host component', () => {
it('updates text of a single text child', () => {
var elementBefore = Hi.;
var treeBefore = {
@@ -792,7 +792,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates native nodes when reordering with keys', () => {
+ it('updates host nodes when reordering with keys', () => {
var elementBefore = (
Hi.
@@ -857,7 +857,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates native nodes when reordering with keys', () => {
+ it('updates host nodes when reordering with keys', () => {
var elementBefore = (
Hi.
@@ -1137,7 +1137,7 @@ describe('ReactComponentTreeDevtool', () => {
});
describe('functional component', () => {
- it('updates with a native child', () => {
+ it('updates with a host child', () => {
function Foo({ children }) {
return children;
}
@@ -1166,7 +1166,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from null to a native child', () => {
+ it('updates from null to a host child', () => {
function Foo({ children }) {
return children;
}
@@ -1192,7 +1192,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a native child to null', () => {
+ it('updates from a host child to null', () => {
function Foo({ children }) {
return children;
}
@@ -1218,7 +1218,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a native child to a composite child', () => {
+ it('updates from a host child to a composite child', () => {
function Bar() {
return null;
}
@@ -1251,7 +1251,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a composite child to a native child', () => {
+ it('updates from a composite child to a host child', () => {
function Bar() {
return null;
}
@@ -1346,7 +1346,7 @@ describe('ReactComponentTreeDevtool', () => {
});
describe('class component', () => {
- it('updates with a native child', () => {
+ it('updates with a host child', () => {
var Foo = React.createClass({
render() {
return this.props.children;
@@ -1377,7 +1377,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from null to a native child', () => {
+ it('updates from null to a host child', () => {
var Foo = React.createClass({
render() {
return this.props.children;
@@ -1405,7 +1405,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a native child to null', () => {
+ it('updates from a host child to null', () => {
var Foo = React.createClass({
render() {
return this.props.children;
@@ -1433,7 +1433,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a native child to a composite child', () => {
+ it('updates from a host child to a composite child', () => {
var Bar = React.createClass({
render() {
return null;
@@ -1470,7 +1470,7 @@ describe('ReactComponentTreeDevtool', () => {
]);
});
- it('updates from a composite child to a native child', () => {
+ it('updates from a composite child to a host child', () => {
var Bar = React.createClass({
render() {
return null;
diff --git a/src/isomorphic/devtools/__tests__/ReactNativeOperationHistoryDevtool-test.js b/src/isomorphic/devtools/__tests__/ReactHostOperationHistoryDevtool-test.js
similarity index 90%
rename from src/isomorphic/devtools/__tests__/ReactNativeOperationHistoryDevtool-test.js
rename to src/isomorphic/devtools/__tests__/ReactHostOperationHistoryDevtool-test.js
index 769fe675b1..11638f3eda 100644
--- a/src/isomorphic/devtools/__tests__/ReactNativeOperationHistoryDevtool-test.js
+++ b/src/isomorphic/devtools/__tests__/ReactHostOperationHistoryDevtool-test.js
@@ -11,12 +11,12 @@
'use strict';
-describe('ReactNativeOperationHistoryDevtool', () => {
+describe('ReactHostOperationHistoryDevtool', () => {
var React;
var ReactDOM;
var ReactDOMComponentTree;
var ReactDOMFeatureFlags;
- var ReactNativeOperationHistoryDevtool;
+ var ReactHostOperationHistoryDevtool;
beforeEach(() => {
jest.resetModuleRegistry();
@@ -25,18 +25,18 @@ describe('ReactNativeOperationHistoryDevtool', () => {
ReactDOM = require('ReactDOM');
ReactDOMComponentTree = require('ReactDOMComponentTree');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
- ReactNativeOperationHistoryDevtool = require('ReactNativeOperationHistoryDevtool');
+ ReactHostOperationHistoryDevtool = require('ReactHostOperationHistoryDevtool');
});
function assertHistoryMatches(expectedHistory) {
- var actualHistory = ReactNativeOperationHistoryDevtool.getHistory();
+ var actualHistory = ReactHostOperationHistoryDevtool.getHistory();
expect(actualHistory).toEqual(expectedHistory);
}
describe('mount', () => {
- it('gets recorded for native roots', () => {
+ it('gets recorded for host roots', () => {
var node = document.createElement('div');
- ReactNativeOperationHistoryDevtool._preventClearing = true;
+ ReactHostOperationHistoryDevtool._preventClearing = true;
ReactDOM.render(
Hi.
, node);
var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);
@@ -55,7 +55,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {
}
var node = document.createElement('div');
- ReactNativeOperationHistoryDevtool._preventClearing = true;
+ ReactHostOperationHistoryDevtool._preventClearing = true;
ReactDOM.render(, node);
var inst = ReactDOMComponentTree.getInstanceFromNode(node.firstChild);
@@ -75,7 +75,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {
}
var node = document.createElement('div');
- ReactNativeOperationHistoryDevtool._preventClearing = true;
+ ReactHostOperationHistoryDevtool._preventClearing = true;
ReactDOM.render(, node);
// Empty DOM components should be invisible to devtools.
@@ -88,7 +88,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {
return element;
}
- ReactNativeOperationHistoryDevtool._preventClearing = true;
+ ReactHostOperationHistoryDevtool._preventClearing = true;
var node = document.createElement('div');
element = null;
@@ -112,7 +112,7 @@ describe('ReactNativeOperationHistoryDevtool', () => {
it('gets recorded during mount', () => {
var node = document.createElement('div');
- ReactNativeOperationHistoryDevtool._preventClearing = true;
+ ReactHostOperationHistoryDevtool._preventClearing = true;
ReactDOM.render(