-
- 
- React Sandbox (v{React.version})
-
-
-
-
- React Sandbox (v{React.version})
-
-
-
-
-
-
- Please select a test fixture.
; - } - }, -}); - -module.exports = FixturesPage; diff --git a/fixtures/dom/src/components/fixtures/number-inputs/NumberInputDecimal.js b/fixtures/dom/src/components/fixtures/number-inputs/NumberInputDecimal.js new file mode 100644 index 0000000000..552deb04d7 --- /dev/null +++ b/fixtures/dom/src/components/fixtures/number-inputs/NumberInputDecimal.js @@ -0,0 +1,33 @@ +const React = window.React; + +import Fixture from '../../Fixture'; + +class NumberInputDecimal extends React.Component { + state = { value: '.98' }; + changeValue = () => { + this.setState({ + value: '0.98', + }); + } + render() { + const {value} = this.state; + return ( +{this.props.children}
+
+
+ {
+ this.setState({value: e.target.value});
+ }}
+ />
+
+
+ {this.props.children}
-
-
-
-
-
-
- - Notes: Chrome and Safari clear trailing - decimals on blur. React makes this concession so that the - value attribute remains in sync with the value property. -
-{oldEl}
, container)).toThrowError(
'Objects are not valid as a React child (found: object with keys ' +
- '{_isReactElement, type, props}). It looks like you\'re using an ' +
- 'element created by a different version of React. Make sure to use ' +
- 'only one copy of React.'
+ "{_isReactElement, type, props}). It looks like you're using an " +
+ 'element created by a different version of React. Make sure to use ' +
+ 'only one copy of React.',
);
});
@@ -77,7 +76,7 @@ describe('ReactFragment', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toContain(
- 'Child objects should have non-numeric keys so ordering is preserved.'
+ 'Child objects should have non-numeric keys so ordering is preserved.',
);
});
@@ -86,7 +85,7 @@ describe('ReactFragment', () => {
ReactFragment.create(null);
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toContain(
- 'React.addons.createFragment only accepts a single object.'
+ 'React.addons.createFragment only accepts a single object.',
);
});
@@ -95,7 +94,7 @@ describe('ReactFragment', () => {
ReactFragment.create([]);
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toContain(
- 'React.addons.createFragment only accepts a single object.'
+ 'React.addons.createFragment only accepts a single object.',
);
});
@@ -105,8 +104,7 @@ describe('ReactFragment', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toContain(
'React.addons.createFragment does not accept a ReactElement without a ' +
- 'wrapper object.'
+ 'wrapper object.',
);
});
-
});
diff --git a/src/addons/__tests__/renderSubtreeIntoContainer-test.js b/src/addons/__tests__/renderSubtreeIntoContainer-test.js
index 1ee3bd6a93..0af5d79625 100644
--- a/src/addons/__tests__/renderSubtreeIntoContainer-test.js
+++ b/src/addons/__tests__/renderSubtreeIntoContainer-test.js
@@ -11,19 +11,19 @@
'use strict';
+var PropTypes = require('prop-types');
var React = require('React');
var ReactDOM = require('ReactDOM');
var ReactTestUtils = require('ReactTestUtils');
var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');
describe('renderSubtreeIntoContainer', () => {
-
it('should pass context when rendering subtree elsewhere', () => {
var portal = document.createElement('div');
class Component extends React.Component {
static contextTypes = {
- foo: React.PropTypes.string.isRequired,
+ foo: PropTypes.string.isRequired,
};
render() {
@@ -33,7 +33,7 @@ describe('renderSubtreeIntoContainer', () => {
class Parent extends React.Component {
static childContextTypes = {
- foo: React.PropTypes.string.isRequired,
+ foo: PropTypes.string.isRequired,
};
getChildContext() {
@@ -47,9 +47,11 @@ describe('renderSubtreeIntoContainer', () => {
}
componentDidMount() {
- expect(function() {
- renderSubtreeIntoContainer(this, {one}{two}
;
expect(
- ReactTransitionChildMapping.getChildMapping(component.props.children)
+ ReactTransitionChildMapping.getChildMapping(component.props.children),
).toEqual({
'.$one': one,
'.$two': two,
diff --git a/src/addons/update.js b/src/addons/update.js
index 6e3c41785a..ce5fa018d1 100644
--- a/src/addons/update.js
+++ b/src/addons/update.js
@@ -9,7 +9,7 @@
* @providesModule update
*/
- /* global hasOwnProperty:true */
+/* global hasOwnProperty:true */
'use strict';
@@ -53,15 +53,15 @@ function invariantArrayCase(value, spec, command) {
Array.isArray(value),
'update(): expected target of %s to be an array; got %s.',
command,
- value
+ value,
);
var specValue = spec[command];
invariant(
Array.isArray(specValue),
'update(): expected spec of %s to be an array; got %s. ' +
- 'Did you forget to wrap your parameter in an array?',
+ 'Did you forget to wrap your parameter in an array?',
command,
- specValue
+ specValue,
);
}
@@ -73,16 +73,16 @@ function update(value, spec) {
invariant(
typeof spec === 'object',
'update(): You provided a key path to update() that did not contain one ' +
- 'of %s. Did you forget to include {%s: ...}?',
+ 'of %s. Did you forget to include {%s: ...}?',
ALL_COMMANDS_LIST.join(', '),
- COMMAND_SET
+ COMMAND_SET,
);
if (hasOwnProperty.call(spec, COMMAND_SET)) {
invariant(
Object.keys(spec).length === 1,
'Cannot have more than one key in an object with %s',
- COMMAND_SET
+ COMMAND_SET,
);
return spec[COMMAND_SET];
@@ -94,15 +94,15 @@ function update(value, spec) {
var mergeObj = spec[COMMAND_MERGE];
invariant(
mergeObj && typeof mergeObj === 'object',
- 'update(): %s expects a spec of type \'object\'; got %s',
+ "update(): %s expects a spec of type 'object'; got %s",
COMMAND_MERGE,
- mergeObj
+ mergeObj,
);
invariant(
nextValue && typeof nextValue === 'object',
- 'update(): %s expects a target of type \'object\'; got %s',
+ "update(): %s expects a target of type 'object'; got %s",
COMMAND_MERGE,
- nextValue
+ nextValue,
);
Object.assign(nextValue, spec[COMMAND_MERGE]);
}
@@ -126,22 +126,22 @@ function update(value, spec) {
Array.isArray(value),
'Expected %s target to be an array; got %s',
COMMAND_SPLICE,
- value
+ value,
);
invariant(
Array.isArray(spec[COMMAND_SPLICE]),
'update(): expected spec of %s to be an array of arrays; got %s. ' +
- 'Did you forget to wrap your parameters in an array?',
+ 'Did you forget to wrap your parameters in an array?',
COMMAND_SPLICE,
- spec[COMMAND_SPLICE]
+ spec[COMMAND_SPLICE],
);
spec[COMMAND_SPLICE].forEach(function(args) {
invariant(
Array.isArray(args),
'update(): expected spec of %s to be an array of arrays; got %s. ' +
- 'Did you forget to wrap your parameters in an array?',
+ 'Did you forget to wrap your parameters in an array?',
COMMAND_SPLICE,
- spec[COMMAND_SPLICE]
+ spec[COMMAND_SPLICE],
);
nextValue.splice.apply(nextValue, args);
});
@@ -152,7 +152,7 @@ function update(value, spec) {
typeof spec[COMMAND_APPLY] === 'function',
'update(): expected spec of %s to be a function; got %s.',
COMMAND_APPLY,
- spec[COMMAND_APPLY]
+ spec[COMMAND_APPLY],
);
nextValue = spec[COMMAND_APPLY](nextValue);
}
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index 39b6aa31ce..29cfea6dad 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -11,23 +11,22 @@
'use strict';
+var ReactBaseClasses = require('ReactBaseClasses');
var ReactChildren = require('ReactChildren');
-var ReactComponent = require('ReactComponent');
-var ReactPureComponent = require('ReactPureComponent');
-var ReactClass = require('ReactClass');
var ReactDOMFactories = require('ReactDOMFactories');
var ReactElement = require('ReactElement');
var ReactPropTypes = require('ReactPropTypes');
var ReactVersion = require('ReactVersion');
+var createReactClass = require('createClass');
var onlyChild = require('onlyChild');
-var warning = require('warning');
var createElement = ReactElement.createElement;
var createFactory = ReactElement.createFactory;
var cloneElement = ReactElement.cloneElement;
if (__DEV__) {
+ var lowPriorityWarning = require('lowPriorityWarning');
var canDefineProperty = require('canDefineProperty');
var ReactElementValidator = require('ReactElementValidator');
var didWarnPropTypesDeprecated = false;
@@ -37,24 +36,39 @@ if (__DEV__) {
}
var __spread = Object.assign;
+var createMixin = function(mixin) {
+ return mixin;
+};
if (__DEV__) {
- var warned = false;
+ var warnedForSpread = false;
+ var warnedForCreateMixin = false;
__spread = function() {
- warning(
- warned,
+ lowPriorityWarning(
+ warnedForSpread,
'React.__spread is deprecated and should not be used. Use ' +
- 'Object.assign directly or another helper function with similar ' +
- 'semantics. You may be seeing this warning due to your compiler. ' +
- 'See https://fb.me/react-spread-deprecation for more details.'
+ 'Object.assign directly or another helper function with similar ' +
+ 'semantics. You may be seeing this warning due to your compiler. ' +
+ 'See https://fb.me/react-spread-deprecation for more details.',
);
- warned = true;
+ warnedForSpread = true;
return Object.assign.apply(null, arguments);
};
+
+ createMixin = function(mixin) {
+ lowPriorityWarning(
+ warnedForCreateMixin,
+ 'React.createMixin is deprecated and should not be used. ' +
+ 'In React v16.0, it will be removed. ' +
+ 'You can use this mixin directly instead. ' +
+ 'See https://fb.me/createmixin-was-never-implemented for more info.',
+ );
+ warnedForCreateMixin = true;
+ return mixin;
+ };
}
var React = {
-
// Modern
Children: {
@@ -65,8 +79,8 @@ var React = {
only: onlyChild,
},
- Component: ReactComponent,
- PureComponent: ReactPureComponent,
+ Component: ReactBaseClasses.Component,
+ PureComponent: ReactBaseClasses.PureComponent,
createElement: createElement,
cloneElement: cloneElement,
@@ -75,12 +89,9 @@ var React = {
// Classic
PropTypes: ReactPropTypes,
- createClass: ReactClass.createClass,
+ createClass: createReactClass,
createFactory: createFactory,
- createMixin: function(mixin) {
- // Currently a noop. Will be used to validate and trace mixins.
- return mixin;
- },
+ createMixin: createMixin,
// This looks DOM specific but these are actually isomorphic helpers
// since they are just generating DOM strings.
@@ -92,21 +103,63 @@ var React = {
__spread: __spread,
};
-// TODO: Fix tests so that this deprecation warning doesn't cause failures.
if (__DEV__) {
+ let warnedForCreateClass = false;
if (canDefineProperty) {
Object.defineProperty(React, 'PropTypes', {
get() {
- warning(
+ lowPriorityWarning(
didWarnPropTypesDeprecated,
- 'Accessing PropTypes via the main React package is deprecated. Use ' +
- 'the prop-types package from npm instead.'
+ 'Accessing PropTypes via the main React package is deprecated,' +
+ ' and will be removed in React v16.0.' +
+ ' Use the latest available v15.* prop-types package from npm instead.' +
+ ' For info on usage, compatibility, migration and more, see ' +
+ 'https://fb.me/prop-types-docs',
);
didWarnPropTypesDeprecated = true;
return ReactPropTypes;
},
});
+
+ Object.defineProperty(React, 'createClass', {
+ get: function() {
+ lowPriorityWarning(
+ warnedForCreateClass,
+ 'Accessing createClass via the main React package is deprecated,' +
+ ' and will be removed in React v16.0.' +
+ " Use a plain JavaScript class instead. If you're not yet " +
+ 'ready to migrate, create-react-class v15.* is available ' +
+ 'on npm as a temporary, drop-in replacement. ' +
+ 'For more info see https://fb.me/react-create-class',
+ );
+ warnedForCreateClass = true;
+ return createReactClass;
+ },
+ });
}
+
+ // React.DOM factories are deprecated. Wrap these methods so that
+ // invocations of the React.DOM namespace and alert users to switch
+ // to the `react-dom-factories` package.
+ React.DOM = {};
+ var warnedForFactories = false;
+ Object.keys(ReactDOMFactories).forEach(function(factory) {
+ React.DOM[factory] = function(...args) {
+ if (!warnedForFactories) {
+ lowPriorityWarning(
+ false,
+ 'Accessing factories like React.DOM.%s has been deprecated ' +
+ 'and will be removed in v16.0+. Use the ' +
+ 'react-dom-factories package instead. ' +
+ ' Version 1.0 provides a drop-in replacement.' +
+ ' For more info, see https://fb.me/react-dom-factories',
+ factory,
+ );
+ warnedForFactories = true;
+ }
+ return ReactDOMFactories[factory](...args);
+ };
+ });
}
module.exports = React;
diff --git a/src/isomorphic/__tests__/React-test.js b/src/isomorphic/__tests__/React-test.js
new file mode 100644
index 0000000000..7a2d0c9ac9
--- /dev/null
+++ b/src/isomorphic/__tests__/React-test.js
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+describe('React', () => {
+ var React;
+
+ beforeEach(() => {
+ React = require('React');
+ });
+
+ it('should log a deprecation warning once when using React.__spread', () => {
+ spyOn(console, 'warn');
+ React.__spread({});
+ React.__spread({});
+ expect(console.warn.calls.count()).toBe(1);
+ expect(console.warn.calls.argsFor(0)[0]).toContain(
+ 'React.__spread is deprecated and should not be used',
+ );
+ });
+
+ it('should log a deprecation warning once when using React.createMixin', () => {
+ spyOn(console, 'warn');
+ React.createMixin();
+ React.createMixin();
+ expect(console.warn.calls.count()).toBe(1);
+ expect(console.warn.calls.argsFor(0)[0]).toContain(
+ 'React.createMixin is deprecated and should not be used',
+ );
+ });
+
+ it('should warn once when attempting to access React.createClass', () => {
+ spyOn(console, 'warn');
+ let createClass = React.createClass;
+ createClass = React.createClass;
+ expect(createClass).not.toBe(undefined);
+ expect(console.warn.calls.count()).toBe(1);
+ expect(console.warn.calls.argsFor(0)[0]).toContain(
+ 'Warning: Accessing createClass via the main React package is ' +
+ 'deprecated, and will be removed in React v16.0. ' +
+ "Use a plain JavaScript class instead. If you're not yet ready " +
+ 'to migrate, create-react-class v15.* is available on npm as ' +
+ 'a temporary, drop-in replacement. ' +
+ 'For more info see https://fb.me/react-create-class',
+ );
+ });
+
+ it('should warn once when attempting to access React.PropTypes', () => {
+ spyOn(console, 'warn');
+ let PropTypes = React.PropTypes;
+ PropTypes = React.PropTypes;
+ expect(PropTypes).not.toBe(undefined);
+ expect(console.warn.calls.count()).toBe(1);
+ expect(console.warn.calls.argsFor(0)[0]).toContain(
+ 'Warning: Accessing PropTypes via the main React package is ' +
+ 'deprecated, and will be removed in React v16.0. ' +
+ 'Use the latest available v15.* prop-types package from ' +
+ 'npm instead. For info on usage, compatibility, migration ' +
+ 'and more, see https://fb.me/prop-types-docs',
+ );
+ });
+});
diff --git a/src/isomorphic/children/ReactChildren.js b/src/isomorphic/children/ReactChildren.js
index 75670dbe36..645c361ff6 100644
--- a/src/isomorphic/children/ReactChildren.js
+++ b/src/isomorphic/children/ReactChildren.js
@@ -20,13 +20,11 @@ var traverseAllChildren = require('traverseAllChildren');
var twoArgumentPooler = PooledClass.twoArgumentPooler;
var fourArgumentPooler = PooledClass.fourArgumentPooler;
-
var userProvidedKeyEscapeRegex = /\/+/g;
function escapeUserProvidedKey(text) {
return ('' + text).replace(userProvidedKeyEscapeRegex, '$&/');
}
-
/**
* PooledClass representing the bookkeeping associated with performing a child
* traversal. Allows avoiding binding callbacks.
@@ -68,13 +66,14 @@ function forEachChildren(children, forEachFunc, forEachContext) {
if (children == null) {
return children;
}
- var traverseContext =
- ForEachBookKeeping.getPooled(forEachFunc, forEachContext);
+ var traverseContext = ForEachBookKeeping.getPooled(
+ forEachFunc,
+ forEachContext,
+ );
traverseAllChildren(children, forEachSingleChild, traverseContext);
ForEachBookKeeping.release(traverseContext);
}
-
/**
* PooledClass representing the bookkeeping associated with performing a child
* mapping. Allows avoiding binding callbacks.
@@ -109,7 +108,7 @@ function mapSingleChildIntoContext(bookKeeping, child, childKey) {
mappedChild,
result,
childKey,
- emptyFunction.thatReturnsArgument
+ emptyFunction.thatReturnsArgument,
);
} else if (mappedChild != null) {
if (ReactElement.isValidElement(mappedChild)) {
@@ -118,12 +117,10 @@ function mapSingleChildIntoContext(bookKeeping, child, childKey) {
// Keep both the (mapped) and old keys if they differ, just as
// traverseAllChildren used to do for objects as children
keyPrefix +
- (
- (mappedChild.key && (!child || (child.key !== mappedChild.key))) ?
- escapeUserProvidedKey(mappedChild.key) + '/' :
- ''
- ) +
- childKey
+ (mappedChild.key && (!child || child.key !== mappedChild.key)
+ ? escapeUserProvidedKey(mappedChild.key) + '/'
+ : '') +
+ childKey,
);
}
result.push(mappedChild);
@@ -139,7 +136,7 @@ function mapIntoWithKeyPrefixInternal(children, array, prefix, func, context) {
array,
escapedPrefix,
func,
- context
+ context,
);
traverseAllChildren(children, mapSingleChildIntoContext, traverseContext);
MapBookKeeping.release(traverseContext);
@@ -167,8 +164,6 @@ function mapChildren(children, func, context) {
return result;
}
-
-
function forEachSingleChildDummy(traverseContext, child, name) {
return null;
}
@@ -186,7 +181,6 @@ function countChildren(children, context) {
return traverseAllChildren(children, forEachSingleChildDummy, null);
}
-
/**
* Flatten a children object (typically specified as `props.children`) and
* return an array with appropriately re-keyed children.
@@ -199,12 +193,11 @@ function toArray(children) {
children,
result,
null,
- emptyFunction.thatReturnsArgument
+ emptyFunction.thatReturnsArgument,
);
return result;
}
-
var ReactChildren = {
forEach: forEachChildren,
map: mapChildren,
diff --git a/src/isomorphic/children/__tests__/ReactChildren-test.js b/src/isomorphic/children/__tests__/ReactChildren-test.js
index 6eb4c89e2d..d6e6a8bfc5 100644
--- a/src/isomorphic/children/__tests__/ReactChildren-test.js
+++ b/src/isomorphic/children/__tests__/ReactChildren-test.js
@@ -69,7 +69,6 @@ describe('ReactChildren', () => {
var mappedChildren = ReactChildren.map(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(simpleKid, 0);
expect(mappedChildren[0]).toEqual();
-
});
it('should pass key to returned component', () => {
@@ -103,8 +102,11 @@ describe('ReactChildren', () => {
ReactChildren.forEach(instance.props.children, callback, scopeTester);
expect(lastContext).toBe(scopeTester);
- var mappedChildren =
- ReactChildren.map(instance.props.children, callback, scopeTester);
+ var mappedChildren = ReactChildren.map(
+ instance.props.children,
+ callback,
+ scopeTester,
+ );
expect(ReactChildren.count(mappedChildren)).toBe(1);
expect(mappedChildren[0]).toBe(scopeTester);
@@ -118,9 +120,9 @@ describe('ReactChildren', () => {
var four = ;
var mapped = [
- , // Key should be joined to obj key
- null, // Key should be added even if we don't supply it!
- , // Key should be added even if not supplied!
+ , // Key should be joined to obj key
+ null, // Key should be added even if we don't supply it!
+ , // Key should be added even if not supplied!
, // Map from null to something.
,
];
@@ -146,8 +148,7 @@ describe('ReactChildren', () => {
expect(callback).toHaveBeenCalledWith(four, 4);
callback.calls.reset();
- var mappedChildren =
- ReactChildren.map(instance.props.children, callback);
+ var mappedChildren = ReactChildren.map(instance.props.children, callback);
expect(callback.calls.count()).toBe(5);
expect(ReactChildren.count(mappedChildren)).toBe(4);
// Keys default to indices.
@@ -156,9 +157,7 @@ describe('ReactChildren', () => {
mappedChildren[1].key,
mappedChildren[2].key,
mappedChildren[3].key,
- ]).toEqual(
- ['giraffe/.$keyZero', '.$keyTwo', '.3', '.$keyFour']
- );
+ ]).toEqual(['giraffe/.$keyZero', '.$keyTwo', '.3', '.$keyFour']);
expect(callback).toHaveBeenCalledWith(zero, 0);
expect(callback).toHaveBeenCalledWith(one, 1);
@@ -185,15 +184,15 @@ describe('ReactChildren', () => {
// 1. If grouped in an Object, the object key combined with `key` prop
// 2. If grouped in an Array, the `key` prop, falling back to array index
- var zeroMapped = ; // Key should be overridden
- var twoMapped = ; // Key should be added even if not supplied!
+ var zeroMapped = ; // Key should be overridden
+ var twoMapped = ; // Key should be added even if not supplied!
var fourMapped = ;
var fiveMapped = ;
var callback = jasmine.createSpy().and.callFake(function(kid, index) {
- return index === 0 ? zeroMapped :
- index === 1 ? twoMapped :
- index === 2 ? fourMapped : fiveMapped;
+ return index === 0
+ ? zeroMapped
+ : index === 1 ? twoMapped : index === 2 ? fourMapped : fiveMapped;
});
var frag = ReactFragment.create({
@@ -203,12 +202,7 @@ describe('ReactChildren', () => {
});
var instance = {[frag]}
;
- expect([
- frag[0].key,
- frag[1].key,
- frag[2].key,
- frag[3].key,
- ]).toEqual([
+ expect([frag[0].key, frag[1].key, frag[2].key, frag[3].key]).toEqual([
'firstHalfKey/.$keyZero',
'firstHalfKey/.$keyTwo',
'secondHalfKey/.$keyFour',
@@ -244,9 +238,13 @@ describe('ReactChildren', () => {
'.0:$keyFive/.$keyFiveInner',
]);
- expect(mappedChildren[0]).toEqual();
+ expect(mappedChildren[0]).toEqual(
+ ,
+ );
expect(mappedChildren[1]).toEqual();
- expect(mappedChildren[2]).toEqual();
+ expect(mappedChildren[2]).toEqual(
+ ,
+ );
expect(mappedChildren[3]).toEqual();
});
@@ -271,21 +269,24 @@ describe('ReactChildren', () => {
);
var expectedForcedKeys = ['giraffe/.$keyZero', '.$keyOne'];
- var mappedChildrenForcedKeys =
- ReactChildren.map(forcedKeys.props.children, mapFn);
- var mappedForcedKeys = mappedChildrenForcedKeys.map((c) => c.key);
+ var mappedChildrenForcedKeys = ReactChildren.map(
+ forcedKeys.props.children,
+ mapFn,
+ );
+ var mappedForcedKeys = mappedChildrenForcedKeys.map(c => c.key);
expect(mappedForcedKeys).toEqual(expectedForcedKeys);
var expectedRemappedForcedKeys = [
'giraffe/.$giraffe/.$keyZero',
'.$.$keyOne',
];
- var remappedChildrenForcedKeys =
- ReactChildren.map(mappedChildrenForcedKeys, mapFn);
- expect(
- remappedChildrenForcedKeys.map((c) => c.key)
- ).toEqual(expectedRemappedForcedKeys);
-
+ var remappedChildrenForcedKeys = ReactChildren.map(
+ mappedChildrenForcedKeys,
+ mapFn,
+ );
+ expect(remappedChildrenForcedKeys.map(c => c.key)).toEqual(
+ expectedRemappedForcedKeys,
+ );
});
it('should not throw if key provided is a dupe with array key', () => {
@@ -315,14 +316,10 @@ describe('ReactChildren', () => {
);
- var mapped = ReactChildren.map(
- instance.props.children,
- element => element,
- );
+ var mapped = ReactChildren.map(instance.props.children, element => element);
- var mappedWithClone = ReactChildren.map(
- instance.props.children,
- element => React.cloneElement(element),
+ var mappedWithClone = ReactChildren.map(instance.props.children, element =>
+ React.cloneElement(element),
);
expect(mapped[0].key).toBe(mappedWithClone[0].key);
@@ -335,14 +332,10 @@ describe('ReactChildren', () => {
);
- var mapped = ReactChildren.map(
- instance.props.children,
- element => element,
- );
+ var mapped = ReactChildren.map(instance.props.children, element => element);
- var mappedWithClone = ReactChildren.map(
- instance.props.children,
- element => React.cloneElement(element, {key: 'unique'}),
+ var mappedWithClone = ReactChildren.map(instance.props.children, element =>
+ React.cloneElement(element, {key: 'unique'}),
);
expect(mapped[0].key).toBe(mappedWithClone[0].key);
@@ -399,14 +392,16 @@ describe('ReactChildren', () => {
// 2. If grouped in an Array, the `key` prop, falling back to array index
var instance = (
- {[
- ReactFragment.create({
- firstHalfKey: [zero, one, two],
- secondHalfKey: [three, four],
- keyFive: five,
- }),
- null,
- ]}
+
+ {[
+ ReactFragment.create({
+ firstHalfKey: [zero, one, two],
+ secondHalfKey: [three, four],
+ keyFive: five,
+ }),
+ null,
+ ]}
+
);
var numberOfChildren = ReactChildren.count(instance.props.children);
expect(numberOfChildren).toBe(5);
@@ -418,10 +413,8 @@ describe('ReactChildren', () => {
expect(ReactChildren.toArray().length).toBe(1);
expect(ReactChildren.toArray([]).length).toBe(1);
- expect(
- ReactChildren.toArray()[0].key
- ).toBe(
- ReactChildren.toArray([])[0].key
+ expect(ReactChildren.toArray()[0].key).toBe(
+ ReactChildren.toArray([])[0].key,
);
var flattened = ReactChildren.toArray([
@@ -445,9 +438,9 @@ describe('ReactChildren', () => {
expect(flattened[5].key).toBe(reversed[3].key);
// null/undefined/bool are all omitted
- expect(ReactChildren.toArray([1, 'two', null, undefined, true])).toEqual(
- [1, 'two']
- );
+ expect(ReactChildren.toArray([1, 'two', null, undefined, true])).toEqual([
+ 1,
+ 'two',
+ ]);
});
-
});
diff --git a/src/isomorphic/children/__tests__/onlyChild-test.js b/src/isomorphic/children/__tests__/onlyChild-test.js
index 8de1c9b807..0c8870c6d7 100644
--- a/src/isomorphic/children/__tests__/onlyChild-test.js
+++ b/src/isomorphic/children/__tests__/onlyChild-test.js
@@ -12,7 +12,6 @@
'use strict';
describe('onlyChild', () => {
-
var React;
var ReactFragment;
var onlyChild;
@@ -35,63 +34,66 @@ describe('onlyChild', () => {
it('should fail when passed two children', () => {
expect(function() {
- var instance =
+ var instance = (
{a}{b}{c}
;
var children = sliceChildren(el.props.children, 1, 2);
- expect(children).toEqual([
- ,
- ]);
+ expect(children).toEqual([]);
});
it('should slice nested children', () => {
var fullSet = [
,
- [
- ,
- ,
- ],
+ [, ],
,
];
var children = sliceChildren(fullSet, 1, 2);
- expect(children).toEqual([
- ,
- ]);
+ expect(children).toEqual([]);
});
-
});
diff --git a/src/isomorphic/children/onlyChild.js b/src/isomorphic/children/onlyChild.js
index 43ec44f29c..8801fd6dc2 100644
--- a/src/isomorphic/children/onlyChild.js
+++ b/src/isomorphic/children/onlyChild.js
@@ -31,7 +31,7 @@ var invariant = require('invariant');
function onlyChild(children) {
invariant(
ReactElement.isValidElement(children),
- 'React.Children.only expected to receive a single React element child.'
+ 'React.Children.only expected to receive a single React element child.',
);
return children;
}
diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
index f6efecc9b8..29a9ac8913 100644
--- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -17,6 +17,7 @@
'use strict';
+var PropTypes;
var React;
var ReactDOM;
var ReactTestUtils;
@@ -34,6 +35,7 @@ describe('ReactContextValidator', () => {
React = require('React');
ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
+ PropTypes = require('prop-types');
reactComponentExpect = require('reactComponentExpect');
});
@@ -47,7 +49,7 @@ describe('ReactContextValidator', () => {
}
}
Component.contextTypes = {
- foo: React.PropTypes.string,
+ foo: PropTypes.string,
};
class ComponentInFooBarContext extends React.Component {
@@ -63,12 +65,16 @@ describe('ReactContextValidator', () => {
}
}
ComponentInFooBarContext.childContextTypes = {
- foo: React.PropTypes.string,
- bar: React.PropTypes.number,
+ foo: PropTypes.string,
+ bar: PropTypes.number,
};
- var instance = ReactTestUtils.renderIntoDocument(Hello World
;
- * }
- * });
- *
- * The class specification supports a specific protocol of methods that have
- * special meaning (e.g. `render`). See `ReactClassInterface` for
- * more the comprehensive protocol. Any other properties and methods in the
- * class specification will be available on the prototype.
- *
- * @interface ReactClassInterface
- * @internal
- */
-var ReactClassInterface: {[key: string]: SpecPolicy} = {
-
- /**
- * An array of Mixin objects to include when defining your component.
- *
- * @type {array}
- * @optional
- */
- mixins: 'DEFINE_MANY',
-
- /**
- * An object containing properties and methods that should be defined on
- * the component's constructor instead of its prototype (static methods).
- *
- * @type {object}
- * @optional
- */
- statics: 'DEFINE_MANY',
-
- /**
- * Definition of prop types for this component.
- *
- * @type {object}
- * @optional
- */
- propTypes: 'DEFINE_MANY',
-
- /**
- * Definition of context types for this component.
- *
- * @type {object}
- * @optional
- */
- contextTypes: 'DEFINE_MANY',
-
- /**
- * Definition of context types this component sets for its children.
- *
- * @type {object}
- * @optional
- */
- childContextTypes: 'DEFINE_MANY',
-
- // ==== Definition methods ====
-
- /**
- * Invoked when the component is mounted. Values in the mapping will be set on
- * `this.props` if that prop is not specified (i.e. using an `in` check).
- *
- * This method is invoked before `getInitialState` and therefore cannot rely
- * on `this.state` or use `this.setState`.
- *
- * @return {object}
- * @optional
- */
- getDefaultProps: 'DEFINE_MANY_MERGED',
-
- /**
- * Invoked once before the component is mounted. The return value will be used
- * as the initial value of `this.state`.
- *
- * getInitialState: function() {
- * return {
- * isOn: false,
- * fooBaz: new BazFoo()
- * }
- * }
- *
- * @return {object}
- * @optional
- */
- getInitialState: 'DEFINE_MANY_MERGED',
-
- /**
- * @return {object}
- * @optional
- */
- getChildContext: 'DEFINE_MANY_MERGED',
-
- /**
- * Uses props from `this.props` and state from `this.state` to render the
- * structure of the component.
- *
- * No guarantees are made about when or how often this method is invoked, so
- * it must not have side effects.
- *
- * render: function() {
- * var name = this.props.name;
- * return Hello, {name}!
;
- * }
- *
- * @return {ReactComponent}
- * @required
- */
- render: 'DEFINE_ONCE',
-
-
-
- // ==== Delegate methods ====
-
- /**
- * Invoked when the component is initially created and about to be mounted.
- * This may have side effects, but any external subscriptions or data created
- * by this method must be cleaned up in `componentWillUnmount`.
- *
- * @optional
- */
- componentWillMount: 'DEFINE_MANY',
-
- /**
- * Invoked when the component has been mounted and has a DOM representation.
- * However, there is no guarantee that the DOM node is in the document.
- *
- * Use this as an opportunity to operate on the DOM when the component has
- * been mounted (initialized and rendered) for the first time.
- *
- * @param {DOMElement} rootNode DOM element representing the component.
- * @optional
- */
- componentDidMount: 'DEFINE_MANY',
-
- /**
- * Invoked before the component receives new props.
- *
- * Use this as an opportunity to react to a prop transition by updating the
- * state using `this.setState`. Current props are accessed via `this.props`.
- *
- * componentWillReceiveProps: function(nextProps, nextContext) {
- * this.setState({
- * likesIncreasing: nextProps.likeCount > this.props.likeCount
- * });
- * }
- *
- * NOTE: There is no equivalent `componentWillReceiveState`. An incoming prop
- * transition may cause a state change, but the opposite is not true. If you
- * need it, you are probably looking for `componentWillUpdate`.
- *
- * @param {object} nextProps
- * @optional
- */
- componentWillReceiveProps: 'DEFINE_MANY',
-
- /**
- * Invoked while deciding if the component should be updated as a result of
- * receiving new props, state and/or context.
- *
- * Use this as an opportunity to `return false` when you're certain that the
- * transition to the new props/state/context will not require a component
- * update.
- *
- * shouldComponentUpdate: function(nextProps, nextState, nextContext) {
- * return !equal(nextProps, this.props) ||
- * !equal(nextState, this.state) ||
- * !equal(nextContext, this.context);
- * }
- *
- * @param {object} nextProps
- * @param {?object} nextState
- * @param {?object} nextContext
- * @return {boolean} True if the component should update.
- * @optional
- */
- shouldComponentUpdate: 'DEFINE_ONCE',
-
- /**
- * Invoked when the component is about to update due to a transition from
- * `this.props`, `this.state` and `this.context` to `nextProps`, `nextState`
- * and `nextContext`.
- *
- * Use this as an opportunity to perform preparation before an update occurs.
- *
- * NOTE: You **cannot** use `this.setState()` in this method.
- *
- * @param {object} nextProps
- * @param {?object} nextState
- * @param {?object} nextContext
- * @param {ReactReconcileTransaction} transaction
- * @optional
- */
- componentWillUpdate: 'DEFINE_MANY',
-
- /**
- * Invoked when the component's DOM representation has been updated.
- *
- * Use this as an opportunity to operate on the DOM when the component has
- * been updated.
- *
- * @param {object} prevProps
- * @param {?object} prevState
- * @param {?object} prevContext
- * @param {DOMElement} rootNode DOM element representing the component.
- * @optional
- */
- componentDidUpdate: 'DEFINE_MANY',
-
- /**
- * Invoked when the component is about to be removed from its parent and have
- * its DOM representation destroyed.
- *
- * Use this as an opportunity to deallocate any external resources.
- *
- * NOTE: There is no `componentDidUnmount` since your component will have been
- * destroyed by that point.
- *
- * @optional
- */
- componentWillUnmount: 'DEFINE_MANY',
-
-
-
- // ==== Advanced methods ====
-
- /**
- * Updates the component's currently mounted DOM representation.
- *
- * By default, this implements React's rendering and reconciliation algorithm.
- * Sophisticated clients may wish to override this.
- *
- * @param {ReactReconcileTransaction} transaction
- * @internal
- * @overridable
- */
- updateComponent: 'OVERRIDE_BASE',
-
-};
-
-/**
- * Mapping from class specification keys to special processing functions.
- *
- * Although these are declared like instance properties in the specification
- * when defining classes using `React.createClass`, they are actually static
- * and are accessible on the constructor instead of the prototype. Despite
- * being static, they must be defined outside of the "statics" key under
- * which all other static methods are defined.
- */
-var RESERVED_SPEC_KEYS = {
- displayName: function(Constructor, displayName) {
- Constructor.displayName = displayName;
- },
- mixins: function(Constructor, mixins) {
- if (mixins) {
- for (var i = 0; i < mixins.length; i++) {
- mixSpecIntoComponent(Constructor, mixins[i]);
- }
- }
- },
- childContextTypes: function(Constructor, childContextTypes) {
- if (__DEV__) {
- validateTypeDef(
- Constructor,
- childContextTypes,
- 'childContext'
- );
- }
- Constructor.childContextTypes = Object.assign(
- {},
- Constructor.childContextTypes,
- childContextTypes
- );
- },
- contextTypes: function(Constructor, contextTypes) {
- if (__DEV__) {
- validateTypeDef(
- Constructor,
- contextTypes,
- 'context'
- );
- }
- Constructor.contextTypes = Object.assign(
- {},
- Constructor.contextTypes,
- contextTypes
- );
- },
- /**
- * Special case getDefaultProps which should move into statics but requires
- * automatic merging.
- */
- getDefaultProps: function(Constructor, getDefaultProps) {
- if (Constructor.getDefaultProps) {
- Constructor.getDefaultProps = createMergedResultFunction(
- Constructor.getDefaultProps,
- getDefaultProps
- );
- } else {
- Constructor.getDefaultProps = getDefaultProps;
- }
- },
- propTypes: function(Constructor, propTypes) {
- if (__DEV__) {
- validateTypeDef(
- Constructor,
- propTypes,
- 'prop'
- );
- }
- Constructor.propTypes = Object.assign(
- {},
- Constructor.propTypes,
- propTypes
- );
- },
- statics: function(Constructor, statics) {
- mixStaticSpecIntoComponent(Constructor, statics);
- },
- autobind: function() {}, // noop
-};
-
-function validateTypeDef(
- Constructor,
- typeDef,
- location: ReactPropTypeLocations,
-) {
- for (var propName in typeDef) {
- if (typeDef.hasOwnProperty(propName)) {
- // use a warning instead of an invariant so components
- // don't show up in prod but only in __DEV__
- warning(
- typeof typeDef[propName] === 'function',
- '%s: %s type `%s` is invalid; it must be a function, usually from ' +
- 'React.PropTypes.',
- Constructor.displayName || 'ReactClass',
- ReactPropTypeLocationNames[location],
- propName
- );
- }
- }
-}
-
-function validateMethodOverride(isAlreadyDefined, name) {
- var specPolicy = ReactClassInterface.hasOwnProperty(name) ?
- ReactClassInterface[name] :
- null;
-
- // Disallow overriding of base class methods unless explicitly allowed.
- if (ReactClassMixin.hasOwnProperty(name)) {
- invariant(
- specPolicy === 'OVERRIDE_BASE',
- 'ReactClassInterface: You are attempting to override ' +
- '`%s` from your class specification. Ensure that your method names ' +
- 'do not overlap with React methods.',
- name
- );
- }
-
- // Disallow defining methods more than once unless explicitly allowed.
- if (isAlreadyDefined) {
- invariant(
- specPolicy === 'DEFINE_MANY' ||
- specPolicy === 'DEFINE_MANY_MERGED',
- 'ReactClassInterface: You are attempting to define ' +
- '`%s` on your component more than once. This conflict may be due ' +
- 'to a mixin.',
- name
- );
- }
-}
-
-/**
- * Mixin helper which handles policy validation and reserved
- * specification keys when building React classes.
- */
-function mixSpecIntoComponent(Constructor, spec) {
- if (!spec) {
- if (__DEV__) {
- var typeofSpec = typeof spec;
- var isMixinValid = typeofSpec === 'object' && spec !== null;
-
- warning(
- isMixinValid,
- '%s: You\'re attempting to include a mixin that is either null ' +
- 'or not an object. Check the mixins included by the component, ' +
- 'as well as any mixins they include themselves. ' +
- 'Expected object but got %s.',
- Constructor.displayName || 'ReactClass',
- spec === null ? null : typeofSpec
- );
- }
-
- return;
- }
-
- invariant(
- typeof spec !== 'function',
- 'ReactClass: You\'re attempting to ' +
- 'use a component class or function as a mixin. Instead, just use a ' +
- 'regular object.'
- );
- invariant(
- !ReactElement.isValidElement(spec),
- 'ReactClass: You\'re attempting to ' +
- 'use a component as a mixin. Instead, just use a regular object.'
- );
-
- var proto = Constructor.prototype;
- var autoBindPairs = proto.__reactAutoBindPairs;
-
- // By handling mixins before any other properties, we ensure the same
- // chaining order is applied to methods with DEFINE_MANY policy, whether
- // mixins are listed before or after these methods in the spec.
- if (spec.hasOwnProperty(MIXINS_KEY)) {
- RESERVED_SPEC_KEYS.mixins(Constructor, spec.mixins);
- }
-
- for (var name in spec) {
- if (!spec.hasOwnProperty(name)) {
- continue;
- }
-
- if (name === MIXINS_KEY) {
- // We have already handled mixins in a special case above.
- continue;
- }
-
- var property = spec[name];
- var isAlreadyDefined = proto.hasOwnProperty(name);
- validateMethodOverride(isAlreadyDefined, name);
-
- if (RESERVED_SPEC_KEYS.hasOwnProperty(name)) {
- RESERVED_SPEC_KEYS[name](Constructor, property);
- } else {
- // Setup methods on prototype:
- // The following member methods should not be automatically bound:
- // 1. Expected ReactClass methods (in the "interface").
- // 2. Overridden methods (that were mixed in).
- var isReactClassMethod =
- ReactClassInterface.hasOwnProperty(name);
- var isFunction = typeof property === 'function';
- var shouldAutoBind =
- isFunction &&
- !isReactClassMethod &&
- !isAlreadyDefined &&
- spec.autobind !== false;
-
- if (shouldAutoBind) {
- autoBindPairs.push(name, property);
- proto[name] = property;
- } else {
- if (isAlreadyDefined) {
- var specPolicy = ReactClassInterface[name];
-
- // These cases should already be caught by validateMethodOverride.
- invariant(
- isReactClassMethod && (
- specPolicy === 'DEFINE_MANY_MERGED' ||
- specPolicy === 'DEFINE_MANY'
- ),
- 'ReactClass: Unexpected spec policy %s for key %s ' +
- 'when mixing in component specs.',
- specPolicy,
- name
- );
-
- // For methods which are defined more than once, call the existing
- // methods before calling the new property, merging if appropriate.
- if (specPolicy === 'DEFINE_MANY_MERGED') {
- proto[name] = createMergedResultFunction(proto[name], property);
- } else if (specPolicy === 'DEFINE_MANY') {
- proto[name] = createChainedFunction(proto[name], property);
- }
- } else {
- proto[name] = property;
- if (__DEV__) {
- // Add verbose displayName to the function, which helps when looking
- // at profiling tools.
- if (typeof property === 'function' && spec.displayName) {
- proto[name].displayName = spec.displayName + '_' + name;
- }
- }
- }
- }
- }
- }
-}
-
-function mixStaticSpecIntoComponent(Constructor, statics) {
- if (!statics) {
- return;
- }
- for (var name in statics) {
- var property = statics[name];
- if (!statics.hasOwnProperty(name)) {
- continue;
- }
-
- var isReserved = name in RESERVED_SPEC_KEYS;
- invariant(
- !isReserved,
- 'ReactClass: You are attempting to define a reserved ' +
- 'property, `%s`, that shouldn\'t be on the "statics" key. Define it ' +
- 'as an instance property instead; it will still be accessible on the ' +
- 'constructor.',
- name
- );
-
- var isInherited = name in Constructor;
- invariant(
- !isInherited,
- 'ReactClass: You are attempting to define ' +
- '`%s` on your component more than once. This conflict may be ' +
- 'due to a mixin.',
- name
- );
- Constructor[name] = property;
- }
-}
-
-/**
- * Merge two objects, but throw if both contain the same key.
- *
- * @param {object} one The first object, which is mutated.
- * @param {object} two The second object
- * @return {object} one after it has been mutated to contain everything in two.
- */
-function mergeIntoWithNoDuplicateKeys(one, two) {
- invariant(
- one && two && typeof one === 'object' && typeof two === 'object',
- 'mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.'
- );
-
- for (var key in two) {
- if (two.hasOwnProperty(key)) {
- invariant(
- one[key] === undefined,
- 'mergeIntoWithNoDuplicateKeys(): ' +
- 'Tried to merge two objects with the same key: `%s`. This conflict ' +
- 'may be due to a mixin; in particular, this may be caused by two ' +
- 'getInitialState() or getDefaultProps() methods returning objects ' +
- 'with clashing keys.',
- key
- );
- one[key] = two[key];
- }
- }
- return one;
-}
-
-/**
- * Creates a function that invokes two functions and merges their return values.
- *
- * @param {function} one Function to invoke first.
- * @param {function} two Function to invoke second.
- * @return {function} Function that invokes the two argument functions.
- * @private
- */
-function createMergedResultFunction(one, two) {
- return function mergedResult() {
- var a = one.apply(this, arguments);
- var b = two.apply(this, arguments);
- if (a == null) {
- return b;
- } else if (b == null) {
- return a;
- }
- var c = {};
- mergeIntoWithNoDuplicateKeys(c, a);
- mergeIntoWithNoDuplicateKeys(c, b);
- return c;
- };
-}
-
-/**
- * Creates a function that invokes two functions and ignores their return vales.
- *
- * @param {function} one Function to invoke first.
- * @param {function} two Function to invoke second.
- * @return {function} Function that invokes the two argument functions.
- * @private
- */
-function createChainedFunction(one, two) {
- return function chainedFunction() {
- one.apply(this, arguments);
- two.apply(this, arguments);
- };
-}
-
-/**
- * Binds a method to the component.
- *
- * @param {object} component Component whose method is going to be bound.
- * @param {function} method Method to be bound.
- * @return {function} The bound method.
- */
-function bindAutoBindMethod(component, method) {
- var boundMethod = method.bind(component);
- if (__DEV__) {
- boundMethod.__reactBoundContext = component;
- boundMethod.__reactBoundMethod = method;
- boundMethod.__reactBoundArguments = null;
- var componentName = component.constructor.displayName;
- var _bind = boundMethod.bind;
- boundMethod.bind = function(newThis, ...args) {
- // User is trying to bind() an autobound method; we effectively will
- // ignore the value of "this" that the user is trying to use, so
- // let's warn.
- if (newThis !== component && newThis !== null) {
- warning(
- false,
- 'bind(): React component methods may only be bound to the ' +
- 'component instance. See %s',
- componentName
- );
- } else if (!args.length) {
- warning(
- false,
- 'bind(): You are binding a component method to the component. ' +
- 'React does this for you automatically in a high-performance ' +
- 'way, so you can safely remove this call. See %s',
- componentName
- );
- return boundMethod;
- }
- var reboundMethod = _bind.apply(boundMethod, arguments);
- reboundMethod.__reactBoundContext = component;
- reboundMethod.__reactBoundMethod = method;
- reboundMethod.__reactBoundArguments = args;
- return reboundMethod;
- };
- }
- return boundMethod;
-}
-
-/**
- * Binds all auto-bound methods in a component.
- *
- * @param {object} component Component whose method is going to be bound.
- */
-function bindAutoBindMethods(component) {
- var pairs = component.__reactAutoBindPairs;
- for (var i = 0; i < pairs.length; i += 2) {
- var autoBindKey = pairs[i];
- var method = pairs[i + 1];
- component[autoBindKey] = bindAutoBindMethod(
- component,
- method
- );
- }
-}
-
-/**
- * Add more to the ReactClass base class. These are all legacy features and
- * therefore not already part of the modern ReactComponent.
- */
-var ReactClassMixin = {
-
- /**
- * TODO: This will be deprecated because state should always keep a consistent
- * type signature and the only use case for this, is to avoid that.
- */
- replaceState: function(newState, callback) {
- this.updater.enqueueReplaceState(this, newState);
- if (callback) {
- this.updater.enqueueCallback(this, callback, 'replaceState');
- }
- },
-
- /**
- * Checks whether or not this composite component is mounted.
- * @return {boolean} True if mounted, false otherwise.
- * @protected
- * @final
- */
- isMounted: function() {
- return this.updater.isMounted(this);
- },
-};
-
-var ReactClassComponent = function() {};
-Object.assign(
- ReactClassComponent.prototype,
- ReactComponent.prototype,
- ReactClassMixin
-);
-
-let didWarnDeprecated = false;
-
-/**
- * Module for creating composite components.
- *
- * @class ReactClass
- */
-var ReactClass = {
-
- /**
- * Creates a composite component class given a class specification.
- * See https://facebook.github.io/react/docs/top-level-api.html#react.createclass
- *
- * @param {object} spec Class specification (which must define `render`).
- * @return {function} Component constructor function.
- * @public
- */
- createClass: function(spec) {
- if (__DEV__) {
- warning(
- didWarnDeprecated,
- '%s: React.createClass is deprecated and will be removed in version 16. ' +
- 'Use plain JavaScript classes instead. If you\'re not yet ready to ' +
- 'migrate, create-react-class is available on npm as a ' +
- 'drop-in replacement.',
- (spec && spec.displayName) || 'A Component',
- );
- didWarnDeprecated = true;
- }
-
- // To keep our warnings more understandable, we'll use a little hack here to
- // ensure that Constructor.name !== 'Constructor'. This makes sure we don't
- // unnecessarily identify a class without displayName as 'Constructor'.
- var Constructor = identity(function(props, context, updater) {
- // This constructor gets overridden by mocks. The argument is used
- // by mocks to assert on what gets mounted.
-
- if (__DEV__) {
- warning(
- this instanceof Constructor,
- 'Something is calling a React component directly. Use a factory or ' +
- 'JSX instead. See: https://fb.me/react-legacyfactory'
- );
- }
-
- // Wire up auto-binding
- if (this.__reactAutoBindPairs.length) {
- bindAutoBindMethods(this);
- }
-
- this.props = props;
- this.context = context;
- this.refs = emptyObject;
- this.updater = updater || ReactNoopUpdateQueue;
-
- this.state = null;
-
- // ReactClasses doesn't have constructors. Instead, they use the
- // getInitialState and componentWillMount methods for initialization.
-
- var initialState = this.getInitialState ? this.getInitialState() : null;
- if (__DEV__) {
- // We allow auto-mocks to proceed as if they're returning null.
- if (initialState === undefined &&
- this.getInitialState._isMockFunction) {
- // This is probably bad practice. Consider warning here and
- // deprecating this convenience.
- initialState = null;
- }
- }
- invariant(
- typeof initialState === 'object' && !Array.isArray(initialState),
- '%s.getInitialState(): must return an object or null',
- Constructor.displayName || 'ReactCompositeComponent'
- );
-
- this.state = initialState;
- });
- Constructor.prototype = new ReactClassComponent();
- Constructor.prototype.constructor = Constructor;
- Constructor.prototype.__reactAutoBindPairs = [];
-
- injectedMixins.forEach(
- mixSpecIntoComponent.bind(null, Constructor)
- );
-
- mixSpecIntoComponent(Constructor, spec);
-
- // Initialize the defaultProps property after all mixins have been merged.
- if (Constructor.getDefaultProps) {
- Constructor.defaultProps = Constructor.getDefaultProps();
- }
-
- if (__DEV__) {
- // This is a tag to indicate that the use of these method names is ok,
- // since it's used with createClass. If it's not, then it's likely a
- // mistake so we'll warn you to use the static property, property
- // initializer or constructor respectively.
- if (Constructor.getDefaultProps) {
- Constructor.getDefaultProps.isReactClassApproved = {};
- }
- if (Constructor.prototype.getInitialState) {
- Constructor.prototype.getInitialState.isReactClassApproved = {};
- }
- }
-
- invariant(
- Constructor.prototype.render,
- 'createClass(...): Class specification must implement a `render` method.'
- );
-
- if (__DEV__) {
- warning(
- !Constructor.prototype.componentShouldUpdate,
- '%s has a method called ' +
- 'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
- 'The name is phrased as a question because the function is ' +
- 'expected to return a value.',
- spec.displayName || 'A component'
- );
- warning(
- !Constructor.prototype.componentWillRecieveProps,
- '%s has a method called ' +
- 'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
- spec.displayName || 'A component'
- );
- }
-
- // Reduce time spent doing lookups by setting these on the prototype.
- for (var methodName in ReactClassInterface) {
- if (!Constructor.prototype[methodName]) {
- Constructor.prototype[methodName] = null;
- }
- }
-
- return Constructor;
- },
-
- injection: {
- injectMixin: function(mixin) {
- injectedMixins.push(mixin);
- },
- },
-
-};
-
-module.exports = ReactClass;
diff --git a/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js b/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
index 9c1a44ea5d..61f4fafa0d 100644
--- a/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
@@ -11,14 +11,15 @@
'use strict';
+var PropTypes;
var React;
var ReactDOM;
var ReactTestUtils;
var createReactClass;
describe('ReactClass-spec', () => {
-
beforeEach(() => {
+ PropTypes = require('prop-types');
React = require('React');
ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
@@ -34,7 +35,7 @@ describe('ReactClass-spec', () => {
expect(function() {
createReactClass({});
}).toThrowError(
- 'createClass(...): Class specification must implement a `render` method.'
+ 'createClass(...): Class specification must implement a `render` method.',
);
});
@@ -46,8 +47,7 @@ describe('ReactClass-spec', () => {
},
});
- expect(TestComponent.displayName)
- .toBe('TestComponent');
+ expect(TestComponent.displayName).toBe('TestComponent');
});
it('should copy prop types onto the Constructor', () => {
@@ -62,8 +62,7 @@ describe('ReactClass-spec', () => {
});
expect(TestComponent.propTypes).toBeDefined();
- expect(TestComponent.propTypes.value)
- .toBe(propValidator);
+ expect(TestComponent.propTypes.value).toBe(propValidator);
});
it('should warn on invalid prop types', () => {
@@ -80,7 +79,7 @@ describe('ReactClass-spec', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: Component: prop type `prop` is invalid; ' +
- 'it must be a function, usually from React.PropTypes.'
+ 'it must be a function, usually from React.PropTypes.',
);
});
@@ -98,7 +97,7 @@ describe('ReactClass-spec', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: Component: context type `prop` is invalid; ' +
- 'it must be a function, usually from React.PropTypes.'
+ 'it must be a function, usually from React.PropTypes.',
);
});
@@ -116,7 +115,7 @@ describe('ReactClass-spec', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: Component: child context type `prop` is invalid; ' +
- 'it must be a function, usually from React.PropTypes.'
+ 'it must be a function, usually from React.PropTypes.',
);
});
@@ -134,8 +133,8 @@ describe('ReactClass-spec', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: A component has a method called componentShouldUpdate(). Did you ' +
- 'mean shouldComponentUpdate()? The name is phrased as a question ' +
- 'because the function is expected to return a value.'
+ 'mean shouldComponentUpdate()? The name is phrased as a question ' +
+ 'because the function is expected to return a value.',
);
createReactClass({
@@ -150,8 +149,8 @@ describe('ReactClass-spec', () => {
expect(console.error.calls.count()).toBe(2);
expect(console.error.calls.argsFor(1)[0]).toBe(
'Warning: NamedComponent has a method called componentShouldUpdate(). Did you ' +
- 'mean shouldComponentUpdate()? The name is phrased as a question ' +
- 'because the function is expected to return a value.'
+ 'mean shouldComponentUpdate()? The name is phrased as a question ' +
+ 'because the function is expected to return a value.',
);
});
@@ -168,7 +167,7 @@ describe('ReactClass-spec', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: A component has a method called componentWillRecieveProps(). Did you ' +
- 'mean componentWillReceiveProps()?'
+ 'mean componentWillReceiveProps()?',
);
});
@@ -189,9 +188,9 @@ describe('ReactClass-spec', () => {
});
}).toThrowError(
'ReactClass: You are attempting to define a reserved property, ' +
- '`getDefaultProps`, that shouldn\'t be on the "statics" key. Define ' +
- 'it as an instance property instead; it will still be accessible on ' +
- 'the constructor.'
+ '`getDefaultProps`, that shouldn\'t be on the "statics" key. Define ' +
+ 'it as an instance property instead; it will still be accessible on ' +
+ 'the constructor.',
);
});
@@ -202,13 +201,13 @@ describe('ReactClass-spec', () => {
createReactClass({
mixins: [{}],
propTypes: {
- foo: React.PropTypes.string,
+ foo: PropTypes.string,
},
contextTypes: {
- foo: React.PropTypes.string,
+ foo: PropTypes.string,
},
childContextTypes: {
- foo: React.PropTypes.string,
+ foo: PropTypes.string,
},
render: function() {
return ;
@@ -217,19 +216,19 @@ describe('ReactClass-spec', () => {
expect(console.error.calls.count()).toBe(4);
expect(console.error.calls.argsFor(0)[0]).toBe(
'createClass(...): `mixins` is now a static property and should ' +
- 'be defined inside "statics".'
+ 'be defined inside "statics".',
);
expect(console.error.calls.argsFor(1)[0]).toBe(
'createClass(...): `propTypes` is now a static property and should ' +
- 'be defined inside "statics".'
+ 'be defined inside "statics".',
);
expect(console.error.calls.argsFor(2)[0]).toBe(
'createClass(...): `contextTypes` is now a static property and ' +
- 'should be defined inside "statics".'
+ 'should be defined inside "statics".',
);
expect(console.error.calls.argsFor(3)[0]).toBe(
'createClass(...): `childContextTypes` is now a static property and ' +
- 'should be defined inside "statics".'
+ 'should be defined inside "statics".',
);
});
@@ -282,7 +281,7 @@ describe('ReactClass-spec', () => {
it('renders based on context getInitialState', () => {
var Foo = createReactClass({
contextTypes: {
- className: React.PropTypes.string,
+ className: PropTypes.string,
},
getInitialState() {
return {className: this.context.className};
@@ -294,7 +293,7 @@ describe('ReactClass-spec', () => {
var Outer = createReactClass({
childContextTypes: {
- className: React.PropTypes.string,
+ className: PropTypes.string,
},
getChildContext() {
return {className: 'foo'};
@@ -323,7 +322,7 @@ describe('ReactClass-spec', () => {
expect(function() {
instance = ReactTestUtils.renderIntoDocument(instance);
}).toThrowError(
- 'Component.getInitialState(): must return an object or null'
+ 'Component.getInitialState(): must return an object or null',
);
});
});
@@ -337,8 +336,8 @@ describe('ReactClass-spec', () => {
return ;
},
});
- expect(
- () => ReactTestUtils.renderIntoDocument(
- {React.cloneElement(this.props.child, { className: 'xyz' })}
+ {React.cloneElement(this.props.child, {className: 'xyz'})}
);
}
@@ -66,7 +68,7 @@ describe('ReactElementClone', () => {
render() {
return (
- {React.cloneElement(this.props.child, { className: 'xyz' })}
+ {React.cloneElement(this.props.child, {className: 'xyz'})}
);
}
@@ -91,7 +93,7 @@ describe('ReactElementClone', () => {
render() {
return (
- {React.cloneElement(this.props.child, { className: 'xyz' })}
+ {React.cloneElement(this.props.child, {className: 'xyz'})}
);
}
@@ -120,7 +122,7 @@ describe('ReactElementClone', () => {
}
ReactTestUtils.renderIntoDocument(
- React.cloneElement({clone}
;
@@ -218,7 +227,7 @@ describe('ReactElementClone', () => {
}
ReactTestUtils.renderIntoDocument(
- React.cloneElement({divs}
);
expect(console.error.calls.count()).toBe(1);
expect(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
'Warning: Each child in an array or iterator should have a unique ' +
- '"key" prop. Check the top-level render call using . See ' +
- 'https://fb.me/react-warning-keys for more information.\n' +
- ' in div (at **)'
+ '"key" prop. Check the top-level render call using
,
);
var root = ReactDOM.findDOMNode(myDiv);
var dog = root.childNodes[0];
expect(dog.className).toBe('bigdog');
});
- it('allow React.DOM factories to be called without warnings', () => {
- spyOn(console, 'error');
+ it('throws warning when React.DOM factories are called', () => {
+ spyOn(console, 'warn');
var element = React.DOM.div();
expect(element.type).toBe('div');
- expect(console.error.calls.count()).toBe(0);
+ expect(console.warn.calls.count()).toBe(1);
});
it('throws in render() if the mount callback is not a function', () => {
@@ -135,15 +133,15 @@ describe('ReactDOM', () => {
var myDiv = document.createElement('div');
expect(() => ReactDOM.render(, myDiv, 'no')).toThrowError(
'ReactDOM.render(...): Expected the last optional `callback` argument ' +
- 'to be a function. Instead received: string.'
+ 'to be a function. Instead received: string.',
);
expect(() => ReactDOM.render(, myDiv, {})).toThrowError(
'ReactDOM.render(...): Expected the last optional `callback` argument ' +
- 'to be a function. Instead received: Object.'
+ 'to be a function. Instead received: Object.',
);
expect(() => ReactDOM.render(, myDiv, new Foo())).toThrowError(
'ReactDOM.render(...): Expected the last optional `callback` argument ' +
- 'to be a function. Instead received: Foo (keys: a, b).'
+ 'to be a function. Instead received: Foo (keys: a, b).',
);
});
@@ -166,15 +164,15 @@ describe('ReactDOM', () => {
expect(() => ReactDOM.render(, myDiv, 'no')).toThrowError(
'ReactDOM.render(...): Expected the last optional `callback` argument ' +
- 'to be a function. Instead received: string.'
+ 'to be a function. Instead received: string.',
);
expect(() => ReactDOM.render(, myDiv, {})).toThrowError(
'ReactDOM.render(...): Expected the last optional `callback` argument ' +
- 'to be a function. Instead received: Object.'
+ 'to be a function. Instead received: Object.',
);
expect(() => ReactDOM.render(, myDiv, new Foo())).toThrowError(
'ReactDOM.render(...): Expected the last optional `callback` argument ' +
- 'to be a function. Instead received: Foo (keys: a, b).'
+ 'to be a function. Instead received: Foo (keys: a, b).',
);
});
});
diff --git a/src/renderers/dom/client/__tests__/ReactDOMComponentTree-test.js b/src/renderers/dom/client/__tests__/ReactDOMComponentTree-test.js
index 71733578e0..f6ce6f4286 100644
--- a/src/renderers/dom/client/__tests__/ReactDOMComponentTree-test.js
+++ b/src/renderers/dom/client/__tests__/ReactDOMComponentTree-test.js
@@ -88,7 +88,7 @@ describe('ReactDOMComponentTree', () => {
function renderAndGetClosest(sel) {
return ReactDOMComponentTree.getClosestInstanceFromNode(
- renderAndQuery(sel)
+ renderAndQuery(sel),
);
}
@@ -101,11 +101,12 @@ describe('ReactDOMComponentTree', () => {
// This one's a text component!
var root = renderAndQuery(null);
- var inst = ReactDOMComponentTree.getInstanceFromNode(root.children[0].childNodes[2]);
+ var inst = ReactDOMComponentTree.getInstanceFromNode(
+ root.children[0].childNodes[2],
+ );
expect(inst._stringText).toBe('goodbye.');
expect(renderAndGetClosest('b')._currentElement.type).toBe('main');
expect(renderAndGetClosest('img')._currentElement.type).toBe('main');
});
-
});
diff --git a/src/renderers/dom/client/__tests__/ReactDOMIDOperations-test.js b/src/renderers/dom/client/__tests__/ReactDOMIDOperations-test.js
index dffd62dae4..1187c9bf5f 100644
--- a/src/renderers/dom/client/__tests__/ReactDOMIDOperations-test.js
+++ b/src/renderers/dom/client/__tests__/ReactDOMIDOperations-test.js
@@ -23,13 +23,15 @@ describe('ReactDOMIDOperations', () => {
var html = '\n \t \n testContent \t \n \t';
ReactDOMIDOperations.dangerouslyProcessChildrenUpdates(
stubInstance,
- [{
- type: 'SET_MARKUP',
- content: html,
- fromIndex: null,
- toIndex: null,
- }],
- []
+ [
+ {
+ type: 'SET_MARKUP',
+ content: html,
+ fromIndex: null,
+ toIndex: null,
+ },
+ ],
+ [],
);
expect(stubNode.innerHTML).toBe(html);
diff --git a/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js b/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js
index 30760d3ae8..d7904b0030 100644
--- a/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js
+++ b/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js
@@ -15,7 +15,6 @@ var React;
var ReactDOMServer;
describe('ReactDOMSVG', () => {
-
beforeEach(() => {
React = require('React');
ReactDOMServer = require('ReactDOMServer');
@@ -25,9 +24,8 @@ describe('ReactDOMSVG', () => {
var markup = ReactDOMServer.renderToString(
+ ,
);
expect(markup).toContain('xlink:href="http://i.imgur.com/w7GCRPb.png"');
});
-
});
diff --git a/src/renderers/dom/client/__tests__/ReactDOMTreeTraversal-test.js b/src/renderers/dom/client/__tests__/ReactDOMTreeTraversal-test.js
index d68855d30c..ed40c81121 100644
--- a/src/renderers/dom/client/__tests__/ReactDOMTreeTraversal-test.js
+++ b/src/renderers/dom/client/__tests__/ReactDOMTreeTraversal-test.js
@@ -113,7 +113,11 @@ describe('ReactDOMTreeTraversal', () => {
var target = null;
var expectedAggregation = [];
ReactDOMTreeTraversal.traverseEnterLeave(
- target, target, argAggregator, ARG, ARG2
+ target,
+ target,
+ argAggregator,
+ ARG,
+ ARG2,
);
expect(aggregatedArgs).toEqual(expectedAggregation);
});
@@ -124,7 +128,11 @@ describe('ReactDOMTreeTraversal', () => {
var enter = getInst(parent.refs.P_P1_C1.refs.DIV_1);
var expectedAggregation = [];
ReactDOMTreeTraversal.traverseEnterLeave(
- leave, enter, argAggregator, ARG, ARG2
+ leave,
+ enter,
+ argAggregator,
+ ARG,
+ ARG2,
);
expect(aggregatedArgs).toEqual(expectedAggregation);
});
@@ -139,7 +147,11 @@ describe('ReactDOMTreeTraversal', () => {
{node: parent.refs.P_P1_C1.refs.DIV_2, phase: 'captured', arg: ARG2},
];
ReactDOMTreeTraversal.traverseEnterLeave(
- leave, enter, argAggregator, ARG, ARG2
+ leave,
+ enter,
+ argAggregator,
+ ARG,
+ ARG2,
);
expect(aggregatedArgs).toEqual(expectedAggregation);
});
@@ -152,7 +164,11 @@ describe('ReactDOMTreeTraversal', () => {
{node: parent.refs.P_P1_C1.refs.DIV_1, phase: 'bubbled', arg: ARG},
];
ReactDOMTreeTraversal.traverseEnterLeave(
- leave, enter, argAggregator, ARG, ARG2
+ leave,
+ enter,
+ argAggregator,
+ ARG,
+ ARG2,
);
expect(aggregatedArgs).toEqual(expectedAggregation);
});
@@ -167,7 +183,11 @@ describe('ReactDOMTreeTraversal', () => {
{node: parent.refs.P_P1_C1.refs.DIV, phase: 'captured', arg: ARG2},
];
ReactDOMTreeTraversal.traverseEnterLeave(
- leave, enter, argAggregator, ARG, ARG2
+ leave,
+ enter,
+ argAggregator,
+ ARG,
+ ARG2,
);
expect(aggregatedArgs).toEqual(expectedAggregation);
});
@@ -180,7 +200,11 @@ describe('ReactDOMTreeTraversal', () => {
{node: parent.refs.P, phase: 'captured', arg: ARG2},
];
ReactDOMTreeTraversal.traverseEnterLeave(
- leave, enter, argAggregator, ARG, ARG2
+ leave,
+ enter,
+ argAggregator,
+ ARG,
+ ARG2,
);
expect(aggregatedArgs).toEqual(expectedAggregation);
});
@@ -195,7 +219,11 @@ describe('ReactDOMTreeTraversal', () => {
{node: parent.refs.P, phase: 'bubbled', arg: ARG},
];
ReactDOMTreeTraversal.traverseEnterLeave(
- leave, enter, argAggregator, ARG, ARG2
+ leave,
+ enter,
+ argAggregator,
+ ARG,
+ ARG2,
);
expect(aggregatedArgs).toEqual(expectedAggregation);
});
@@ -210,7 +238,11 @@ describe('ReactDOMTreeTraversal', () => {
{node: parent.refs.P, phase: 'bubbled', arg: ARG},
];
ReactDOMTreeTraversal.traverseEnterLeave(
- leave, enter, argAggregator, ARG, ARG2
+ leave,
+ enter,
+ argAggregator,
+ ARG,
+ ARG2,
);
expect(aggregatedArgs).toEqual(expectedAggregation);
});
@@ -221,7 +253,8 @@ describe('ReactDOMTreeTraversal', () => {
var parent = renderParentIntoDocument();
var ancestors = [
// Common ancestor with self is self.
- {one: parent.refs.P_P1_C1.refs.DIV_1,
+ {
+ one: parent.refs.P_P1_C1.refs.DIV_1,
two: parent.refs.P_P1_C1.refs.DIV_1,
com: parent.refs.P_P1_C1.refs.DIV_1,
},
@@ -263,11 +296,10 @@ describe('ReactDOMTreeTraversal', () => {
var plan = ancestors[i];
var firstCommon = ReactDOMTreeTraversal.getLowestCommonAncestor(
getInst(plan.one),
- getInst(plan.two)
+ getInst(plan.two),
);
expect(firstCommon).toBe(getInst(plan.com));
}
});
});
-
});
diff --git a/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js b/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js
index 695e1927b1..ed5ce813f7 100644
--- a/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js
+++ b/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js
@@ -32,7 +32,7 @@ describe('ReactEventIndependence', () => {
dangerouslySetInnerHTML={{
__html: '. See ' +
+ 'https://fb.me/react-warning-keys for more information.\n' +
+ ' in div (at **)',
);
});
@@ -140,12 +134,12 @@ describe('ReactElementValidator', () => {
expect(console.error.calls.count()).toBe(1);
expect(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
'Warning: Each child in an array or iterator should have a unique ' +
- '"key" prop. Check the render method of `Component`. See ' +
- 'https://fb.me/react-warning-keys for more information.\n' +
- ' in div (at **)\n' +
- ' in Component (at **)\n' +
- ' in Parent (at **)\n' +
- ' in GrandParent (at **)'
+ '"key" prop. Check the render method of `Component`. See ' +
+ 'https://fb.me/react-warning-keys for more information.\n' +
+ ' in div (at **)\n' +
+ ' in Component (at **)\n' +
+ ' in Parent (at **)\n' +
+ ' in GrandParent (at **)',
);
});
@@ -165,7 +159,7 @@ describe('ReactElementValidator', () => {
-
+ ,
);
expect(console.error.calls.count()).toBe(0);
@@ -191,7 +185,7 @@ describe('ReactElementValidator', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toContain(
- 'Each child in an array or iterator should have a unique "key" prop.'
+ 'Each child in an array or iterator should have a unique "key" prop.',
);
});
@@ -258,7 +252,7 @@ describe('ReactElementValidator', () => {
return React.createElement('div', null, 'My color is ' + props.color);
}
MyComp.propTypes = {
- color: React.PropTypes.string,
+ color: PropTypes.string,
};
function ParentComp() {
return React.createElement(MyComp, {color: 123});
@@ -266,10 +260,10 @@ describe('ReactElementValidator', () => {
ReactTestUtils.renderIntoDocument(React.createElement(ParentComp));
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: Failed prop type: ' +
- 'Invalid prop `color` of type `number` supplied to `MyComp`, ' +
- 'expected `string`.\n' +
- ' in MyComp (created by ParentComp)\n' +
- ' in ParentComp'
+ 'Invalid prop `color` of type `number` supplied to `MyComp`, ' +
+ 'expected `string`.\n' +
+ ' in MyComp (created by ParentComp)\n' +
+ ' in ParentComp',
);
});
@@ -284,35 +278,35 @@ describe('ReactElementValidator', () => {
expect(console.error.calls.count()).toBe(6);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: React.createElement: type is invalid -- expected a string ' +
- '(for built-in components) or a class/function (for composite ' +
- 'components) but got: undefined. You likely forgot to export your ' +
- 'component from the file it\'s defined in.'
+ '(for built-in components) or a class/function (for composite ' +
+ 'components) but got: undefined. You likely forgot to export your ' +
+ "component from the file it's defined in.",
);
expect(console.error.calls.argsFor(1)[0]).toBe(
'Warning: React.createElement: type is invalid -- expected a string ' +
- '(for built-in components) or a class/function (for composite ' +
- 'components) but got: null.'
+ '(for built-in components) or a class/function (for composite ' +
+ 'components) but got: null.',
);
expect(console.error.calls.argsFor(2)[0]).toBe(
'Warning: React.createElement: type is invalid -- expected a string ' +
- '(for built-in components) or a class/function (for composite ' +
- 'components) but got: boolean.'
+ '(for built-in components) or a class/function (for composite ' +
+ 'components) but got: boolean.',
);
expect(console.error.calls.argsFor(3)[0]).toBe(
'Warning: React.createElement: type is invalid -- expected a string ' +
- '(for built-in components) or a class/function (for composite ' +
- 'components) but got: number.'
+ '(for built-in components) or a class/function (for composite ' +
+ 'components) but got: number.',
);
expect(console.error.calls.argsFor(4)[0]).toBe(
'Warning: React.createElement: type is invalid -- expected a string ' +
- '(for built-in components) or a class/function (for composite ' +
- 'components) but got: object.'
+ '(for built-in components) or a class/function (for composite ' +
+ 'components) but got: object.',
);
expect(console.error.calls.argsFor(5)[0]).toBe(
'Warning: React.createElement: type is invalid -- expected a string ' +
- '(for built-in components) or a class/function (for composite ' +
- 'components) but got: object. You likely forgot to export your ' +
- 'component from the file it\'s defined in.'
+ '(for built-in components) or a class/function (for composite ' +
+ 'components) but got: object. You likely forgot to export your ' +
+ "component from the file it's defined in.",
);
React.createElement('div');
expect(console.error.calls.count()).toBe(6);
@@ -327,15 +321,15 @@ describe('ReactElementValidator', () => {
ReactTestUtils.renderIntoDocument(React.createElement(ParentComp));
}).toThrowError(
'Element type is invalid: expected a string (for built-in components) ' +
- 'or a class/function (for composite components) but got: null. Check ' +
- 'the render method of `ParentComp`.'
+ 'or a class/function (for composite components) but got: null. Check ' +
+ 'the render method of `ParentComp`.',
);
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: React.createElement: type is invalid -- expected a string ' +
- '(for built-in components) or a class/function (for composite ' +
- 'components) but got: null. Check the render method of `ParentComp`.' +
- '\n in ParentComp'
+ '(for built-in components) or a class/function (for composite ' +
+ 'components) but got: null. Check the render method of `ParentComp`.' +
+ '\n in ParentComp',
);
});
@@ -347,7 +341,7 @@ describe('ReactElementValidator', () => {
return React.createElement('span', null, this.props.prop);
}
}
- Component.propTypes = {prop: React.PropTypes.string.isRequired};
+ Component.propTypes = {prop: PropTypes.string.isRequired};
Component.defaultProps = {prop: null};
ReactTestUtils.renderIntoDocument(React.createElement(Component));
@@ -355,8 +349,8 @@ describe('ReactElementValidator', () => {
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: Failed prop type: The prop `prop` is marked as required in ' +
- '`Component`, but its value is `null`.\n' +
- ' in Component'
+ '`Component`, but its value is `null`.\n' +
+ ' in Component',
);
});
@@ -368,18 +362,18 @@ describe('ReactElementValidator', () => {
return React.createElement('span', null, this.props.prop);
}
}
- Component.propTypes = {prop: React.PropTypes.string.isRequired};
+ Component.propTypes = {prop: PropTypes.string.isRequired};
Component.defaultProps = {prop: 'text'};
ReactTestUtils.renderIntoDocument(
- React.createElement(Component, {prop:null})
+ React.createElement(Component, {prop: null}),
);
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: Failed prop type: The prop `prop` is marked as required in ' +
- '`Component`, but its value is `null`.\n' +
- ' in Component'
+ '`Component`, but its value is `null`.\n' +
+ ' in Component',
);
});
@@ -392,33 +386,31 @@ describe('ReactElementValidator', () => {
}
}
Component.propTypes = {
- prop: React.PropTypes.string.isRequired,
+ prop: PropTypes.string.isRequired,
};
+ ReactTestUtils.renderIntoDocument(React.createElement(Component));
ReactTestUtils.renderIntoDocument(
- React.createElement(Component)
- );
- ReactTestUtils.renderIntoDocument(
- React.createElement(Component, {prop: 42})
+ React.createElement(Component, {prop: 42}),
);
expect(console.error.calls.count()).toBe(2);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: Failed prop type: ' +
- 'The prop `prop` is marked as required in `Component`, but its value ' +
- 'is `undefined`.\n' +
- ' in Component'
+ 'The prop `prop` is marked as required in `Component`, but its value ' +
+ 'is `undefined`.\n' +
+ ' in Component',
);
expect(console.error.calls.argsFor(1)[0]).toBe(
'Warning: Failed prop type: ' +
- 'Invalid prop `prop` of type `number` supplied to ' +
- '`Component`, expected `string`.\n' +
- ' in Component'
+ 'Invalid prop `prop` of type `number` supplied to ' +
+ '`Component`, expected `string`.\n' +
+ ' in Component',
);
ReactTestUtils.renderIntoDocument(
- React.createElement(Component, {prop: 'string'})
+ React.createElement(Component, {prop: 'string'}),
);
// Should not error for strings
@@ -431,42 +423,41 @@ describe('ReactElementValidator', () => {
class Component extends React.Component {
render() {
return React.createElement('span', null, this.props.myProp.value);
-
}
}
Component.propTypes = {
- myProp: React.PropTypes.shape,
+ myProp: PropTypes.shape,
};
ReactTestUtils.renderIntoDocument(
- React.createElement(Component, {myProp: {value: 'hi'}})
+ React.createElement(Component, {myProp: {value: 'hi'}}),
);
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toBe(
'Warning: Component: type specification of prop `myProp` is invalid; ' +
- 'the type checker function must return `null` or an `Error` but ' +
- 'returned a function. You may have forgotten to pass an argument to ' +
- 'the type checker creator (arrayOf, instanceOf, objectOf, oneOf, ' +
- 'oneOfType, and shape all require an argument).'
+ 'the type checker function must return `null` or an `Error` but ' +
+ 'returned a function. You may have forgotten to pass an argument to ' +
+ 'the type checker creator (arrayOf, instanceOf, objectOf, oneOf, ' +
+ 'oneOfType, and shape all require an argument).',
);
});
it('should warn when accessing .type on an element factory', () => {
- spyOn(console, 'error');
+ spyOn(console, 'warn');
function TestComponent() {
return ;
}
var TestFactory = React.createFactory(TestComponent);
expect(TestFactory.type).toBe(TestComponent);
- expect(console.error.calls.count()).toBe(1);
- expect(console.error.calls.argsFor(0)[0]).toBe(
+ expect(console.warn.calls.count()).toBe(1);
+ expect(console.warn.calls.argsFor(0)[0]).toBe(
'Warning: Factory.type is deprecated. Access the class directly before ' +
- 'passing it to createFactory.'
+ 'passing it to createFactory.',
);
// Warn once, not again
expect(TestFactory.type).toBe(TestComponent);
- expect(console.error.calls.count()).toBe(1);
+ expect(console.warn.calls.count()).toBe(1);
});
it('does not warn when using DOM node as children', () => {
@@ -511,7 +502,7 @@ describe('ReactElementValidator', () => {
// shouldn't blow up either.
var child = {
- $$typeof: ().$$typeof,
+ $$typeof: .$$typeof,
type: 'span',
key: null,
ref: null,
@@ -529,10 +520,60 @@ describe('ReactElementValidator', () => {
expect(console.error.calls.count()).toBe(1);
expect(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
'Warning: React.createElement: type is invalid -- expected a string ' +
- '(for built-in components) or a class/function (for composite ' +
- 'components) but got: undefined. You likely forgot to export your ' +
- 'component from the file it\'s defined in. Check your code at **.'
+ '(for built-in components) or a class/function (for composite ' +
+ 'components) but got: undefined. You likely forgot to export your ' +
+ "component from the file it's defined in. Check your code at **.",
);
});
+ it('provides stack via non-standard console.reactStack for invalid types', () => {
+ spyOn(console, 'error');
+
+ function Foo() {
+ var Bad = undefined;
+ return React.createElement(Bad);
+ }
+
+ function App() {
+ return React.createElement('div', null, React.createElement(Foo));
+ }
+
+ try {
+ console.reactStack = jest.fn();
+ console.reactStackEnd = jest.fn();
+
+ expect(() => {
+ ReactTestUtils.renderIntoDocument(React.createElement(App));
+ }).toThrow(
+ 'Element type is invalid: expected a string (for built-in components) ' +
+ 'or a class/function (for composite components) but got: undefined. ' +
+ "You likely forgot to export your component from the file it's " +
+ 'defined in. Check the render method of `Foo`.',
+ );
+
+ expect(console.reactStack.mock.calls.length).toBe(1);
+ expect(console.reactStackEnd.mock.calls.length).toBe(1);
+
+ var stack = console.reactStack.mock.calls[0][0];
+ expect(Array.isArray(stack)).toBe(true);
+ expect(stack.map(frame => frame.name)).toEqual([
+ 'Foo', // is inside Foo
+ 'App', // is inside App
+ 'App', //
,
);
// Change the className of theDog. It will use the same element
myDiv = ReactTestUtils.renderIntoDocument(
is inside App
+ null, // is outside a component
+ ]);
+ expect(
+ stack.map(frame => frame.fileName && frame.fileName.slice(-8)),
+ ).toEqual([null, null, null, null]);
+ expect(stack.map(frame => frame.lineNumber)).toEqual([
+ null,
+ null,
+ null,
+ null,
+ ]);
+ } finally {
+ delete console.reactStack;
+ delete console.reactStackEnd;
+ }
+ });
});
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
index 26cb0fa205..ab9f56bbc8 100644
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
+++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -28,16 +28,18 @@ function typeCheckFail(declaration, value, message) {
'testComponent',
'prop',
null,
- ReactPropTypesSecret
+ ReactPropTypesSecret,
);
expect(error instanceof Error).toBe(true);
expect(error.message).toBe(message);
}
function typeCheckFailRequiredValues(declaration) {
- var specifiedButIsNullMsg = 'The prop `testProp` is marked as required in ' +
+ var specifiedButIsNullMsg =
+ 'The prop `testProp` is marked as required in ' +
'`testComponent`, but its value is `null`.';
- var unspecifiedMsg = 'The prop `testProp` is marked as required in ' +
+ var unspecifiedMsg =
+ 'The prop `testProp` is marked as required in ' +
'`testComponent`, but its value is \`undefined\`.';
var props1 = {testProp: null};
var error1 = declaration(
@@ -46,7 +48,7 @@ function typeCheckFailRequiredValues(declaration) {
'testComponent',
'prop',
null,
- ReactPropTypesSecret
+ ReactPropTypesSecret,
);
expect(error1 instanceof Error).toBe(true);
expect(error1.message).toBe(specifiedButIsNullMsg);
@@ -57,7 +59,7 @@ function typeCheckFailRequiredValues(declaration) {
'testComponent',
'prop',
null,
- ReactPropTypesSecret
+ ReactPropTypesSecret,
);
expect(error2 instanceof Error).toBe(true);
expect(error2.message).toBe(unspecifiedMsg);
@@ -68,7 +70,7 @@ function typeCheckFailRequiredValues(declaration) {
'testComponent',
'prop',
null,
- ReactPropTypesSecret
+ ReactPropTypesSecret,
);
expect(error3 instanceof Error).toBe(true);
expect(error3.message).toBe(unspecifiedMsg);
@@ -82,7 +84,7 @@ function typeCheckPass(declaration, value) {
'testComponent',
'prop',
null,
- ReactPropTypesSecret
+ ReactPropTypesSecret,
);
expect(error).toBe(null);
}
@@ -92,16 +94,11 @@ function expectWarningInDevelopment(declaration, value) {
var propName = 'testProp' + Math.random().toString();
var componentName = 'testComponent' + Math.random().toString();
for (var i = 0; i < 3; i++) {
- declaration(
- props,
- propName,
- componentName,
- 'prop'
- );
+ declaration(props, propName, componentName, 'prop');
}
expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toContain(
- 'You are manually calling a React.PropTypes validation '
+ 'You are manually calling a React.PropTypes validation ',
);
console.error.calls.reset();
}
@@ -121,31 +118,31 @@ describe('ReactPropTypes', () => {
PropTypes.string,
[],
'Invalid prop `testProp` of type `array` supplied to ' +
- '`testComponent`, expected `string`.'
+ '`testComponent`, expected `string`.',
);
typeCheckFail(
PropTypes.string,
false,
'Invalid prop `testProp` of type `boolean` supplied to ' +
- '`testComponent`, expected `string`.'
+ '`testComponent`, expected `string`.',
);
typeCheckFail(
PropTypes.string,
0,
'Invalid prop `testProp` of type `number` supplied to ' +
- '`testComponent`, expected `string`.'
+ '`testComponent`, expected `string`.',
);
typeCheckFail(
PropTypes.string,
{},
'Invalid prop `testProp` of type `object` supplied to ' +
- '`testComponent`, expected `string`.'
+ '`testComponent`, expected `string`.',
);
typeCheckFail(
PropTypes.string,
Symbol(),
'Invalid prop `testProp` of type `symbol` supplied to ' +
- '`testComponent`, expected `string`.'
+ '`testComponent`, expected `string`.',
);
});
@@ -154,13 +151,13 @@ describe('ReactPropTypes', () => {
PropTypes.string,
new Date(),
'Invalid prop `testProp` of type `date` supplied to ' +
- '`testComponent`, expected `string`.'
+ '`testComponent`, expected `string`.',
);
typeCheckFail(
PropTypes.string,
/please/,
'Invalid prop `testProp` of type `regexp` supplied to ' +
- '`testComponent`, expected `string`.'
+ '`testComponent`, expected `string`.',
);
});
@@ -260,9 +257,9 @@ describe('ReactPropTypes', () => {
describe('ArrayOf Type', () => {
it('should fail for invalid argument', () => {
typeCheckFail(
- PropTypes.arrayOf({ foo: PropTypes.string }),
- { foo: 'bar' },
- 'Property `testProp` of component `testComponent` has invalid PropType notation inside arrayOf.'
+ PropTypes.arrayOf({foo: PropTypes.string}),
+ {foo: 'bar'},
+ 'Property `testProp` of component `testComponent` has invalid PropType notation inside arrayOf.',
);
});
@@ -276,14 +273,14 @@ describe('ReactPropTypes', () => {
it('should support arrayOf with complex types', () => {
typeCheckPass(
PropTypes.arrayOf(PropTypes.shape({a: PropTypes.number.isRequired})),
- [{a: 1}, {a: 2}]
+ [{a: 1}, {a: 2}],
);
function Thing() {}
- typeCheckPass(
- PropTypes.arrayOf(PropTypes.instanceOf(Thing)),
- [new Thing(), new Thing()]
- );
+ typeCheckPass(PropTypes.arrayOf(PropTypes.instanceOf(Thing)), [
+ new Thing(),
+ new Thing(),
+ ]);
});
it('should warn with invalid items in the array', () => {
@@ -291,7 +288,7 @@ describe('ReactPropTypes', () => {
PropTypes.arrayOf(PropTypes.number),
[1, 2, 'b'],
'Invalid prop `testProp[2]` of type `string` supplied to ' +
- '`testComponent`, expected `number`.'
+ '`testComponent`, expected `number`.',
);
});
@@ -303,7 +300,9 @@ describe('ReactPropTypes', () => {
PropTypes.arrayOf(PropTypes.instanceOf(Thing)),
[new Thing(), 'xyz'],
'Invalid prop `testProp[1]` of type `String` supplied to ' +
- '`testComponent`, expected instance of `' + name + '`.'
+ '`testComponent`, expected instance of `' +
+ name +
+ '`.',
);
});
@@ -312,19 +311,19 @@ describe('ReactPropTypes', () => {
PropTypes.arrayOf(PropTypes.number),
{'0': 'maybe-array', length: 1},
'Invalid prop `testProp` of type `object` supplied to ' +
- '`testComponent`, expected an array.'
+ '`testComponent`, expected an array.',
);
typeCheckFail(
PropTypes.arrayOf(PropTypes.number),
123,
'Invalid prop `testProp` of type `number` supplied to ' +
- '`testComponent`, expected an array.'
+ '`testComponent`, expected an array.',
);
typeCheckFail(
PropTypes.arrayOf(PropTypes.number),
'string',
'Invalid prop `testProp` of type `string` supplied to ' +
- '`testComponent`, expected an array.'
+ '`testComponent`, expected an array.',
);
});
@@ -339,26 +338,32 @@ describe('ReactPropTypes', () => {
it('should warn for missing required values', () => {
typeCheckFailRequiredValues(
- PropTypes.arrayOf(PropTypes.number).isRequired
+ PropTypes.arrayOf(PropTypes.number).isRequired,
);
});
it('should warn if called manually in development', () => {
spyOn(console, 'error');
+ expectWarningInDevelopment(PropTypes.arrayOf({foo: PropTypes.string}), {
+ foo: 'bar',
+ });
+ expectWarningInDevelopment(PropTypes.arrayOf(PropTypes.number), [
+ 1,
+ 2,
+ 'b',
+ ]);
+ expectWarningInDevelopment(PropTypes.arrayOf(PropTypes.number), {
+ '0': 'maybe-array',
+ length: 1,
+ });
expectWarningInDevelopment(
- PropTypes.arrayOf({ foo: PropTypes.string }),
- { foo: 'bar' }
+ PropTypes.arrayOf(PropTypes.number).isRequired,
+ null,
);
expectWarningInDevelopment(
- PropTypes.arrayOf(PropTypes.number),
- [1, 2, 'b']
+ PropTypes.arrayOf(PropTypes.number).isRequired,
+ undefined,
);
- expectWarningInDevelopment(
- PropTypes.arrayOf(PropTypes.number),
- {'0': 'maybe-array', length: 1}
- );
- expectWarningInDevelopment(PropTypes.arrayOf(PropTypes.number).isRequired, null);
- expectWarningInDevelopment(PropTypes.arrayOf(PropTypes.number).isRequired, undefined);
});
});
@@ -384,25 +389,25 @@ describe('ReactPropTypes', () => {
PropTypes.element,
[, ],
'Invalid prop `testProp` of type `array` supplied to `testComponent`, ' +
- 'expected a single ReactElement.'
+ 'expected a single ReactElement.',
);
typeCheckFail(
PropTypes.element,
123,
'Invalid prop `testProp` of type `number` supplied to `testComponent`, ' +
- 'expected a single ReactElement.'
+ 'expected a single ReactElement.',
);
typeCheckFail(
PropTypes.element,
'foo',
'Invalid prop `testProp` of type `string` supplied to `testComponent`, ' +
- 'expected a single ReactElement.'
+ 'expected a single ReactElement.',
);
typeCheckFail(
PropTypes.element,
false,
'Invalid prop `testProp` of type `boolean` supplied to `testComponent`, ' +
- 'expected a single ReactElement.'
+ 'expected a single ReactElement.',
);
});
@@ -443,7 +448,6 @@ describe('ReactPropTypes', () => {
expectWarningInDevelopment(PropTypes.element.isRequired, null);
expectWarningInDevelopment(PropTypes.element.isRequired, undefined);
});
-
});
describe('Instance Types', () => {
@@ -458,43 +462,57 @@ describe('ReactPropTypes', () => {
PropTypes.instanceOf(Person),
false,
'Invalid prop `testProp` of type `Boolean` supplied to ' +
- '`testComponent`, expected instance of `' + personName + '`.'
+ '`testComponent`, expected instance of `' +
+ personName +
+ '`.',
);
typeCheckFail(
PropTypes.instanceOf(Person),
{},
'Invalid prop `testProp` of type `Object` supplied to ' +
- '`testComponent`, expected instance of `' + personName + '`.'
+ '`testComponent`, expected instance of `' +
+ personName +
+ '`.',
);
typeCheckFail(
PropTypes.instanceOf(Person),
'',
'Invalid prop `testProp` of type `String` supplied to ' +
- '`testComponent`, expected instance of `' + personName + '`.'
+ '`testComponent`, expected instance of `' +
+ personName +
+ '`.',
);
typeCheckFail(
PropTypes.instanceOf(Date),
{},
'Invalid prop `testProp` of type `Object` supplied to ' +
- '`testComponent`, expected instance of `' + dateName + '`.'
+ '`testComponent`, expected instance of `' +
+ dateName +
+ '`.',
);
typeCheckFail(
PropTypes.instanceOf(RegExp),
{},
'Invalid prop `testProp` of type `Object` supplied to ' +
- '`testComponent`, expected instance of `' + regExpName + '`.'
+ '`testComponent`, expected instance of `' +
+ regExpName +
+ '`.',
);
typeCheckFail(
PropTypes.instanceOf(Person),
new Cat(),
'Invalid prop `testProp` of type `Cat` supplied to ' +
- '`testComponent`, expected instance of `' + personName + '`.'
+ '`testComponent`, expected instance of `' +
+ personName +
+ '`.',
);
typeCheckFail(
PropTypes.instanceOf(Person),
Object.create(null),
'Invalid prop `testProp` of type `<>` supplied to ' +
- '`testComponent`, expected instance of `' + personName + '`.'
+ '`testComponent`, expected instance of `' +
+ personName +
+ '`.',
);
});
@@ -524,9 +542,11 @@ describe('ReactPropTypes', () => {
expectWarningInDevelopment(PropTypes.instanceOf(Date), {});
expectWarningInDevelopment(PropTypes.instanceOf(Date), new Date());
expectWarningInDevelopment(PropTypes.instanceOf(Date).isRequired, {});
- expectWarningInDevelopment(PropTypes.instanceOf(Date).isRequired, new Date());
+ expectWarningInDevelopment(
+ PropTypes.instanceOf(Date).isRequired,
+ new Date(),
+ );
});
-
});
describe('React Component Types', () => {
@@ -539,7 +559,8 @@ describe('ReactPropTypes', () => {
});
it('should warn for invalid values', () => {
- var failMessage = 'Invalid prop `testProp` supplied to ' +
+ var failMessage =
+ 'Invalid prop `testProp` supplied to ' +
'`testComponent`, expected a ReactNode.';
typeCheckFail(PropTypes.node, true, failMessage);
typeCheckFail(PropTypes.node, function() {}, failMessage);
@@ -565,18 +586,21 @@ describe('ReactPropTypes', () => {
// Object of renderable things
var frag = ReactFragment.create;
- typeCheckPass(PropTypes.node, frag({
- k0: 123,
- k1: 'Some string',
- k2: ,
- k3: frag({
- k30: console.error).calls.count()).toBe(2);
- expect((console.error).calls.argsFor(0)[0]).toContain(
+ expect((console.warn).calls.count()).toBe(2);
+ expect((console.warn).calls.argsFor(0)[0]).toContain(
'replaceState(...) is deprecated in plain JavaScript React classes'
);
- expect((console.error).calls.argsFor(1)[0]).toContain(
+ expect((console.warn).calls.argsFor(1)[0]).toContain(
'isMounted(...) is deprecated in plain JavaScript React classes'
);
});
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
index 1b897494f6..fc494b436c 100644
--- a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
+++ b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
@@ -64,7 +64,7 @@ describe('ReactJSXElement', () => {
it('returns an immutable element', () => {
var element = {[ ;
+ void (
+ {[
+ );
expect(console.error.calls.count()).toBe(0);
});
@@ -193,7 +193,7 @@ describe('ReactJSXElementValidator', () => {
}
}
MyComp.propTypes = {
- color: React.PropTypes.string,
+ color: PropTypes.string,
};
class ParentComp extends React.Component {
render() {
@@ -203,10 +203,10 @@ describe('ReactJSXElementValidator', () => {
ReactTestUtils.renderIntoDocument( is inside Foo
+ 'App', // is inside App
+ 'App', // A
C
,
- container
+ container,
);
expect(inst.className).toBe('red');
@@ -119,10 +119,7 @@ describe('ReactDOMProduction', () => {
}
var container = document.createElement('div');
- var inst = ReactDOM.render(
- is inside App
+ null, // is outside a component
+ ]);
+ expect(
+ stack.map(frame => frame.fileName && frame.fileName.slice(-8)),
+ ).toEqual(['-test.js', '-test.js', '-test.js', '-test.js']);
+ expect(stack.map(frame => typeof frame.lineNumber)).toEqual([
+ 'number',
+ 'number',
+ 'number',
+ 'number',
+ ]);
+ } finally {
+ delete console.reactStack;
+ delete console.reactStackEnd;
+ }
+ });
});
diff --git a/src/renderers/art/ReactART.js b/src/renderers/art/ReactART.js
index be85e1f238..7550e330d2 100644
--- a/src/renderers/art/ReactART.js
+++ b/src/renderers/art/ReactART.js
@@ -12,7 +12,7 @@
'use strict';
require('art/modes/current').setCurrent(
- require('art/modes/fast-noSideEffects') // Flip this to DOM mode for debugging
+ require('art/modes/fast-noSideEffects'), // Flip this to DOM mode for debugging
);
const Transform = require('art/core/transform');
@@ -24,6 +24,7 @@ const ReactInstanceMap = require('ReactInstanceMap');
const ReactMultiChild = require('ReactMultiChild');
const ReactUpdates = require('ReactUpdates');
+const createReactClass = require('createClass');
const emptyObject = require('emptyObject');
const invariant = require('invariant');
@@ -67,8 +68,10 @@ function createComponent(name) {
*/
function injectAfter(parentNode, referenceNode, node) {
let beforeNode;
- if (node.parentNode === parentNode &&
- node.previousSibling === referenceNode) {
+ if (
+ node.parentNode === parentNode &&
+ node.previousSibling === referenceNode
+ ) {
return;
}
if (referenceNode == null) {
@@ -83,7 +86,7 @@ function injectAfter(parentNode, referenceNode, node) {
// checks and the behavior isn't well-defined.
invariant(
node !== beforeNode,
- 'ReactART: Can not insert node before itself'
+ 'ReactART: Can not insert node before itself',
);
node.injectBefore(beforeNode);
} else if (node.parentNode !== parentNode) {
@@ -94,7 +97,6 @@ function injectAfter(parentNode, referenceNode, node) {
// ContainerMixin for components that can hold ART nodes
const ContainerMixin = assign({}, ReactMultiChild.Mixin, {
-
/**
* Moves a child component to the supplied index.
*
@@ -153,11 +155,7 @@ const ContainerMixin = assign({}, ReactMultiChild.Mixin, {
// Shorthands
mountAndInjectChildren: function(children, transaction, context) {
- const mountedImages = this.mountChildren(
- children,
- transaction,
- context
- );
+ const mountedImages = this.mountChildren(children, transaction, context);
// Each mount image corresponds to one of the flattened children
let i = 0;
for (let key in this._renderedChildren) {
@@ -168,15 +166,13 @@ const ContainerMixin = assign({}, ReactMultiChild.Mixin, {
i++;
}
}
- }
-
+ },
});
// Surface is a React DOM Component, not an ART component. It serves as the
// entry point into the ART reconciler.
-const Surface = React.createClass({
-
+const Surface = createReactClass({
displayName: 'Surface',
mixins: [ContainerMixin],
@@ -192,15 +188,17 @@ const Surface = React.createClass({
this,
this.props.children,
transaction,
- ReactInstanceMap.get(this)._context
+ ReactInstanceMap.get(this)._context,
);
ReactUpdates.ReactReconcileTransaction.release(transaction);
},
componentDidUpdate: function(oldProps) {
const node = this.node;
- if (this.props.width != oldProps.width ||
- this.props.height != oldProps.height) {
+ if (
+ this.props.width != oldProps.width ||
+ this.props.height != oldProps.height
+ ) {
node.resize(+this.props.width, +this.props.height);
}
@@ -210,7 +208,7 @@ const Surface = React.createClass({
this,
this.props.children,
transaction,
- ReactInstanceMap.get(this)._context
+ ReactInstanceMap.get(this)._context,
);
ReactUpdates.ReactReconcileTransaction.release(transaction);
@@ -241,8 +239,7 @@ const Surface = React.createClass({
title={props.title}
/>
);
- }
-
+ },
});
// Various nodes that can go into a surface
@@ -253,11 +250,10 @@ const EventTypes = {
onMouseOut: 'mouseout',
onMouseUp: 'mouseup',
onMouseDown: 'mousedown',
- onClick: 'click'
+ onClick: 'click',
};
const NodeMixin = {
-
construct: function(element) {
this._currentElement = element;
},
@@ -312,10 +308,12 @@ const NodeMixin = {
applyNodeProps: function(oldProps, props) {
const node = this.node;
- const scaleX = props.scaleX != null ? props.scaleX :
- props.scale != null ? props.scale : 1;
- const scaleY = props.scaleY != null ? props.scaleY :
- props.scale != null ? props.scale : 1;
+ const scaleX = props.scaleX != null
+ ? props.scaleX
+ : props.scale != null ? props.scale : 1;
+ const scaleY = props.scaleY != null
+ ? props.scaleY
+ : props.scale != null ? props.scale : 1;
pooledTransform
.transformTo(1, 0, 0, 1, 0, 0)
@@ -327,9 +325,14 @@ const NodeMixin = {
pooledTransform.transform(props.transform);
}
- if (node.xx !== pooledTransform.xx || node.yx !== pooledTransform.yx ||
- node.xy !== pooledTransform.xy || node.yy !== pooledTransform.yy ||
- node.x !== pooledTransform.x || node.y !== pooledTransform.y) {
+ if (
+ node.xx !== pooledTransform.xx ||
+ node.yx !== pooledTransform.yx ||
+ node.xy !== pooledTransform.xy ||
+ node.yy !== pooledTransform.yy ||
+ node.x !== pooledTransform.x ||
+ node.y !== pooledTransform.y
+ ) {
node.transformTo(pooledTransform);
}
@@ -357,21 +360,19 @@ const NodeMixin = {
mountComponentIntoNode: function(rootID, container) {
throw new Error(
'You cannot render an ART component standalone. ' +
- 'You need to wrap it in a Surface.'
+ 'You need to wrap it in a Surface.',
);
- }
-
+ },
};
// Group
const Group = createComponent('Group', NodeMixin, ContainerMixin, {
-
mountComponent: function(
transaction,
nativeParent,
nativeContainerInfo,
- context
+ context,
) {
this.node = Mode.Group();
const props = this._currentElement.props;
@@ -397,55 +398,54 @@ const Group = createComponent('Group', NodeMixin, ContainerMixin, {
unmountComponent: function() {
this.destroyEventListeners();
this.unmountChildren();
- }
-
+ },
});
// ClippingRectangle
const ClippingRectangle = createComponent(
- 'ClippingRectangle', NodeMixin, ContainerMixin, {
+ 'ClippingRectangle',
+ NodeMixin,
+ ContainerMixin,
+ {
+ mountComponent: function(
+ transaction,
+ nativeParent,
+ nativeContainerInfo,
+ context,
+ ) {
+ this.node = Mode.ClippingRectangle();
+ const props = this._currentElement.props;
+ this.applyClippingProps(emptyObject, props);
+ this.mountAndInjectChildren(props.children, transaction, context);
+ return this.node;
+ },
- mountComponent: function(
- transaction,
- nativeParent,
- nativeContainerInfo,
- context
- ) {
- this.node = Mode.ClippingRectangle();
- const props = this._currentElement.props;
- this.applyClippingProps(emptyObject, props);
- this.mountAndInjectChildren(props.children, transaction, context);
- return this.node;
+ receiveComponent: function(nextComponent, transaction, context) {
+ const props = nextComponent.props;
+ const oldProps = this._currentElement.props;
+ this.applyClippingProps(oldProps, props);
+ this.updateChildren(props.children, transaction, context);
+ this._currentElement = nextComponent;
+ },
+
+ applyClippingProps: function(oldProps, props) {
+ this.node.width = props.width;
+ this.node.height = props.height;
+ this.node.x = props.x;
+ this.node.y = props.y;
+ this.applyNodeProps(oldProps, props);
+ },
+
+ unmountComponent: function() {
+ this.destroyEventListeners();
+ this.unmountChildren();
+ },
},
-
- receiveComponent: function(nextComponent, transaction, context) {
- const props = nextComponent.props;
- const oldProps = this._currentElement.props;
- this.applyClippingProps(oldProps, props);
- this.updateChildren(props.children, transaction, context);
- this._currentElement = nextComponent;
- },
-
- applyClippingProps: function(oldProps, props) {
- this.node.width = props.width;
- this.node.height = props.height;
- this.node.x = props.x;
- this.node.y = props.y;
- this.applyNodeProps(oldProps, props);
- },
-
- unmountComponent: function() {
- this.destroyEventListeners();
- this.unmountChildren();
- }
-
-});
-
+);
// Renderables
const RenderableMixin = assign({}, NodeMixin, {
-
applyRenderableProps: function(oldProps, props) {
if (oldProps.fill !== props.fill) {
if (props.fill && props.fill.applyFill) {
@@ -468,7 +468,7 @@ const RenderableMixin = assign({}, NodeMixin, {
props.strokeWidth,
props.strokeCap,
props.strokeJoin,
- props.strokeDash
+ props.strokeDash,
);
}
this.applyNodeProps(oldProps, props);
@@ -476,14 +476,12 @@ const RenderableMixin = assign({}, NodeMixin, {
unmountComponent: function() {
this.destroyEventListeners();
- }
-
+ },
});
// Shape
const Shape = createComponent('Shape', RenderableMixin, {
-
construct: function(element) {
this._currentElement = element;
this._oldDelta = null;
@@ -494,7 +492,7 @@ const Shape = createComponent('Shape', RenderableMixin, {
transaction,
nativeParent,
nativeContainerInfo,
- context
+ context,
) {
this.node = Mode.Shape();
const props = this._currentElement.props;
@@ -514,30 +512,25 @@ const Shape = createComponent('Shape', RenderableMixin, {
const oldPath = this._oldPath;
const path = props.d || childrenAsString(props.children);
- if (path.delta !== oldDelta ||
- path !== oldPath ||
- oldProps.width !== props.width ||
- oldProps.height !== props.height) {
-
- this.node.draw(
- path,
- props.width,
- props.height
- );
+ if (
+ path.delta !== oldDelta ||
+ path !== oldPath ||
+ oldProps.width !== props.width ||
+ oldProps.height !== props.height
+ ) {
+ this.node.draw(path, props.width, props.height);
this._oldPath = path;
this._oldDelta = path.delta;
}
this.applyRenderableProps(oldProps, props);
- }
-
+ },
});
// Text
const Text = createComponent('Text', RenderableMixin, {
-
construct: function(element) {
this._currentElement = element;
this._oldString = null;
@@ -547,7 +540,7 @@ const Text = createComponent('Text', RenderableMixin, {
transaction,
nativeParent,
nativeContainerInfo,
- context
+ context,
) {
const props = this._currentElement.props;
const newString = childrenAsString(props.children);
@@ -580,23 +573,19 @@ const Text = createComponent('Text', RenderableMixin, {
const oldString = this._oldString;
const newString = childrenAsString(props.children);
- if (oldString !== newString ||
- !this.isSameFont(oldProps.font, props.font) ||
- oldProps.alignment !== props.alignment ||
- oldProps.path !== props.path) {
- this.node.draw(
- newString,
- props.font,
- props.alignment,
- props.path
- );
+ if (
+ oldString !== newString ||
+ !this.isSameFont(oldProps.font, props.font) ||
+ oldProps.alignment !== props.alignment ||
+ oldProps.path !== props.path
+ ) {
+ this.node.draw(newString, props.font, props.alignment, props.path);
this._oldString = newString;
}
this.applyRenderableProps(oldProps, props);
this._currentElement = nextComponent;
- }
-
+ },
});
// Declarative fill type objects - API design not finalized
diff --git a/src/renderers/art/__tests__/ReactART-test.js b/src/renderers/art/__tests__/ReactART-test.js
index b8cfea1c24..7d9ce37ffe 100644
--- a/src/renderers/art/__tests__/ReactART-test.js
+++ b/src/renderers/art/__tests__/ReactART-test.js
@@ -49,7 +49,6 @@ function testDOMNodeStructure(domNode, expectedStructure) {
}
describe('ReactART', () => {
-
beforeEach(() => {
ARTCurrentMode.setCurrent(ARTSVGMode);
@@ -59,29 +58,33 @@ describe('ReactART', () => {
TestComponent = class extends React.Component {
render() {
-
- var a =
+ var a = (
M64.564,38.583H54l0.008-5.834c0-3.035,0.293-4.666,4.657-4.666
h5.833V16.429h-9.33c-11.213,0-15.159,5.654-15.159,15.16v6.994
h-6.99v11.652h6.99v33.815H54V50.235h9.331L64.564,38.583z
- ;
+
+ );
var c =
- {chars.map((text) =>
);
}
@@ -225,7 +229,7 @@ describe('ReactART', () => {
-
+ ,
);
expect(mounted).toBe(true);
});
@@ -294,5 +298,4 @@ describe('ReactART', () => {
ReactDOM.render(B
C
,
- container
+ container,
);
expect(container.firstChild).toBe(inst);
@@ -75,7 +75,7 @@ describe('ReactDOMProduction', () => {
GRANDPARENT = c}>
-
,
);
// Now, put theDog back. It's now a different DOM node.
myDiv = ReactTestUtils.renderIntoDocument(
PARENT = c}>
-
,
);
// Remove theDog - this should purge the cache
myDiv = ReactTestUtils.renderIntoDocument(
CHILD = c} />
+
,
);
// Warm the cache with theDog
myDiv = ReactTestUtils.renderIntoDocument(
(GRANDPARENT = c)}>
+
,
);
idCallOrder = [];
@@ -108,34 +107,31 @@ describe('ReactBrowserEventEmitter', () => {
expect(LISTENER.mock.calls.length).toBe(1);
});
- it(
- 'should not invoke handlers if ReactBrowserEventEmitter is disabled',
- () => {
- registerSimpleTestHandler();
- ReactBrowserEventEmitter.setEnabled(false);
- ReactTestUtils.SimulateNative.click(CHILD);
- expect(LISTENER.mock.calls.length).toBe(0);
- ReactBrowserEventEmitter.setEnabled(true);
- ReactTestUtils.SimulateNative.click(CHILD);
- expect(LISTENER.mock.calls.length).toBe(1);
- }
- );
+ it('should not invoke handlers if ReactBrowserEventEmitter is disabled', () => {
+ registerSimpleTestHandler();
+ ReactBrowserEventEmitter.setEnabled(false);
+ ReactTestUtils.SimulateNative.click(CHILD);
+ expect(LISTENER.mock.calls.length).toBe(0);
+ ReactBrowserEventEmitter.setEnabled(true);
+ ReactTestUtils.SimulateNative.click(CHILD);
+ expect(LISTENER.mock.calls.length).toBe(1);
+ });
it('should bubble simply', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(CHILD))
+ recordID.bind(null, getInternal(CHILD)),
);
EventPluginHub.putListener(
getInternal(PARENT),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(PARENT))
+ recordID.bind(null, getInternal(PARENT)),
);
EventPluginHub.putListener(
getInternal(GRANDPARENT),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(GRANDPARENT))
+ recordID.bind(null, getInternal(GRANDPARENT)),
);
ReactTestUtils.Simulate.click(CHILD);
expect(idCallOrder.length).toBe(3);
@@ -148,20 +144,16 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(CHILD))
- );
- EventPluginHub.putListener(
- getInternal(PARENT),
- ON_CLICK_KEY,
- function() {
- recordID(getInternal(PARENT));
- throw new Error('Handler interrupted');
- }
+ recordID.bind(null, getInternal(CHILD)),
);
+ EventPluginHub.putListener(getInternal(PARENT), ON_CLICK_KEY, function() {
+ recordID(getInternal(PARENT));
+ throw new Error('Handler interrupted');
+ });
EventPluginHub.putListener(
getInternal(GRANDPARENT),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(GRANDPARENT))
+ recordID.bind(null, getInternal(GRANDPARENT)),
);
expect(function() {
ReactTestUtils.Simulate.click(CHILD);
@@ -173,30 +165,24 @@ describe('ReactBrowserEventEmitter', () => {
});
it('should set currentTarget', () => {
- EventPluginHub.putListener(
- getInternal(CHILD),
- ON_CLICK_KEY,
- function(event) {
- recordID(getInternal(CHILD));
- expect(event.currentTarget).toBe(CHILD);
- }
- );
- EventPluginHub.putListener(
- getInternal(PARENT),
- ON_CLICK_KEY,
- function(event) {
- recordID(getInternal(PARENT));
- expect(event.currentTarget).toBe(PARENT);
- }
- );
- EventPluginHub.putListener(
- getInternal(GRANDPARENT),
- ON_CLICK_KEY,
- function(event) {
- recordID(getInternal(GRANDPARENT));
- expect(event.currentTarget).toBe(GRANDPARENT);
- }
- );
+ EventPluginHub.putListener(getInternal(CHILD), ON_CLICK_KEY, function(
+ event,
+ ) {
+ recordID(getInternal(CHILD));
+ expect(event.currentTarget).toBe(CHILD);
+ });
+ EventPluginHub.putListener(getInternal(PARENT), ON_CLICK_KEY, function(
+ event,
+ ) {
+ recordID(getInternal(PARENT));
+ expect(event.currentTarget).toBe(PARENT);
+ });
+ EventPluginHub.putListener(getInternal(GRANDPARENT), ON_CLICK_KEY, function(
+ event,
+ ) {
+ recordID(getInternal(GRANDPARENT));
+ expect(event.currentTarget).toBe(GRANDPARENT);
+ });
ReactTestUtils.Simulate.click(CHILD);
expect(idCallOrder.length).toBe(3);
expect(idCallOrder[0]).toBe(getInternal(CHILD));
@@ -208,17 +194,17 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(CHILD))
+ recordID.bind(null, getInternal(CHILD)),
);
EventPluginHub.putListener(
getInternal(PARENT),
ON_CLICK_KEY,
- recordIDAndStopPropagation.bind(null, getInternal(PARENT))
+ recordIDAndStopPropagation.bind(null, getInternal(PARENT)),
);
EventPluginHub.putListener(
getInternal(GRANDPARENT),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(GRANDPARENT))
+ recordID.bind(null, getInternal(GRANDPARENT)),
);
ReactTestUtils.Simulate.click(CHILD);
expect(idCallOrder.length).toBe(2);
@@ -230,17 +216,17 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_CLICK_KEY,
- recordIDAndStopPropagation.bind(null, getInternal(CHILD))
+ recordIDAndStopPropagation.bind(null, getInternal(CHILD)),
);
EventPluginHub.putListener(
getInternal(PARENT),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(PARENT))
+ recordID.bind(null, getInternal(PARENT)),
);
EventPluginHub.putListener(
getInternal(GRANDPARENT),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(GRANDPARENT))
+ recordID.bind(null, getInternal(GRANDPARENT)),
);
ReactTestUtils.Simulate.click(CHILD);
expect(idCallOrder.length).toBe(1);
@@ -251,17 +237,17 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_CLICK_KEY,
- recordIDAndReturnFalse.bind(null, getInternal(CHILD))
+ recordIDAndReturnFalse.bind(null, getInternal(CHILD)),
);
EventPluginHub.putListener(
getInternal(PARENT),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(PARENT))
+ recordID.bind(null, getInternal(PARENT)),
);
EventPluginHub.putListener(
getInternal(GRANDPARENT),
ON_CLICK_KEY,
- recordID.bind(null, getInternal(GRANDPARENT))
+ recordID.bind(null, getInternal(GRANDPARENT)),
);
spyOn(console, 'error');
ReactTestUtils.Simulate.click(CHILD);
@@ -289,12 +275,12 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_CLICK_KEY,
- handleChildClick
+ handleChildClick,
);
EventPluginHub.putListener(
getInternal(PARENT),
ON_CLICK_KEY,
- handleParentClick
+ handleParentClick,
);
ReactTestUtils.Simulate.click(CHILD);
expect(handleParentClick.mock.calls.length).toBe(1);
@@ -306,13 +292,13 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(PARENT),
ON_CLICK_KEY,
- handleParentClick
+ handleParentClick,
);
};
EventPluginHub.putListener(
getInternal(CHILD),
ON_CLICK_KEY,
- handleChildClick
+ handleChildClick,
);
ReactTestUtils.Simulate.click(CHILD);
expect(handleParentClick.mock.calls.length).toBe(0);
@@ -322,7 +308,7 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_MOUSE_ENTER_KEY,
- recordID.bind(null, getInternal(CHILD))
+ recordID.bind(null, getInternal(CHILD)),
);
ReactTestUtils.Simulate.mouseEnter(CHILD);
expect(idCallOrder.length).toBe(1);
@@ -333,15 +319,15 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_TOUCH_TAP_KEY,
- recordID.bind(null, getInternal(CHILD))
+ recordID.bind(null, getInternal(CHILD)),
);
ReactTestUtils.SimulateNative.touchStart(
CHILD,
- ReactTestUtils.nativeTouchData(0, 0)
+ ReactTestUtils.nativeTouchData(0, 0),
);
ReactTestUtils.SimulateNative.touchEnd(
CHILD,
- ReactTestUtils.nativeTouchData(0, 0)
+ ReactTestUtils.nativeTouchData(0, 0),
);
expect(idCallOrder.length).toBe(1);
expect(idCallOrder[0]).toBe(getInternal(CHILD));
@@ -351,15 +337,15 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_TOUCH_TAP_KEY,
- recordID.bind(null, getInternal(CHILD))
+ recordID.bind(null, getInternal(CHILD)),
);
ReactTestUtils.SimulateNative.touchStart(
CHILD,
- ReactTestUtils.nativeTouchData(0, 0)
+ ReactTestUtils.nativeTouchData(0, 0),
);
ReactTestUtils.SimulateNative.touchEnd(
CHILD,
- ReactTestUtils.nativeTouchData(0, tapMoveThreshold - 1)
+ ReactTestUtils.nativeTouchData(0, tapMoveThreshold - 1),
);
expect(idCallOrder.length).toBe(1);
expect(idCallOrder[0]).toBe(getInternal(CHILD));
@@ -369,15 +355,15 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_TOUCH_TAP_KEY,
- recordID.bind(null, getInternal(CHILD))
+ recordID.bind(null, getInternal(CHILD)),
);
ReactTestUtils.SimulateNative.touchStart(
CHILD,
- ReactTestUtils.nativeTouchData(0, 0)
+ ReactTestUtils.nativeTouchData(0, 0),
);
ReactTestUtils.SimulateNative.touchEnd(
CHILD,
- ReactTestUtils.nativeTouchData(0, tapMoveThreshold + 1)
+ ReactTestUtils.nativeTouchData(0, tapMoveThreshold + 1),
);
expect(idCallOrder.length).toBe(0);
});
@@ -426,25 +412,25 @@ describe('ReactBrowserEventEmitter', () => {
EventPluginHub.putListener(
getInternal(CHILD),
ON_TOUCH_TAP_KEY,
- recordID.bind(null, getInternal(CHILD))
+ recordID.bind(null, getInternal(CHILD)),
);
EventPluginHub.putListener(
getInternal(PARENT),
ON_TOUCH_TAP_KEY,
- recordID.bind(null, getInternal(PARENT))
+ recordID.bind(null, getInternal(PARENT)),
);
EventPluginHub.putListener(
getInternal(GRANDPARENT),
ON_TOUCH_TAP_KEY,
- recordID.bind(null, getInternal(GRANDPARENT))
+ recordID.bind(null, getInternal(GRANDPARENT)),
);
ReactTestUtils.SimulateNative.touchStart(
CHILD,
- ReactTestUtils.nativeTouchData(0, 0)
+ ReactTestUtils.nativeTouchData(0, 0),
);
ReactTestUtils.SimulateNative.touchEnd(
CHILD,
- ReactTestUtils.nativeTouchData(0, 0)
+ ReactTestUtils.nativeTouchData(0, 0),
);
expect(idCallOrder.length).toBe(3);
expect(idCallOrder[0]).toBe(getInternal(CHILD));
@@ -467,5 +453,4 @@ describe('ReactBrowserEventEmitter', () => {
document.createEvent = originalCreateEvent;
}
});
-
});
diff --git a/src/renderers/dom/client/__tests__/ReactDOM-test.js b/src/renderers/dom/client/__tests__/ReactDOM-test.js
index 76bc51e85e..b55e913ffb 100644
--- a/src/renderers/dom/client/__tests__/ReactDOM-test.js
+++ b/src/renderers/dom/client/__tests__/ReactDOM-test.js
@@ -53,16 +53,14 @@ describe('ReactDOM', () => {
});
it('should allow children to be passed as an argument', () => {
- var argDiv = ReactTestUtils.renderIntoDocument(
- div(null, 'child')
- );
+ var argDiv = ReactTestUtils.renderIntoDocument(div(null, 'child'));
var argNode = ReactDOM.findDOMNode(argDiv);
expect(argNode.innerHTML).toBe('child');
});
it('should overwrite props.children with children argument', () => {
var conflictDiv = ReactTestUtils.renderIntoDocument(
- div({children: 'fakechild'}, 'child')
+ div({children: 'fakechild'}, 'child'),
);
var conflictNode = ReactDOM.findDOMNode(conflictDiv);
expect(conflictNode.innerHTML).toBe('child');
@@ -77,45 +75,45 @@ describe('ReactDOM', () => {
(PARENT = c)}>
+
+ (CHILD = c)} />
-
,
-
+
,
,
-
+
,
-
+
,
,
-
+
,
,
-
+