elements don't support innerText even when does.
- contentKey = 'textContent' in document.documentElement ?
- 'textContent' :
- 'innerText';
+ contentKey = 'textContent' in document.documentElement
+ ? 'textContent'
+ : 'innerText';
}
return contentKey;
}
diff --git a/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js b/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js
index c1576315c6..7cbceff9fd 100644
--- a/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js
+++ b/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js
@@ -83,7 +83,6 @@ if (ExecutionEnvironment.canUseDOM) {
function getVendorPrefixedEventName(eventName) {
if (prefixedEventNames[eventName]) {
return prefixedEventNames[eventName];
-
} else if (!vendorPrefixes[eventName]) {
return eventName;
}
@@ -92,7 +91,7 @@ function getVendorPrefixedEventName(eventName) {
for (var styleProp in prefixMap) {
if (prefixMap.hasOwnProperty(styleProp) && styleProp in style) {
- return prefixedEventNames[eventName] = prefixMap[styleProp];
+ return (prefixedEventNames[eventName] = prefixMap[styleProp]);
}
}
diff --git a/src/renderers/dom/shared/utils/isEventSupported.js b/src/renderers/dom/shared/utils/isEventSupported.js
index a3fc30495a..ef258994ea 100644
--- a/src/renderers/dom/shared/utils/isEventSupported.js
+++ b/src/renderers/dom/shared/utils/isEventSupported.js
@@ -15,8 +15,7 @@ var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var useHasFeature;
if (ExecutionEnvironment.canUseDOM) {
- useHasFeature =
- document.implementation &&
+ useHasFeature = document.implementation &&
document.implementation.hasFeature &&
// always returns true in newer browsers as per the standard.
// @see http://dom.spec.whatwg.org/#dom-domimplementation-hasfeature
@@ -38,8 +37,10 @@ if (ExecutionEnvironment.canUseDOM) {
* @license Modernizr 3.0.0pre (Custom Build) | MIT
*/
function isEventSupported(eventNameSuffix, capture) {
- if (!ExecutionEnvironment.canUseDOM ||
- capture && !('addEventListener' in document)) {
+ if (
+ !ExecutionEnvironment.canUseDOM ||
+ (capture && !('addEventListener' in document))
+ ) {
return false;
}
diff --git a/src/renderers/dom/shared/validateDOMNesting.js b/src/renderers/dom/shared/validateDOMNesting.js
index 30337973d3..1ecf8e0175 100644
--- a/src/renderers/dom/shared/validateDOMNesting.js
+++ b/src/renderers/dom/shared/validateDOMNesting.js
@@ -18,7 +18,7 @@ var warning = require('fbjs/lib/warning');
var validateDOMNesting = emptyFunction;
if (__DEV__) {
- var { getCurrentFiberStackAddendum } = require('ReactDebugCurrentFiber');
+ var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber');
// This validation code was written based on the HTML5 parsing spec:
// https://html.spec.whatwg.org/multipage/syntax.html#has-an-element-in-scope
@@ -33,36 +33,125 @@ if (__DEV__) {
// https://html.spec.whatwg.org/multipage/syntax.html#special
var specialTags = [
- 'address', 'applet', 'area', 'article', 'aside', 'base', 'basefont',
- 'bgsound', 'blockquote', 'body', 'br', 'button', 'caption', 'center', 'col',
- 'colgroup', 'dd', 'details', 'dir', 'div', 'dl', 'dt', 'embed', 'fieldset',
- 'figcaption', 'figure', 'footer', 'form', 'frame', 'frameset', 'h1', 'h2',
- 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hgroup', 'hr', 'html', 'iframe',
- 'img', 'input', 'isindex', 'li', 'link', 'listing', 'main', 'marquee',
- 'menu', 'menuitem', 'meta', 'nav', 'noembed', 'noframes', 'noscript',
- 'object', 'ol', 'p', 'param', 'plaintext', 'pre', 'script', 'section',
- 'select', 'source', 'style', 'summary', 'table', 'tbody', 'td', 'template',
- 'textarea', 'tfoot', 'th', 'thead', 'title', 'tr', 'track', 'ul', 'wbr',
+ 'address',
+ 'applet',
+ 'area',
+ 'article',
+ 'aside',
+ 'base',
+ 'basefont',
+ 'bgsound',
+ 'blockquote',
+ 'body',
+ 'br',
+ 'button',
+ 'caption',
+ 'center',
+ 'col',
+ 'colgroup',
+ 'dd',
+ 'details',
+ 'dir',
+ 'div',
+ 'dl',
+ 'dt',
+ 'embed',
+ 'fieldset',
+ 'figcaption',
+ 'figure',
+ 'footer',
+ 'form',
+ 'frame',
+ 'frameset',
+ 'h1',
+ 'h2',
+ 'h3',
+ 'h4',
+ 'h5',
+ 'h6',
+ 'head',
+ 'header',
+ 'hgroup',
+ 'hr',
+ 'html',
+ 'iframe',
+ 'img',
+ 'input',
+ 'isindex',
+ 'li',
+ 'link',
+ 'listing',
+ 'main',
+ 'marquee',
+ 'menu',
+ 'menuitem',
+ 'meta',
+ 'nav',
+ 'noembed',
+ 'noframes',
+ 'noscript',
+ 'object',
+ 'ol',
+ 'p',
+ 'param',
+ 'plaintext',
+ 'pre',
+ 'script',
+ 'section',
+ 'select',
+ 'source',
+ 'style',
+ 'summary',
+ 'table',
+ 'tbody',
+ 'td',
+ 'template',
+ 'textarea',
+ 'tfoot',
+ 'th',
+ 'thead',
+ 'title',
+ 'tr',
+ 'track',
+ 'ul',
+ 'wbr',
'xmp',
];
// https://html.spec.whatwg.org/multipage/syntax.html#has-an-element-in-scope
var inScopeTags = [
- 'applet', 'caption', 'html', 'table', 'td', 'th', 'marquee', 'object',
+ 'applet',
+ 'caption',
+ 'html',
+ 'table',
+ 'td',
+ 'th',
+ 'marquee',
+ 'object',
'template',
// https://html.spec.whatwg.org/multipage/syntax.html#html-integration-point
// TODO: Distinguish by namespace here -- for
, including it here
// errs on the side of fewer warnings
- 'foreignObject', 'desc', 'title',
+ 'foreignObject',
+ 'desc',
+ 'title',
];
// https://html.spec.whatwg.org/multipage/syntax.html#has-an-element-in-button-scope
var buttonScopeTags = inScopeTags.concat(['button']);
// https://html.spec.whatwg.org/multipage/syntax.html#generate-implied-end-tags
- var impliedEndTags =
- ['dd', 'dt', 'li', 'option', 'optgroup', 'p', 'rp', 'rt'];
+ var impliedEndTags = [
+ 'dd',
+ 'dt',
+ 'li',
+ 'option',
+ 'optgroup',
+ 'p',
+ 'rp',
+ 'rt',
+ ];
var emptyAncestorInfo = {
current: null,
@@ -94,7 +183,9 @@ if (__DEV__) {
// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inbody
if (
specialTags.indexOf(tag) !== -1 &&
- tag !== 'address' && tag !== 'div' && tag !== 'p'
+ tag !== 'address' &&
+ tag !== 'div' &&
+ tag !== 'p'
) {
ancestorInfo.listItemTagAutoclosing = null;
ancestorInfo.dlItemTagAutoclosing = null;
@@ -150,19 +241,20 @@ if (__DEV__) {
// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-intr
case 'tr':
- return (
- tag === 'th' || tag === 'td' || tag === 'style' || tag === 'script' ||
- tag === 'template'
- );
+ return tag === 'th' ||
+ tag === 'td' ||
+ tag === 'style' ||
+ tag === 'script' ||
+ tag === 'template';
// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-intbody
case 'tbody':
case 'thead':
case 'tfoot':
- return (
- tag === 'tr' || tag === 'style' || tag === 'script' ||
- tag === 'template'
- );
+ return tag === 'tr' ||
+ tag === 'style' ||
+ tag === 'script' ||
+ tag === 'template';
// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-incolgroup
case 'colgroup':
@@ -170,20 +262,28 @@ if (__DEV__) {
// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-intable
case 'table':
- return (
- tag === 'caption' || tag === 'colgroup' || tag === 'tbody' ||
- tag === 'tfoot' || tag === 'thead' || tag === 'style' ||
- tag === 'script' || tag === 'template'
- );
+ return tag === 'caption' ||
+ tag === 'colgroup' ||
+ tag === 'tbody' ||
+ tag === 'tfoot' ||
+ tag === 'thead' ||
+ tag === 'style' ||
+ tag === 'script' ||
+ tag === 'template';
// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inhead
case 'head':
- return (
- tag === 'base' || tag === 'basefont' || tag === 'bgsound' ||
- tag === 'link' || tag === 'meta' || tag === 'title' ||
- tag === 'noscript' || tag === 'noframes' || tag === 'style' ||
- tag === 'script' || tag === 'template'
- );
+ return tag === 'base' ||
+ tag === 'basefont' ||
+ tag === 'bgsound' ||
+ tag === 'link' ||
+ tag === 'meta' ||
+ tag === 'title' ||
+ tag === 'noscript' ||
+ tag === 'noframes' ||
+ tag === 'style' ||
+ tag === 'script' ||
+ tag === 'template';
// https://html.spec.whatwg.org/multipage/semantics.html#the-html-element
case 'html':
@@ -202,10 +302,12 @@ if (__DEV__) {
case 'h4':
case 'h5':
case 'h6':
- return (
- parentTag !== 'h1' && parentTag !== 'h2' && parentTag !== 'h3' &&
- parentTag !== 'h4' && parentTag !== 'h5' && parentTag !== 'h6'
- );
+ return parentTag !== 'h1' &&
+ parentTag !== 'h2' &&
+ parentTag !== 'h3' &&
+ parentTag !== 'h4' &&
+ parentTag !== 'h5' &&
+ parentTag !== 'h6';
case 'rp':
case 'rt':
@@ -318,9 +420,16 @@ if (__DEV__) {
return stack;
};
- var getOwnerInfo = function(childInstance, childTag, ancestorInstance, ancestorTag, isParent) {
+ var getOwnerInfo = function(
+ childInstance,
+ childTag,
+ ancestorInstance,
+ ancestorTag,
+ isParent,
+ ) {
var childOwner = childInstance && childInstance._currentElement._owner;
- var ancestorOwner = ancestorInstance && ancestorInstance._currentElement._owner;
+ var ancestorOwner = ancestorInstance &&
+ ancestorInstance._currentElement._owner;
var childOwners = findOwnerStack(childOwner);
var ancestorOwners = findOwnerStack(ancestorOwner);
@@ -338,25 +447,27 @@ if (__DEV__) {
}
var UNKNOWN = '(unknown)';
- var childOwnerNames = childOwners.slice(deepestCommon + 1).map(
- (inst) => getComponentName(inst) || UNKNOWN
- );
- var ancestorOwnerNames = ancestorOwners.slice(deepestCommon + 1).map(
- (inst) => getComponentName(inst) || UNKNOWN
- );
- var ownerInfo = [].concat(
- // If the parent and child instances have a common owner ancestor, start
- // with that -- otherwise we just start with the parent's owners.
- deepestCommon !== -1 ?
- getComponentName(childOwners[deepestCommon]) || UNKNOWN :
- [],
- ancestorOwnerNames,
- ancestorTag,
- // If we're warning about an invalid (non-parent) ancestry, add '...'
- isParent ? [] : ['...'],
- childOwnerNames,
- childTag
- ).join(' > ');
+ var childOwnerNames = childOwners
+ .slice(deepestCommon + 1)
+ .map(inst => getComponentName(inst) || UNKNOWN);
+ var ancestorOwnerNames = ancestorOwners
+ .slice(deepestCommon + 1)
+ .map(inst => getComponentName(inst) || UNKNOWN);
+ var ownerInfo = []
+ .concat(
+ // If the parent and child instances have a common owner ancestor, start
+ // with that -- otherwise we just start with the parent's owners.
+ deepestCommon !== -1
+ ? getComponentName(childOwners[deepestCommon]) || UNKNOWN
+ : [],
+ ancestorOwnerNames,
+ ancestorTag,
+ // If we're warning about an invalid (non-parent) ancestry, add '...'
+ isParent ? [] : ['...'],
+ childOwnerNames,
+ childTag,
+ )
+ .join(' > ');
return ownerInfo;
};
@@ -367,7 +478,7 @@ if (__DEV__) {
childTag,
childText,
childInstance,
- ancestorInfo
+ ancestorInfo,
) {
ancestorInfo = ancestorInfo || emptyAncestorInfo;
var parentInfo = ancestorInfo.current;
@@ -376,15 +487,17 @@ if (__DEV__) {
if (childText != null) {
warning(
childTag == null,
- 'validateDOMNesting: when childText is passed, childTag should be null'
+ 'validateDOMNesting: when childText is passed, childTag should be null',
);
childTag = '#text';
}
- var invalidParent =
- isTagValidWithParent(childTag, parentTag) ? null : parentInfo;
- var invalidAncestor =
- invalidParent ? null : findInvalidAncestorForTag(childTag, ancestorInfo);
+ var invalidParent = isTagValidWithParent(childTag, parentTag)
+ ? null
+ : parentInfo;
+ var invalidAncestor = invalidParent
+ ? null
+ : findInvalidAncestorForTag(childTag, ancestorInfo);
var invalidParentOrAncestor = invalidParent || invalidAncestor;
if (!invalidParentOrAncestor) {
return;
@@ -395,19 +508,26 @@ if (__DEV__) {
var addendum;
if (childInstance != null) {
- addendum = ' See ' + getOwnerInfo(
- childInstance,
- childTag,
- ancestorInstance,
- ancestorTag,
- !!invalidParent
- ) + '.';
+ addendum = ' See ' +
+ getOwnerInfo(
+ childInstance,
+ childTag,
+ ancestorInstance,
+ ancestorTag,
+ !!invalidParent,
+ ) +
+ '.';
} else {
addendum = getCurrentFiberStackAddendum();
}
- var warnKey =
- !!invalidParent + '|' + childTag + '|' + ancestorTag + '|' + addendum;
+ var warnKey = !!invalidParent +
+ '|' +
+ childTag +
+ '|' +
+ ancestorTag +
+ '|' +
+ addendum;
if (didWarn[warnKey]) {
return;
}
@@ -420,8 +540,7 @@ if (__DEV__) {
tagDisplayName = 'Text nodes';
} else {
tagDisplayName = 'Whitespace text nodes';
- whitespaceInfo =
- ' Make sure you don\'t have any extra whitespace between tags on ' +
+ whitespaceInfo = " Make sure you don't have any extra whitespace between tags on " +
'each line of your source code.';
}
} else {
@@ -431,8 +550,7 @@ if (__DEV__) {
if (invalidParent) {
var info = '';
if (ancestorTag === 'table' && childTag === 'tr') {
- info +=
- ' Add a <tbody> to your code to match the DOM tree generated by ' +
+ info += ' Add a <tbody> to your code to match the DOM tree generated by ' +
'the browser.';
}
warning(
@@ -442,16 +560,16 @@ if (__DEV__) {
ancestorTag,
whitespaceInfo,
info,
- addendum
+ addendum,
);
} else {
warning(
false,
'validateDOMNesting(...): %s cannot appear as a descendant of ' +
- '<%s>.%s',
+ '<%s>.%s',
tagDisplayName,
ancestorTag,
- addendum
+ addendum,
);
}
};
@@ -463,10 +581,8 @@ if (__DEV__) {
ancestorInfo = ancestorInfo || emptyAncestorInfo;
var parentInfo = ancestorInfo.current;
var parentTag = parentInfo && parentInfo.tag;
- return (
- isTagValidWithParent(tag, parentTag) &&
- !findInvalidAncestorForTag(tag, ancestorInfo)
- );
+ return isTagValidWithParent(tag, parentTag) &&
+ !findInvalidAncestorForTag(tag, ancestorInfo);
};
}
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index 366f6803b8..c16b2f578a 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -11,7 +11,6 @@
'use strict';
-
var emptyFunction = require('fbjs/lib/emptyFunction');
describe('ReactDOMInput', () => {
@@ -42,10 +41,7 @@ describe('ReactDOMInput', () => {
it('should properly control a value even if no event listener exists', () => {
var container = document.createElement('div');
- var stub = ReactDOM.render(
- <input type="text" value="lion" />,
- container
- );
+ var stub = ReactDOM.render(<input type="text" value="lion" />, container);
document.body.appendChild(container);
@@ -77,12 +73,12 @@ describe('ReactDOMInput', () => {
changeEvent.initEvent('change', true, true);
class ControlledInputs extends React.Component {
- state = { value: 'lion' };
+ state = {value: 'lion'};
a = null;
b = null;
switchedFocus = false;
change(newValue) {
- this.setState({ value: newValue });
+ this.setState({value: newValue});
// Calling focus here will blur the text box which causes a native
// change event. Ideally we shouldn't have to fire this ourselves.
// I don't know how to simulate a change event on a text box.
@@ -93,7 +89,7 @@ describe('ReactDOMInput', () => {
this.switchedFocus = true;
// currentValue should be 'giraffe' here because we should not have
// restored it on the target yet.
- this.setState({ value: currentValue });
+ this.setState({value: currentValue});
}
render() {
return (
@@ -105,10 +101,7 @@ describe('ReactDOMInput', () => {
onChange={e => this.change(e.target.value)}
onBlur={e => this.blur(e.target.value)}
/>
- <input
- type="text"
- ref={n => this.b = n}
- />
+ <input type="text" ref={n => this.b = n} />
</div>
);
}
@@ -139,7 +132,7 @@ describe('ReactDOMInput', () => {
inputEvent.initEvent('input', true, true);
class ControlledInputs extends React.Component {
- state = { value: 'lion' };
+ state = {value: 'lion'};
a = null;
b = null;
change(newValue) {
@@ -158,11 +151,7 @@ describe('ReactDOMInput', () => {
value="lion"
onChange={e => this.change(e.target.value)}
/>
- <input
- type="checkbox"
- ref={n => this.b = n}
- checked={true}
- />
+ <input type="checkbox" ref={n => this.b = n} checked={true} />
</div>
);
}
@@ -198,7 +187,7 @@ describe('ReactDOMInput', () => {
it('only assigns defaultValue if it changes', () => {
class Test extends React.Component {
render() {
- return (<input defaultValue="0" />);
+ return <input defaultValue="0" />;
}
}
@@ -210,7 +199,9 @@ describe('ReactDOMInput', () => {
return '0';
},
set(value) {
- throw new Error(`defaultValue was assigned ${value}, but it did not change!`);
+ throw new Error(
+ `defaultValue was assigned ${value}, but it did not change!`,
+ );
},
});
@@ -236,7 +227,10 @@ describe('ReactDOMInput', () => {
it('should update `defaultValue` for uncontrolled input', () => {
var container = document.createElement('div');
- var node = ReactDOM.render(<input type="text" defaultValue="0" />, container);
+ var node = ReactDOM.render(
+ <input type="text" defaultValue="0" />,
+ container,
+ );
expect(node.value).toBe('0');
@@ -249,7 +243,10 @@ describe('ReactDOMInput', () => {
it('should update `defaultValue` for uncontrolled date/time input', () => {
var container = document.createElement('div');
- var node = ReactDOM.render(<input type="date" defaultValue="1980-01-01" />, container);
+ var node = ReactDOM.render(
+ <input type="date" defaultValue="1980-01-01" />,
+ container,
+ );
expect(node.value).toBe('1980-01-01');
@@ -264,7 +261,10 @@ describe('ReactDOMInput', () => {
it('should take `defaultValue` when changing to uncontrolled input', () => {
var container = document.createElement('div');
- var node = ReactDOM.render(<input type="text" value="0" readOnly="true" />, container);
+ var node = ReactDOM.render(
+ <input type="text" value="0" readOnly="true" />,
+ container,
+ );
expect(node.value).toBe('0');
@@ -274,7 +274,9 @@ describe('ReactDOMInput', () => {
});
it('should render defaultValue for SSR', () => {
- var markup = ReactDOMServer.renderToString(<input type="text" defaultValue="1" />);
+ var markup = ReactDOMServer.renderToString(
+ <input type="text" defaultValue="1" />,
+ );
var div = document.createElement('div');
div.innerHTML = markup;
expect(div.firstChild.getAttribute('value')).toBe('1');
@@ -350,7 +352,7 @@ describe('ReactDOMInput', () => {
stub = ReactDOM.render(
<input type="text" value={true} onChange={emptyFunction} />,
- container
+ container,
);
expect(node.value).toEqual('true');
});
@@ -364,7 +366,7 @@ describe('ReactDOMInput', () => {
stub = ReactDOM.render(
<input type="text" value={false} onChange={emptyFunction} />,
- container
+ container,
);
expect(node.value).toEqual('false');
});
@@ -383,7 +385,7 @@ describe('ReactDOMInput', () => {
};
stub = ReactDOM.render(
<input type="text" value={objToString} onChange={emptyFunction} />,
- container
+ container,
);
expect(node.value).toEqual('foobar');
});
@@ -436,11 +438,7 @@ describe('ReactDOMInput', () => {
var fakeNativeEvent = function() {};
fakeNativeEvent.target = node;
fakeNativeEvent.path = [node, container];
- ReactTestUtils.simulateNativeEventOnNode(
- 'topInput',
- node,
- fakeNativeEvent
- );
+ ReactTestUtils.simulateNativeEventOnNode('topInput', node, fakeNativeEvent);
expect(handled).toBe(true);
});
@@ -455,7 +453,7 @@ describe('ReactDOMInput', () => {
// report this as not having a `value` attribute at all; IE reports it as
// the actual label that the user sees.
expect(
- !node.hasAttribute('value') || node.getAttribute('value').length > 0
+ !node.hasAttribute('value') || node.getAttribute('value').length > 0,
).toBe(true);
});
@@ -470,13 +468,10 @@ describe('ReactDOMInput', () => {
name="fruit"
checked={true}
onChange={emptyFunction}
- />A
- <input
- ref="b"
- type="radio"
- name="fruit"
- onChange={emptyFunction}
- />B
+ />
+ A
+ <input ref="b" type="radio" name="fruit" onChange={emptyFunction} />
+ B
<form>
<input
@@ -539,19 +534,20 @@ describe('ReactDOMInput', () => {
name="fruit"
checked={true}
onChange={emptyFunction}
- />A
+ />
+ A
</div>
);
}
}
class ComponentB extends React.Component {
- state = { changed: false };
+ state = {changed: false};
handleChange = () => {
this.setState({
changed: true,
});
- }
+ };
componentDidUpdate() {
sharedParent.appendChild(container2);
}
@@ -564,7 +560,8 @@ describe('ReactDOMInput', () => {
name="fruit"
checked={false}
onChange={this.handleChange}
- />B
+ />
+ B
</div>
);
}
@@ -591,17 +588,16 @@ describe('ReactDOMInput', () => {
it('should warn with value and no onChange handler and readOnly specified', () => {
ReactTestUtils.renderIntoDocument(
- <input type="text" value="zoink" readOnly={true} />
+ <input type="text" value="zoink" readOnly={true} />,
);
expectDev(console.error.calls.count()).toBe(0);
ReactTestUtils.renderIntoDocument(
- <input type="text" value="zoink" readOnly={false} />
+ <input type="text" value="zoink" readOnly={false} />,
);
expectDev(console.error.calls.count()).toBe(1);
});
-
it('should have a this value of undefined if bind is not used', () => {
var unboundInputOnChange = function() {
expect(this).toBe(undefined);
@@ -615,12 +611,12 @@ describe('ReactDOMInput', () => {
it('should warn with checked and no onChange handler with readOnly specified', () => {
ReactTestUtils.renderIntoDocument(
- <input type="checkbox" checked="false" readOnly={true} />
+ <input type="checkbox" checked="false" readOnly={true} />,
);
expectDev(console.error.calls.count()).toBe(0);
ReactTestUtils.renderIntoDocument(
- <input type="checkbox" checked="false" readOnly={false} />
+ <input type="checkbox" checked="false" readOnly={false} />,
);
expectDev(console.error.calls.count()).toBe(1);
});
@@ -636,8 +632,8 @@ describe('ReactDOMInput', () => {
ReactTestUtils.renderIntoDocument(<input type="text" value={null} />);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'`value` prop on `input` should not be null. ' +
- 'Consider using the empty string to clear the component or `undefined` ' +
- 'for uncontrolled components.'
+ 'Consider using the empty string to clear the component or `undefined` ' +
+ 'for uncontrolled components.',
);
ReactTestUtils.renderIntoDocument(<input type="text" value={null} />);
@@ -646,81 +642,100 @@ describe('ReactDOMInput', () => {
it('should warn if checked and defaultChecked props are specified', () => {
ReactTestUtils.renderIntoDocument(
- <input type="radio" checked={true} defaultChecked={true} readOnly={true} />
+ <input
+ type="radio"
+ checked={true}
+ defaultChecked={true}
+ readOnly={true}
+ />,
);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component contains an input of type radio with both checked and defaultChecked props. ' +
- 'Input elements must be either controlled or uncontrolled ' +
- '(specify either the checked prop, or the defaultChecked prop, but not ' +
- 'both). Decide between using a controlled or uncontrolled input ' +
- 'element and remove one of these props. More info: ' +
- 'https://fb.me/react-controlled-components'
+ 'Input elements must be either controlled or uncontrolled ' +
+ '(specify either the checked prop, or the defaultChecked prop, but not ' +
+ 'both). Decide between using a controlled or uncontrolled input ' +
+ 'element and remove one of these props. More info: ' +
+ 'https://fb.me/react-controlled-components',
);
ReactTestUtils.renderIntoDocument(
- <input type="radio" checked={true} defaultChecked={true} readOnly={true} />
+ <input
+ type="radio"
+ checked={true}
+ defaultChecked={true}
+ readOnly={true}
+ />,
);
expectDev(console.error.calls.count()).toBe(1);
});
it('should warn if value and defaultValue props are specified', () => {
ReactTestUtils.renderIntoDocument(
- <input type="text" value="foo" defaultValue="bar" readOnly={true} />
+ <input type="text" value="foo" defaultValue="bar" readOnly={true} />,
);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component contains an input of type text with both value and defaultValue props. ' +
- 'Input elements must be either controlled or uncontrolled ' +
- '(specify either the value prop, or the defaultValue prop, but not ' +
- 'both). Decide between using a controlled or uncontrolled input ' +
- 'element and remove one of these props. More info: ' +
- 'https://fb.me/react-controlled-components'
+ 'Input elements must be either controlled or uncontrolled ' +
+ '(specify either the value prop, or the defaultValue prop, but not ' +
+ 'both). Decide between using a controlled or uncontrolled input ' +
+ 'element and remove one of these props. More info: ' +
+ 'https://fb.me/react-controlled-components',
);
ReactTestUtils.renderIntoDocument(
- <input type="text" value="foo" defaultValue="bar" readOnly={true} />
+ <input type="text" value="foo" defaultValue="bar" readOnly={true} />,
);
expectDev(console.error.calls.count()).toBe(1);
});
it('should warn if controlled input switches to uncontrolled (value is undefined)', () => {
- var stub = <input type="text" value="controlled" onChange={emptyFunction} />;
+ var stub = (
+ <input type="text" value="controlled" onChange={emptyFunction} />
+ );
var container = document.createElement('div');
ReactDOM.render(stub, container);
ReactDOM.render(<input type="text" />, container);
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type text to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
it('should warn if controlled input switches to uncontrolled (value is null)', () => {
- var stub = <input type="text" value="controlled" onChange={emptyFunction} />;
+ var stub = (
+ <input type="text" value="controlled" onChange={emptyFunction} />
+ );
var container = document.createElement('div');
ReactDOM.render(stub, container);
ReactDOM.render(<input type="text" value={null} />, container);
expectDev(console.error.calls.count()).toBeGreaterThan(0);
expectDev(console.error.calls.argsFor(1)[0]).toContain(
'A component is changing a controlled input of type text to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
it('should warn if controlled input switches to uncontrolled with defaultValue', () => {
- var stub = <input type="text" value="controlled" onChange={emptyFunction} />;
+ var stub = (
+ <input type="text" value="controlled" onChange={emptyFunction} />
+ );
var container = document.createElement('div');
ReactDOM.render(stub, container);
- ReactDOM.render(<input type="text" defaultValue="uncontrolled" />, container);
+ ReactDOM.render(
+ <input type="text" defaultValue="uncontrolled" />,
+ container,
+ );
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type text to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -732,9 +747,9 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing an uncontrolled input of type text to be controlled. ' +
- 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -746,51 +761,57 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBeGreaterThan(0);
expectDev(console.error.calls.argsFor(1)[0]).toContain(
'A component is changing an uncontrolled input of type text to be controlled. ' +
- 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
it('should warn if controlled checkbox switches to uncontrolled (checked is undefined)', () => {
- var stub = <input type="checkbox" checked={true} onChange={emptyFunction} />;
+ var stub = (
+ <input type="checkbox" checked={true} onChange={emptyFunction} />
+ );
var container = document.createElement('div');
ReactDOM.render(stub, container);
ReactDOM.render(<input type="checkbox" />, container);
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type checkbox to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
it('should warn if controlled checkbox switches to uncontrolled (checked is null)', () => {
- var stub = <input type="checkbox" checked={true} onChange={emptyFunction} />;
+ var stub = (
+ <input type="checkbox" checked={true} onChange={emptyFunction} />
+ );
var container = document.createElement('div');
ReactDOM.render(stub, container);
ReactDOM.render(<input type="checkbox" checked={null} />, container);
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type checkbox to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
it('should warn if controlled checkbox switches to uncontrolled with defaultChecked', () => {
- var stub = <input type="checkbox" checked={true} onChange={emptyFunction} />;
+ var stub = (
+ <input type="checkbox" checked={true} onChange={emptyFunction} />
+ );
var container = document.createElement('div');
ReactDOM.render(stub, container);
ReactDOM.render(<input type="checkbox" defaultChecked={true} />, container);
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type checkbox to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -802,9 +823,9 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing an uncontrolled input of type checkbox to be controlled. ' +
- 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -816,9 +837,9 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing an uncontrolled input of type checkbox to be controlled. ' +
- 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -830,9 +851,9 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type radio to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -844,9 +865,9 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type radio to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -858,9 +879,9 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type radio to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -872,9 +893,9 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing an uncontrolled input of type radio to be controlled. ' +
- 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -886,9 +907,9 @@ describe('ReactDOMInput', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing an uncontrolled input of type radio to be controlled. ' +
- 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -896,15 +917,24 @@ describe('ReactDOMInput', () => {
var container = document.createElement('div');
ReactDOM.render(<input type="radio" value="value" />, container);
ReactDOM.render(<input type="radio" />, container);
- ReactDOM.render(<input type="radio" value="value" defaultChecked={true} />, container);
- ReactDOM.render(<input type="radio" value="value" onChange={() => null} />, container);
+ ReactDOM.render(
+ <input type="radio" value="value" defaultChecked={true} />,
+ container,
+ );
+ ReactDOM.render(
+ <input type="radio" value="value" onChange={() => null} />,
+ container,
+ );
ReactDOM.render(<input type="radio" />, container);
expectDev(console.error.calls.count()).toBe(0);
});
it('should not warn if radio value changes but never becomes uncontrolled', () => {
var container = document.createElement('div');
- ReactDOM.render(<input type="radio" checked={false} onChange={() => null} />, container);
+ ReactDOM.render(
+ <input type="radio" checked={false} onChange={() => null} />,
+ container,
+ );
ReactDOM.render(
<input
type="radio"
@@ -912,19 +942,29 @@ describe('ReactDOMInput', () => {
defaultChecked={true}
checked={false}
onChange={() => null}
- />, container);
+ />,
+ container,
+ );
expectDev(console.error.calls.count()).toBe(0);
});
it('should warn if radio checked false changes to become uncontrolled', () => {
var container = document.createElement('div');
- ReactDOM.render(<input type="radio" value="value" checked={false} onChange={() => null} />, container);
+ ReactDOM.render(
+ <input
+ type="radio"
+ value="value"
+ checked={false}
+ onChange={() => null}
+ />,
+ container,
+ );
ReactDOM.render(<input type="radio" value="value" />, container);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type radio to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
);
});
@@ -950,7 +990,9 @@ describe('ReactDOMInput', () => {
return el;
});
- ReactTestUtils.renderIntoDocument(<input value="0" type="range" min="0" max="100" step="1" />);
+ ReactTestUtils.renderIntoDocument(
+ <input value="0" type="range" min="0" max="100" step="1" />,
+ );
expect(log).toEqual([
...(ReactDOMFeatureFlags.useFiber ? [] : ['set data-reactroot']),
'set type',
@@ -966,18 +1008,18 @@ describe('ReactDOMInput', () => {
it('sets value properly with type coming later in props', () => {
var input = ReactTestUtils.renderIntoDocument(
- <input value="hi" type="radio" />
+ <input value="hi" type="radio" />,
);
expect(input.value).toBe('hi');
});
it('does not raise a validation warning when it switches types', () => {
class Input extends React.Component {
- state = { type: 'number', value: 1000 };
+ state = {type: 'number', value: 1000};
render() {
- var { value, type } = this.state;
- return (<input onChange={() => {}} type={type} value={value} />);
+ var {value, type} = this.state;
+ return <input onChange={() => {}} type={type} value={value} />;
}
}
@@ -986,7 +1028,7 @@ describe('ReactDOMInput', () => {
// If the value is set before the type, a validation warning will raise and
// the value will not be assigned.
- input.setState({ type: 'text', value: 'Test' });
+ input.setState({type: 'text', value: 'Test'});
expect(node.value).toEqual('Test');
});
@@ -1017,9 +1059,13 @@ describe('ReactDOMInput', () => {
return el;
});
- ReactTestUtils.renderIntoDocument(<input type="date" defaultValue="1980-01-01" />);
+ ReactTestUtils.renderIntoDocument(
+ <input type="date" defaultValue="1980-01-01" />,
+ );
expect(log).toEqual([
- ...(ReactDOMFeatureFlags.useFiber ? [] : ['node.setAttribute("data-reactroot", "")']),
+ ...(ReactDOMFeatureFlags.useFiber
+ ? []
+ : ['node.setAttribute("data-reactroot", "")']),
'node.setAttribute("type", "date")',
'node.setAttribute("value", "1980-01-01")',
'node.value = ""',
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
index 59ba79eac0..8a1b157cd2 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
@@ -11,7 +11,6 @@
'use strict';
-
describe('ReactDOMOption', () => {
function normalizeCodeLocInfo(str) {
return str && str.replace(/\(at .+?:\d+\)/g, '(at **)');
@@ -45,12 +44,14 @@ describe('ReactDOMOption', () => {
ReactTestUtils.renderIntoDocument(el);
// only warn once
expectDev(console.error.calls.count()).toBe(1);
- expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toContain(
- ReactDOMFeatureFlags.useFiber ?
- '<div> cannot appear as a child of <option>.\n' +
- ' in div (at **)\n' +
- ' in option (at **)' :
- 'Only strings and numbers are supported as <option> children.'
+ expectDev(
+ normalizeCodeLocInfo(console.error.calls.argsFor(0)[0]),
+ ).toContain(
+ ReactDOMFeatureFlags.useFiber
+ ? '<div> cannot appear as a child of <option>.\n' +
+ ' in div (at **)\n' +
+ ' in option (at **)'
+ : 'Only strings and numbers are supported as <option> children.',
);
});
@@ -66,7 +67,7 @@ describe('ReactDOMOption', () => {
});
it('should be able to use dangerouslySetInnerHTML on option', () => {
- var stub = <option dangerouslySetInnerHTML={{ __html: 'foobar' }} />;
+ var stub = <option dangerouslySetInnerHTML={{__html: 'foobar'}} />;
stub = ReactTestUtils.renderIntoDocument(stub);
var node = ReactDOM.findDOMNode(stub);
@@ -86,12 +87,13 @@ describe('ReactDOMOption', () => {
it('should allow ignoring `value` on option', () => {
var a = 'a';
- var stub =
+ var stub = (
<select value="giraffe" onChange={() => {}}>
<option>monkey</option>
<option>gir{a}ffe</option>
<option>gorill{a}</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
@@ -99,10 +101,7 @@ describe('ReactDOMOption', () => {
expect(node.selectedIndex).toBe(1);
- ReactDOM.render(
- <select value="gorilla">{options}</select>,
- container
- );
+ ReactDOM.render(<select value="gorilla">{options}</select>, container);
expect(node.selectedIndex).toEqual(2);
});
});
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
index 37bda509e1..e9f29951a8 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
@@ -11,7 +11,6 @@
'use strict';
-
describe('ReactDOMSelect', () => {
var React;
var ReactDOM;
@@ -28,12 +27,13 @@ describe('ReactDOMSelect', () => {
});
it('should allow setting `defaultValue`', () => {
- var stub =
+ var stub = (
<select defaultValue="giraffe">
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
@@ -44,7 +44,7 @@ describe('ReactDOMSelect', () => {
// Changing `defaultValue` should do nothing.
ReactDOM.render(
<select defaultValue="gorilla">{options}</select>,
- container
+ container,
);
expect(node.value).toEqual('giraffe');
});
@@ -58,12 +58,13 @@ describe('ReactDOMSelect', () => {
});
it('should not control when using `defaultValue`', () => {
- var el =
+ var el = (
<select defaultValue="giraffe">
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var container = document.createElement('div');
var stub = ReactDOM.render(el, container);
var node = ReactDOM.findDOMNode(stub);
@@ -77,39 +78,41 @@ describe('ReactDOMSelect', () => {
});
it('should allow setting `defaultValue` with multiple', () => {
- var stub =
+ var stub = (
<select multiple={true} defaultValue={['giraffe', 'gorilla']}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
var node = ReactDOM.findDOMNode(stub);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(true); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(true); // gorilla
// Changing `defaultValue` should do nothing.
ReactDOM.render(
<select multiple={true} defaultValue={['monkey']}>{options}</select>,
- container
+ container,
);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(true); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(true); // gorilla
});
it('should allow setting `value`', () => {
- var stub =
+ var stub = (
<select value="giraffe" onChange={noop}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
@@ -120,7 +123,7 @@ describe('ReactDOMSelect', () => {
// Changing the `value` prop should change the selected option.
ReactDOM.render(
<select value="gorilla" onChange={noop}>{options}</select>,
- container
+ container,
);
expect(node.value).toEqual('gorilla');
});
@@ -134,47 +137,49 @@ describe('ReactDOMSelect', () => {
});
it('should allow setting `value` with multiple', () => {
- var stub =
+ var stub = (
<select multiple={true} value={['giraffe', 'gorilla']} onChange={noop}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
var node = ReactDOM.findDOMNode(stub);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(true); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(true); // gorilla
// Changing the `value` prop should change the selected options.
ReactDOM.render(
<select multiple={true} value={['monkey']} onChange={noop}>
{options}
</select>,
- container
+ container,
);
- expect(node.options[0].selected).toBe(true); // monkey
- expect(node.options[1].selected).toBe(false); // giraffe
- expect(node.options[2].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(true); // monkey
+ expect(node.options[1].selected).toBe(false); // giraffe
+ expect(node.options[2].selected).toBe(false); // gorilla
});
it('should not select other options automatically', () => {
- var stub =
+ var stub = (
<select multiple={true} value={['12']} onChange={noop}>
<option value="1">one</option>
<option value="2">two</option>
<option value="12">twelve</option>
- </select>;
+ </select>
+ );
stub = ReactTestUtils.renderIntoDocument(stub);
var node = ReactDOM.findDOMNode(stub);
- expect(node.options[0].selected).toBe(false); // one
- expect(node.options[1].selected).toBe(false); // two
- expect(node.options[2].selected).toBe(true); // twelve
+ expect(node.options[0].selected).toBe(false); // one
+ expect(node.options[1].selected).toBe(false); // two
+ expect(node.options[2].selected).toBe(true); // twelve
});
it('should reset child options selected when they are changed and `value` is set', () => {
@@ -188,14 +193,14 @@ describe('ReactDOMSelect', () => {
<option value="b">b</option>
<option value="c">c</option>
</select>,
- container
+ container,
);
var node = ReactDOM.findDOMNode(stub);
- expect(node.options[0].selected).toBe(true); // a
- expect(node.options[1].selected).toBe(true); // b
- expect(node.options[2].selected).toBe(false); // c
+ expect(node.options[0].selected).toBe(true); // a
+ expect(node.options[1].selected).toBe(true); // b
+ expect(node.options[2].selected).toBe(false); // c
});
it('should allow setting `value` with `objectToString`', () => {
@@ -206,124 +211,129 @@ describe('ReactDOMSelect', () => {
},
};
- var el =
+ var el = (
<select multiple={true} value={[objectToString]} onChange={noop}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var container = document.createElement('div');
var stub = ReactDOM.render(el, container);
var node = ReactDOM.findDOMNode(stub);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(false); // gorilla
// Changing the `value` prop should change the selected options.
objectToString.animal = 'monkey';
- var el2 =
+ var el2 = (
<select multiple={true} value={[objectToString]}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
ReactDOM.render(el2, container);
- expect(node.options[0].selected).toBe(true); // monkey
- expect(node.options[1].selected).toBe(false); // giraffe
- expect(node.options[2].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(true); // monkey
+ expect(node.options[1].selected).toBe(false); // giraffe
+ expect(node.options[2].selected).toBe(false); // gorilla
});
it('should allow switching to multiple', () => {
- var stub =
+ var stub = (
<select defaultValue="giraffe">
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
var node = ReactDOM.findDOMNode(stub);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(false); // gorilla
// When making it multiple, giraffe and gorilla should be selected
ReactDOM.render(
<select multiple={true} defaultValue={['giraffe', 'gorilla']}>
{options}
</select>,
- container
+ container,
);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(true); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(true); // gorilla
});
it('should allow switching from multiple', () => {
- var stub =
+ var stub = (
<select multiple={true} defaultValue={['giraffe', 'gorilla']}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
var node = ReactDOM.findDOMNode(stub);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(true); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(true); // gorilla
// When removing multiple, defaultValue is applied again, being omitted
// means that "monkey" will be selected
ReactDOM.render(
<select defaultValue="gorilla">{options}</select>,
- container
+ container,
);
-
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(false); // giraffe
- expect(node.options[2].selected).toBe(true); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(false); // giraffe
+ expect(node.options[2].selected).toBe(true); // gorilla
});
it('should remember value when switching to uncontrolled', () => {
- var stub =
+ var stub = (
<select value={'giraffe'} onChange={noop}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
var node = ReactDOM.findDOMNode(stub);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(false); // gorilla
ReactDOM.render(<select>{options}</select>, container);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(false); // gorilla
});
it('should remember updated value when switching to uncontrolled', () => {
- var stub =
+ var stub = (
<select value={'giraffe'} onChange={noop}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var options = stub.props.children;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
@@ -331,27 +341,28 @@ describe('ReactDOMSelect', () => {
ReactDOM.render(
<select value="gorilla" onChange={noop}>{options}</select>,
- container
+ container,
);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(false); // giraffe
- expect(node.options[2].selected).toBe(true); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(false); // giraffe
+ expect(node.options[2].selected).toBe(true); // gorilla
ReactDOM.render(<select>{options}</select>, container);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(false); // giraffe
- expect(node.options[2].selected).toBe(true); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(false); // giraffe
+ expect(node.options[2].selected).toBe(true); // gorilla
});
it('should support server-side rendering', () => {
- var stub =
+ var stub = (
<select value="giraffe" onChange={noop}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var markup = ReactDOMServer.renderToString(stub);
expect(markup).toContain('<option selected="" value="giraffe"');
expect(markup).not.toContain('<option selected="" value="monkey"');
@@ -359,12 +370,13 @@ describe('ReactDOMSelect', () => {
});
it('should support server-side rendering with defaultValue', () => {
- var stub =
+ var stub = (
<select defaultValue="giraffe">
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var markup = ReactDOMServer.renderToString(stub);
expect(markup).toContain('<option selected="" value="giraffe"');
expect(markup).not.toContain('<option selected="" value="monkey"');
@@ -372,12 +384,13 @@ describe('ReactDOMSelect', () => {
});
it('should support server-side rendering with multiple', () => {
- var stub =
+ var stub = (
<select multiple={true} value={['giraffe', 'gorilla']} onChange={noop}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
var markup = ReactDOMServer.renderToString(stub);
expect(markup).toContain('<option selected="" value="giraffe"');
expect(markup).toContain('<option selected="" value="gorilla"');
@@ -393,24 +406,24 @@ describe('ReactDOMSelect', () => {
<option key="giraffe" value="giraffe">A giraffe!</option>
<option key="gorilla" value="gorilla">A gorilla!</option>
</select>,
- container
+ container,
);
var node = ReactDOM.findDOMNode(select);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(true); // giraffe
- expect(node.options[2].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(true); // giraffe
+ expect(node.options[2].selected).toBe(false); // gorilla
ReactDOM.render(
<select multiple={true} defaultValue={['giraffe']}>
<option key="monkey" value="monkey">A monkey!</option>
<option key="gorilla" value="gorilla">A gorilla!</option>
</select>,
- container
+ container,
);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(false); // gorilla
ReactDOM.render(
<select multiple={true} defaultValue={['giraffe']}>
@@ -418,35 +431,40 @@ describe('ReactDOMSelect', () => {
<option key="giraffe" value="giraffe">A giraffe!</option>
<option key="gorilla" value="gorilla">A gorilla!</option>
</select>,
- container
+ container,
);
- expect(node.options[0].selected).toBe(false); // monkey
- expect(node.options[1].selected).toBe(false); // giraffe
- expect(node.options[2].selected).toBe(false); // gorilla
+ expect(node.options[0].selected).toBe(false); // monkey
+ expect(node.options[1].selected).toBe(false); // giraffe
+ expect(node.options[2].selected).toBe(false); // gorilla
});
it('should warn if value is null', () => {
spyOn(console, 'error');
- ReactTestUtils.renderIntoDocument(<select value={null}><option value="test" /></select>);
+ ReactTestUtils.renderIntoDocument(
+ <select value={null}><option value="test" /></select>,
+ );
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'`value` prop on `select` should not be null. ' +
- 'Consider using the empty string to clear the component or `undefined` ' +
- 'for uncontrolled components.'
+ 'Consider using the empty string to clear the component or `undefined` ' +
+ 'for uncontrolled components.',
);
- ReactTestUtils.renderIntoDocument(<select value={null}><option value="test" /></select>);
+ ReactTestUtils.renderIntoDocument(
+ <select value={null}><option value="test" /></select>,
+ );
expectDev(console.error.calls.count()).toBe(1);
});
it('should refresh state on change', () => {
- var stub =
+ var stub = (
<select value="giraffe" onChange={noop}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
stub = ReactTestUtils.renderIntoDocument(stub);
var node = ReactDOM.findDOMNode(stub);
@@ -462,14 +480,14 @@ describe('ReactDOMSelect', () => {
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>
+ </select>,
);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'Select elements must be either controlled or uncontrolled ' +
- '(specify either the value prop, or the defaultValue prop, but not ' +
- 'both). Decide between using a controlled or uncontrolled select ' +
- 'element and remove one of these props. More info: ' +
- 'https://fb.me/react-controlled-components'
+ '(specify either the value prop, or the defaultValue prop, but not ' +
+ 'both). Decide between using a controlled or uncontrolled select ' +
+ 'element and remove one of these props. More info: ' +
+ 'https://fb.me/react-controlled-components',
);
ReactTestUtils.renderIntoDocument(
@@ -477,7 +495,7 @@ describe('ReactDOMSelect', () => {
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>
+ </select>,
);
expectDev(console.error.calls.count()).toBe(1);
});
@@ -488,12 +506,13 @@ describe('ReactDOMSelect', () => {
}
var container = document.createElement('div');
- var stub =
+ var stub = (
<select value="giraffe" onChange={changeView}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
- </select>;
+ </select>
+ );
stub = ReactDOM.render(stub, container);
var node = ReactDOM.findDOMNode(stub);
@@ -501,19 +520,20 @@ describe('ReactDOMSelect', () => {
});
it('should select grandchild options nested inside an optgroup', () => {
- var stub =
+ var stub = (
<select value="b" onChange={noop}>
<optgroup label="group">
<option value="a">a</option>
<option value="b">b</option>
<option value="c">c</option>
</optgroup>
- </select>;
+ </select>
+ );
var container = document.createElement('div');
var node = ReactDOM.render(stub, container);
- expect(node.options[0].selected).toBe(false); // a
- expect(node.options[1].selected).toBe(true); // b
- expect(node.options[2].selected).toBe(false); // c
+ expect(node.options[0].selected).toBe(false); // a
+ expect(node.options[1].selected).toBe(true); // b
+ expect(node.options[2].selected).toBe(false); // c
});
});
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
index dbae062a5e..254973dcc7 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
@@ -121,7 +121,7 @@ describe('ReactDOMTextarea', () => {
stub = ReactDOM.render(
<textarea value="gorilla" onChange={emptyFunction} />,
- container
+ container,
);
expect(node.value).toEqual('gorilla');
});
@@ -152,7 +152,7 @@ describe('ReactDOMTextarea', () => {
stub = ReactDOM.render(
<textarea value={true} onChange={emptyFunction} />,
- container
+ container,
);
expect(node.value).toEqual('true');
});
@@ -166,7 +166,7 @@ describe('ReactDOMTextarea', () => {
stub = ReactDOM.render(
<textarea value={false} onChange={emptyFunction} />,
- container
+ container,
);
expect(node.value).toEqual('false');
});
@@ -185,7 +185,7 @@ describe('ReactDOMTextarea', () => {
};
stub = ReactDOM.render(
<textarea value={objToString} onChange={emptyFunction} />,
- container
+ container,
);
expect(node.value).toEqual('foo');
});
@@ -266,7 +266,10 @@ describe('ReactDOMTextarea', () => {
it('should keep value when switching to uncontrolled element if not changed', () => {
var container = document.createElement('div');
- var node = renderTextarea(<textarea value="kitten" onChange={emptyFunction} />, container);
+ var node = renderTextarea(
+ <textarea value="kitten" onChange={emptyFunction} />,
+ container,
+ );
expect(node.value).toBe('kitten');
@@ -278,11 +281,17 @@ describe('ReactDOMTextarea', () => {
it('should keep value when switching to uncontrolled element if changed', () => {
var container = document.createElement('div');
- var node = renderTextarea(<textarea value="kitten" onChange={emptyFunction} />, container);
+ var node = renderTextarea(
+ <textarea value="kitten" onChange={emptyFunction} />,
+ container,
+ );
expect(node.value).toBe('kitten');
- ReactDOM.render(<textarea value="puppies" onChange={emptyFunction} />, container);
+ ReactDOM.render(
+ <textarea value="puppies" onChange={emptyFunction} />,
+ container,
+ );
expect(node.value).toBe('puppies');
@@ -322,7 +331,7 @@ describe('ReactDOMTextarea', () => {
expect(function() {
ReactTestUtils.renderIntoDocument(
- <textarea>{'hello'}{'there'}</textarea>
+ <textarea>{'hello'}{'there'}</textarea>,
);
}).toThrow();
@@ -350,8 +359,8 @@ describe('ReactDOMTextarea', () => {
ReactTestUtils.renderIntoDocument(<textarea value={null} />);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'`value` prop on `textarea` should not be null. ' +
- 'Consider using the empty string to clear the component or `undefined` ' +
- 'for uncontrolled components.'
+ 'Consider using the empty string to clear the component or `undefined` ' +
+ 'for uncontrolled components.',
);
ReactTestUtils.renderIntoDocument(<textarea value={null} />);
@@ -361,20 +370,19 @@ describe('ReactDOMTextarea', () => {
it('should warn if value and defaultValue are specified', () => {
spyOn(console, 'error');
ReactTestUtils.renderIntoDocument(
- <textarea value="foo" defaultValue="bar" readOnly={true} />
+ <textarea value="foo" defaultValue="bar" readOnly={true} />,
);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'Textarea elements must be either controlled or uncontrolled ' +
- '(specify either the value prop, or the defaultValue prop, but not ' +
- 'both). Decide between using a controlled or uncontrolled textarea ' +
- 'and remove one of these props. More info: ' +
- 'https://fb.me/react-controlled-components'
+ '(specify either the value prop, or the defaultValue prop, but not ' +
+ 'both). Decide between using a controlled or uncontrolled textarea ' +
+ 'and remove one of these props. More info: ' +
+ 'https://fb.me/react-controlled-components',
);
ReactTestUtils.renderIntoDocument(
- <textarea value="foo" defaultValue="bar" readOnly={true} />
+ <textarea value="foo" defaultValue="bar" readOnly={true} />,
);
expectDev(console.error.calls.count()).toBe(1);
});
-
});
diff --git a/src/renderers/dom/stack/client/DOMChildrenOperations.js b/src/renderers/dom/stack/client/DOMChildrenOperations.js
index 2200f2529a..6457b21b13 100644
--- a/src/renderers/dom/stack/client/DOMChildrenOperations.js
+++ b/src/renderers/dom/stack/client/DOMChildrenOperations.js
@@ -43,7 +43,7 @@ var insertChildAt = createMicrosoftUnsafeLocalFunction(
// `appendChild(node)`. (Using `undefined` is not allowed by all browsers so
// we are careful to use `null`.)
parentNode.insertBefore(childNode, referenceNode);
- }
+ },
);
function insertLazyTreeChildAt(parentNode, childTree, referenceNode) {
@@ -72,7 +72,7 @@ function moveDelimitedText(
parentNode,
openingComment,
closingComment,
- referenceNode
+ referenceNode,
) {
var node = openingComment;
while (true) {
@@ -107,7 +107,7 @@ function replaceDelimitedText(openingComment, closingComment, stringText) {
insertChildAt(
parentNode,
document.createTextNode(stringText),
- nodeAfterComment
+ nodeAfterComment,
);
}
} else {
@@ -123,7 +123,9 @@ function replaceDelimitedText(openingComment, closingComment, stringText) {
if (__DEV__) {
ReactInstrumentation.debugTool.onHostOperation({
- instanceID: ReactDOMComponentTree.getInstanceFromNode(openingComment)._debugID,
+ instanceID: ReactDOMComponentTree.getInstanceFromNode(
+ openingComment,
+ )._debugID,
type: 'replace text',
payload: stringText,
});
@@ -157,7 +159,6 @@ if (__DEV__) {
* Operations for updating with DOM children.
*/
var DOMChildrenOperations = {
-
dangerouslyReplaceNodeWithMarkup: dangerouslyReplaceNodeWithMarkup,
replaceDelimitedText: replaceDelimitedText,
@@ -171,8 +172,9 @@ var DOMChildrenOperations = {
*/
processUpdates: function(parentNode, updates) {
if (__DEV__) {
- var parentNodeDebugID =
- ReactDOMComponentTree.getInstanceFromNode(parentNode)._debugID;
+ var parentNodeDebugID = ReactDOMComponentTree.getInstanceFromNode(
+ parentNode,
+ )._debugID;
}
for (var k = 0; k < updates.length; k++) {
@@ -182,13 +184,16 @@ var DOMChildrenOperations = {
insertLazyTreeChildAt(
parentNode,
update.content,
- getNodeAfter(parentNode, update.afterNode)
+ getNodeAfter(parentNode, update.afterNode),
);
if (__DEV__) {
ReactInstrumentation.debugTool.onHostOperation({
instanceID: parentNodeDebugID,
type: 'insert child',
- payload: {toIndex: update.toIndex, content: update.content.toString()},
+ payload: {
+ toIndex: update.toIndex,
+ content: update.content.toString(),
+ },
});
}
break;
@@ -196,7 +201,7 @@ var DOMChildrenOperations = {
moveChild(
parentNode,
update.fromNode,
- getNodeAfter(parentNode, update.afterNode)
+ getNodeAfter(parentNode, update.afterNode),
);
if (__DEV__) {
ReactInstrumentation.debugTool.onHostOperation({
@@ -207,10 +212,7 @@ var DOMChildrenOperations = {
}
break;
case 'SET_MARKUP':
- setInnerHTML(
- parentNode,
- update.content
- );
+ setInnerHTML(parentNode, update.content);
if (__DEV__) {
ReactInstrumentation.debugTool.onHostOperation({
instanceID: parentNodeDebugID,
@@ -220,10 +222,7 @@ var DOMChildrenOperations = {
}
break;
case 'TEXT_CONTENT':
- setTextContent(
- parentNode,
- update.content
- );
+ setTextContent(parentNode, update.content);
if (__DEV__) {
ReactInstrumentation.debugTool.onHostOperation({
instanceID: parentNodeDebugID,
@@ -245,7 +244,6 @@ var DOMChildrenOperations = {
}
}
},
-
};
module.exports = DOMChildrenOperations;
diff --git a/src/renderers/dom/stack/client/DOMLazyTree.js b/src/renderers/dom/stack/client/DOMLazyTree.js
index c6c0b98f9e..7d5b6bb1b6 100644
--- a/src/renderers/dom/stack/client/DOMLazyTree.js
+++ b/src/renderers/dom/stack/client/DOMLazyTree.js
@@ -31,14 +31,11 @@ var DOCUMENT_FRAGMENT_NODE_TYPE = 11;
*
* See https://github.com/spicyj/innerhtml-vs-createelement-vs-clonenode.
*/
-var enableLazy = (
- typeof document !== 'undefined' &&
- typeof document.documentMode === 'number'
- ||
- typeof navigator !== 'undefined' &&
- typeof navigator.userAgent === 'string' &&
- /\bEdge\/\d/.test(navigator.userAgent)
-);
+var enableLazy = (typeof document !== 'undefined' &&
+ typeof document.documentMode === 'number') ||
+ (typeof navigator !== 'undefined' &&
+ typeof navigator.userAgent === 'string' &&
+ /\bEdge\/\d/.test(navigator.userAgent));
function insertTreeChildren(tree) {
if (!enableLazy) {
@@ -65,19 +62,20 @@ var insertTreeBefore = createMicrosoftUnsafeLocalFunction(
// this level. Also, some <object> plugins (like Flash Player) will read
// <param> nodes immediately upon insertion into the DOM, so <object>
// must also be populated prior to insertion into the DOM.
- if (tree.node.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE
- ||
- tree.node.nodeType === ELEMENT_NODE_TYPE &&
+ if (
+ tree.node.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE ||
+ (tree.node.nodeType === ELEMENT_NODE_TYPE &&
tree.node.nodeName.toLowerCase() === 'object' &&
(tree.node.namespaceURI == null ||
- tree.node.namespaceURI === DOMNamespaces.html)) {
+ tree.node.namespaceURI === DOMNamespaces.html))
+ ) {
insertTreeChildren(tree);
parentNode.insertBefore(tree.node, referenceNode);
} else {
parentNode.insertBefore(tree.node, referenceNode);
insertTreeChildren(tree);
}
- }
+ },
);
function replaceChildWithTree(oldNode, newTree) {
diff --git a/src/renderers/dom/stack/client/Danger.js b/src/renderers/dom/stack/client/Danger.js
index ddd0f407b7..77542e52c8 100644
--- a/src/renderers/dom/stack/client/Danger.js
+++ b/src/renderers/dom/stack/client/Danger.js
@@ -19,7 +19,6 @@ var emptyFunction = require('fbjs/lib/emptyFunction');
var invariant = require('fbjs/lib/invariant');
var Danger = {
-
/**
* Replaces a node with a string of markup at its current position within its
* parent. The markup must render into a single root node.
@@ -32,17 +31,17 @@ var Danger = {
invariant(
ExecutionEnvironment.canUseDOM,
'dangerouslyReplaceNodeWithMarkup(...): Cannot render markup in a ' +
- 'worker thread. Make sure `window` and `document` are available ' +
- 'globally before requiring React when unit testing or use ' +
- 'ReactDOMServer.renderToString() for server rendering.'
+ 'worker thread. Make sure `window` and `document` are available ' +
+ 'globally before requiring React when unit testing or use ' +
+ 'ReactDOMServer.renderToString() for server rendering.',
);
invariant(markup, 'dangerouslyReplaceNodeWithMarkup(...): Missing markup.');
invariant(
oldChild.nodeName !== 'HTML',
'dangerouslyReplaceNodeWithMarkup(...): Cannot replace markup of the ' +
- '<html> node. This is because browser quirks make this unreliable ' +
- 'and/or slow. If you want to render to the root you must use ' +
- 'server rendering. See ReactDOMServer.renderToString().'
+ '<html> node. This is because browser quirks make this unreliable ' +
+ 'and/or slow. If you want to render to the root you must use ' +
+ 'server rendering. See ReactDOMServer.renderToString().',
);
if (typeof markup === 'string') {
@@ -52,7 +51,6 @@ var Danger = {
DOMLazyTree.replaceChildWithTree(oldChild, markup);
}
},
-
};
module.exports = Danger;
diff --git a/src/renderers/dom/stack/client/ReactComponentBrowserEnvironment.js b/src/renderers/dom/stack/client/ReactComponentBrowserEnvironment.js
index c55233e397..fe874cdc6c 100644
--- a/src/renderers/dom/stack/client/ReactComponentBrowserEnvironment.js
+++ b/src/renderers/dom/stack/client/ReactComponentBrowserEnvironment.js
@@ -20,13 +20,9 @@ var ReactDOMIDOperations = require('ReactDOMIDOperations');
* need for this injection.
*/
var ReactComponentBrowserEnvironment = {
+ processChildrenUpdates: ReactDOMIDOperations.dangerouslyProcessChildrenUpdates,
- processChildrenUpdates:
- ReactDOMIDOperations.dangerouslyProcessChildrenUpdates,
-
- replaceNodeWithMarkup:
- DOMChildrenOperations.dangerouslyReplaceNodeWithMarkup,
-
+ replaceNodeWithMarkup: DOMChildrenOperations.dangerouslyReplaceNodeWithMarkup,
};
module.exports = ReactComponentBrowserEnvironment;
diff --git a/src/renderers/dom/stack/client/ReactDOMComponent.js b/src/renderers/dom/stack/client/ReactDOMComponent.js
index c4eedbae0e..8e73894697 100644
--- a/src/renderers/dom/stack/client/ReactDOMComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMComponent.js
@@ -46,7 +46,7 @@ var listenTo = ReactBrowserEventEmitter.listenTo;
var registrationNameModules = EventPluginRegistry.registrationNameModules;
// For quickly matching children type, to test if can be treated as content.
-var CONTENT_TYPES = {'string': true, 'number': true};
+var CONTENT_TYPES = {string: true, number: true};
var STYLE = 'style';
var HTML = '__html';
@@ -59,7 +59,6 @@ var RESERVED_PROPS = {
// Node type for document fragments (Node.DOCUMENT_FRAGMENT_NODE).
var DOC_FRAGMENT_TYPE = 11;
-
function getDeclarationErrorAddendum(internalInstance) {
if (internalInstance) {
var owner = internalInstance._currentElement._owner || null;
@@ -86,53 +85,52 @@ function assertValidProps(component, props) {
invariant(
props.children == null && props.dangerouslySetInnerHTML == null,
'%s is a void element tag and must neither have `children` nor ' +
- 'use `dangerouslySetInnerHTML`.%s',
+ 'use `dangerouslySetInnerHTML`.%s',
component._tag,
- getDeclarationErrorAddendum(component)
+ getDeclarationErrorAddendum(component),
);
}
if (props.dangerouslySetInnerHTML != null) {
invariant(
props.children == null,
- 'Can only set one of `children` or `props.dangerouslySetInnerHTML`.'
+ 'Can only set one of `children` or `props.dangerouslySetInnerHTML`.',
);
invariant(
typeof props.dangerouslySetInnerHTML === 'object' &&
- HTML in props.dangerouslySetInnerHTML,
+ HTML in props.dangerouslySetInnerHTML,
'`props.dangerouslySetInnerHTML` must be in the form `{__html: ...}`. ' +
- 'Please visit https://fb.me/react-invariant-dangerously-set-inner-html ' +
- 'for more information.'
+ 'Please visit https://fb.me/react-invariant-dangerously-set-inner-html ' +
+ 'for more information.',
);
}
if (__DEV__) {
warning(
props.innerHTML == null,
'Directly setting property `innerHTML` is not permitted. ' +
- 'For more information, lookup documentation on `dangerouslySetInnerHTML`.'
+ 'For more information, lookup documentation on `dangerouslySetInnerHTML`.',
);
warning(
props.suppressContentEditableWarning ||
- !props.contentEditable ||
- props.children == null,
+ !props.contentEditable ||
+ props.children == null,
'A component is `contentEditable` and contains `children` managed by ' +
- 'React. It is now your responsibility to guarantee that none of ' +
- 'those nodes are unexpectedly modified or duplicated. This is ' +
- 'probably not intentional.'
+ 'React. It is now your responsibility to guarantee that none of ' +
+ 'those nodes are unexpectedly modified or duplicated. This is ' +
+ 'probably not intentional.',
);
warning(
- props.onFocusIn == null &&
- props.onFocusOut == null,
+ props.onFocusIn == null && props.onFocusOut == null,
'React uses onFocus and onBlur instead of onFocusIn and onFocusOut. ' +
- 'All React events are normalized to bubble, so onFocusIn and onFocusOut ' +
- 'are not needed/supported by React.'
+ 'All React events are normalized to bubble, so onFocusIn and onFocusOut ' +
+ 'are not needed/supported by React.',
);
}
invariant(
props.style == null || typeof props.style === 'object',
'The `style` prop expects a mapping from style properties to values, ' +
- 'not a string. For example, style={{marginRight: spacing + \'em\'}} when ' +
- 'using JSX.%s',
- getDeclarationErrorAddendum(component)
+ "not a string. For example, style={{marginRight: spacing + 'em'}} when " +
+ 'using JSX.%s',
+ getDeclarationErrorAddendum(component),
);
}
@@ -145,12 +143,15 @@ function ensureListeningTo(inst, registrationName, transaction) {
// bubble.
warning(
registrationName !== 'onScroll' || isEventSupported('scroll', true),
- 'This browser doesn\'t support the `onScroll` event'
+ "This browser doesn't support the `onScroll` event",
);
}
var containerInfo = inst._hostContainerInfo;
- var isDocumentFragment = containerInfo._node && containerInfo._node.nodeType === DOC_FRAGMENT_TYPE;
- var doc = isDocumentFragment ? containerInfo._node : containerInfo._ownerDocument;
+ var isDocumentFragment = containerInfo._node &&
+ containerInfo._node.nodeType === DOC_FRAGMENT_TYPE;
+ var doc = isDocumentFragment
+ ? containerInfo._node
+ : containerInfo._ownerDocument;
listenTo(registrationName, doc);
}
@@ -188,10 +189,17 @@ if (__DEV__) {
validateDOMNesting(null, '' + content, this, this._ancestorInfo);
this._contentDebugID = contentDebugID;
if (hasExistingContent) {
- ReactInstrumentation.debugTool.onBeforeUpdateComponent(contentDebugID, content);
+ ReactInstrumentation.debugTool.onBeforeUpdateComponent(
+ contentDebugID,
+ content,
+ );
ReactInstrumentation.debugTool.onUpdateComponent(contentDebugID);
} else {
- ReactInstrumentation.debugTool.onBeforeMountComponent(contentDebugID, content, debugID);
+ ReactInstrumentation.debugTool.onBeforeMountComponent(
+ contentDebugID,
+ content,
+ debugID,
+ );
ReactInstrumentation.debugTool.onMountComponent(contentDebugID);
ReactInstrumentation.debugTool.onSetChildren(debugID, [contentDebugID]);
}
@@ -250,25 +258,17 @@ function trapBubbledEventsLocal() {
// the state of the tree to be corrupted, `node` here can be null.
invariant(inst._rootNodeID, 'Must be mounted to trap events');
var node = getNode(inst);
- invariant(
- node,
- 'trapBubbledEvent(...): Requires node to be rendered.'
- );
+ invariant(node, 'trapBubbledEvent(...): Requires node to be rendered.');
switch (inst._tag) {
case 'iframe':
case 'object':
inst._wrapperState.listeners = [
- ReactBrowserEventEmitter.trapBubbledEvent(
- 'topLoad',
- 'load',
- node
- ),
+ ReactBrowserEventEmitter.trapBubbledEvent('topLoad', 'load', node),
];
break;
case 'video':
case 'audio':
-
inst._wrapperState.listeners = [];
// Create listener for each media event
for (var event in mediaEvents) {
@@ -277,48 +277,28 @@ function trapBubbledEventsLocal() {
ReactBrowserEventEmitter.trapBubbledEvent(
event,
mediaEvents[event],
- node
- )
+ node,
+ ),
);
}
}
break;
case 'source':
inst._wrapperState.listeners = [
- ReactBrowserEventEmitter.trapBubbledEvent(
- 'topError',
- 'error',
- node
- ),
+ ReactBrowserEventEmitter.trapBubbledEvent('topError', 'error', node),
];
break;
case 'img':
case 'image':
inst._wrapperState.listeners = [
- ReactBrowserEventEmitter.trapBubbledEvent(
- 'topError',
- 'error',
- node
- ),
- ReactBrowserEventEmitter.trapBubbledEvent(
- 'topLoad',
- 'load',
- node
- ),
+ ReactBrowserEventEmitter.trapBubbledEvent('topError', 'error', node),
+ ReactBrowserEventEmitter.trapBubbledEvent('topLoad', 'load', node),
];
break;
case 'form':
inst._wrapperState.listeners = [
- ReactBrowserEventEmitter.trapBubbledEvent(
- 'topReset',
- 'reset',
- node
- ),
- ReactBrowserEventEmitter.trapBubbledEvent(
- 'topSubmit',
- 'submit',
- node
- ),
+ ReactBrowserEventEmitter.trapBubbledEvent('topReset', 'reset', node),
+ ReactBrowserEventEmitter.trapBubbledEvent('topSubmit', 'submit', node),
];
break;
case 'input':
@@ -328,17 +308,13 @@ function trapBubbledEventsLocal() {
ReactBrowserEventEmitter.trapBubbledEvent(
'topInvalid',
'invalid',
- node
+ node,
),
];
break;
case 'details':
inst._wrapperState.listeners = [
- ReactBrowserEventEmitter.trapBubbledEvent(
- 'topToggle',
- 'toggle',
- node
- ),
+ ReactBrowserEventEmitter.trapBubbledEvent('topToggle', 'toggle', node),
];
break;
}
@@ -352,36 +328,39 @@ function postUpdateSelectWrapper() {
// those special-case tags.
var omittedCloseTags = {
- 'area': true,
- 'base': true,
- 'br': true,
- 'col': true,
- 'embed': true,
- 'hr': true,
- 'img': true,
- 'input': true,
- 'keygen': true,
- 'link': true,
- 'meta': true,
- 'param': true,
- 'source': true,
- 'track': true,
- 'wbr': true,
+ area: true,
+ base: true,
+ br: true,
+ col: true,
+ embed: true,
+ hr: true,
+ img: true,
+ input: true,
+ keygen: true,
+ link: true,
+ meta: true,
+ param: true,
+ source: true,
+ track: true,
+ wbr: true,
// NOTE: menuitem's close tag should be omitted, but that causes problems.
};
var newlineEatingTags = {
- 'listing': true,
- 'pre': true,
- 'textarea': true,
+ listing: true,
+ pre: true,
+ textarea: true,
};
// For HTML, certain tags cannot have children. This has the same purpose as
// `omittedCloseTags` except that `menuitem` should still have its closing tag.
-var voidElementTags = Object.assign({
- 'menuitem': true,
-}, omittedCloseTags);
+var voidElementTags = Object.assign(
+ {
+ menuitem: true,
+ },
+ omittedCloseTags,
+);
// We accept any tag to be rendered but since this gets injected into arbitrary
// HTML, we want to make sure that it's a safe tag.
@@ -441,7 +420,6 @@ function ReactDOMComponent(element) {
ReactDOMComponent.displayName = 'ReactDOMComponent';
ReactDOMComponent.Mixin = {
-
/**
* Generates root tag markup then recurses. This method has side effects and
* is not idempotent.
@@ -457,7 +435,7 @@ ReactDOMComponent.Mixin = {
transaction,
hostParent,
hostContainerInfo,
- context
+ context,
) {
this._rootNodeID = globalIdCounter++;
this._domID = hostContainerInfo._idCounter++;
@@ -527,18 +505,20 @@ ReactDOMComponent.Mixin = {
namespaceURI = hostContainerInfo._namespaceURI;
parentTag = hostContainerInfo._tag;
}
- if (namespaceURI == null ||
- namespaceURI === DOMNamespaces.svg && parentTag === 'foreignobject') {
+ if (
+ namespaceURI == null ||
+ (namespaceURI === DOMNamespaces.svg && parentTag === 'foreignobject')
+ ) {
namespaceURI = DOMNamespaces.html;
}
if (namespaceURI === DOMNamespaces.html) {
if (__DEV__) {
warning(
isCustomComponent(this._tag, props) ||
- this._tag === this._currentElement.type,
+ this._tag === this._currentElement.type,
'<%s /> is using uppercase HTML. Always use lowercase HTML tags ' +
- 'in React.',
- this._currentElement.type
+ 'in React.',
+ this._currentElement.type,
);
}
if (this._tag === 'svg') {
@@ -561,8 +541,11 @@ ReactDOMComponent.Mixin = {
// component when server rendering
validateDOMNesting(this._tag, null, this, parentInfo);
}
- this._ancestorInfo =
- validateDOMNesting.updatedAncestorInfo(parentInfo, this._tag, this);
+ this._ancestorInfo = validateDOMNesting.updatedAncestorInfo(
+ parentInfo,
+ this._tag,
+ this,
+ );
}
var mountImage;
@@ -586,20 +569,17 @@ ReactDOMComponent.Mixin = {
el = ownerDocument.createElement(type);
}
} else {
- el = ownerDocument.createElementNS(
- namespaceURI,
- type
- );
+ el = ownerDocument.createElementNS(namespaceURI, type);
}
var isCustomComponentTag = isCustomComponent(this._tag, props);
if (__DEV__ && isCustomComponentTag && !didWarnShadyDOM && el.shadyRoot) {
var owner = this._currentElement._owner;
- var name = owner && owner.getName() || 'A component';
+ var name = (owner && owner.getName()) || 'A component';
warning(
false,
'%s is using shady DOM. Using shady DOM with React can ' +
- 'cause things to break subtly.',
- name
+ 'cause things to break subtly.',
+ name,
);
didWarnShadyDOM = true;
}
@@ -614,7 +594,10 @@ ReactDOMComponent.Mixin = {
mountImage = lazyTree;
} else {
validateDangerousTag(this._tag);
- var tagOpen = this._createOpenTagMarkupAndPutListeners(transaction, props);
+ var tagOpen = this._createOpenTagMarkupAndPutListeners(
+ transaction,
+ props,
+ );
var tagContent = this._createContentMarkup(transaction, props, context);
if (!tagContent && omittedCloseTags[this._tag]) {
mountImage = tagOpen + '/>';
@@ -625,57 +608,43 @@ ReactDOMComponent.Mixin = {
switch (this._tag) {
case 'input':
- transaction.getReactMountReady().enqueue(
- inputPostMount,
- this
- );
+ transaction.getReactMountReady().enqueue(inputPostMount, this);
if (props.autoFocus) {
- transaction.getReactMountReady().enqueue(
- AutoFocusUtils.focusDOMComponent,
- this
- );
+ transaction
+ .getReactMountReady()
+ .enqueue(AutoFocusUtils.focusDOMComponent, this);
}
break;
case 'textarea':
- transaction.getReactMountReady().enqueue(
- textareaPostMount,
- this
- );
+ transaction.getReactMountReady().enqueue(textareaPostMount, this);
if (props.autoFocus) {
- transaction.getReactMountReady().enqueue(
- AutoFocusUtils.focusDOMComponent,
- this
- );
+ transaction
+ .getReactMountReady()
+ .enqueue(AutoFocusUtils.focusDOMComponent, this);
}
break;
case 'select':
if (props.autoFocus) {
- transaction.getReactMountReady().enqueue(
- AutoFocusUtils.focusDOMComponent,
- this
- );
+ transaction
+ .getReactMountReady()
+ .enqueue(AutoFocusUtils.focusDOMComponent, this);
}
break;
case 'button':
if (props.autoFocus) {
- transaction.getReactMountReady().enqueue(
- AutoFocusUtils.focusDOMComponent,
- this
- );
+ transaction
+ .getReactMountReady()
+ .enqueue(AutoFocusUtils.focusDOMComponent, this);
}
break;
case 'option':
- transaction.getReactMountReady().enqueue(
- optionPostMount,
- this
- );
+ transaction.getReactMountReady().enqueue(optionPostMount, this);
break;
default:
if (typeof props.onClick === 'function') {
- transaction.getReactMountReady().enqueue(
- trapClickOnNonInteractiveElement,
- this
- );
+ transaction
+ .getReactMountReady()
+ .enqueue(trapClickOnNonInteractiveElement, this);
}
break;
}
@@ -718,15 +687,24 @@ ReactDOMComponent.Mixin = {
Object.freeze(propValue);
}
}
- propValue = CSSPropertyOperations.createMarkupForStyles(propValue, this);
+ propValue = CSSPropertyOperations.createMarkupForStyles(
+ propValue,
+ this,
+ );
}
var markup = null;
if (this._tag != null && isCustomComponent(this._tag, props)) {
if (!RESERVED_PROPS.hasOwnProperty(propKey)) {
- markup = DOMPropertyOperations.createMarkupForCustomAttribute(propKey, propValue);
+ markup = DOMPropertyOperations.createMarkupForCustomAttribute(
+ propKey,
+ propValue,
+ );
}
} else {
- markup = DOMPropertyOperations.createMarkupForProperty(propKey, propValue);
+ markup = DOMPropertyOperations.createMarkupForProperty(
+ propKey,
+ propValue,
+ );
}
if (markup) {
ret += ' ' + markup;
@@ -766,8 +744,9 @@ ReactDOMComponent.Mixin = {
ret = innerHTML.__html;
}
} else {
- var contentToUse =
- CONTENT_TYPES[typeof props.children] ? props.children : null;
+ var contentToUse = CONTENT_TYPES[typeof props.children]
+ ? props.children
+ : null;
var childrenToUse = contentToUse != null ? null : props.children;
if (contentToUse != null) {
// TODO: Validate that text is allowed as a child of this node
@@ -779,7 +758,7 @@ ReactDOMComponent.Mixin = {
var mountImages = this.mountChildren(
childrenToUse,
transaction,
- context
+ context,
);
ret = mountImages.join('');
}
@@ -810,8 +789,9 @@ ReactDOMComponent.Mixin = {
DOMLazyTree.queueHTML(lazyTree, innerHTMLContent);
}
} else {
- var contentToUse =
- CONTENT_TYPES[typeof props.children] ? props.children : null;
+ var contentToUse = CONTENT_TYPES[typeof props.children]
+ ? props.children
+ : null;
var childrenToUse = contentToUse != null ? null : props.children;
// TODO: Validate that text is allowed as a child of this node
if (contentToUse != null) {
@@ -829,7 +809,7 @@ ReactDOMComponent.Mixin = {
var mountImages = this.mountChildren(
childrenToUse,
transaction,
- context
+ context,
);
for (var i = 0; i < mountImages.length; i++) {
DOMLazyTree.queueChild(lazyTree, mountImages[i]);
@@ -884,25 +864,26 @@ ReactDOMComponent.Mixin = {
nextProps = ReactDOMTextarea.getHostProps(this, nextProps);
break;
default:
- if (typeof lastProps.onClick !== 'function' &&
- typeof nextProps.onClick === 'function') {
- transaction.getReactMountReady().enqueue(
- trapClickOnNonInteractiveElement,
- this
- );
+ if (
+ typeof lastProps.onClick !== 'function' &&
+ typeof nextProps.onClick === 'function'
+ ) {
+ transaction
+ .getReactMountReady()
+ .enqueue(trapClickOnNonInteractiveElement, this);
}
break;
}
assertValidProps(this, nextProps);
var isCustomComponentTag = isCustomComponent(this._tag, nextProps);
- this._updateDOMProperties(lastProps, nextProps, transaction, isCustomComponentTag);
- this._updateDOMChildren(
+ this._updateDOMProperties(
lastProps,
nextProps,
transaction,
- context
+ isCustomComponentTag,
);
+ this._updateDOMChildren(lastProps, nextProps, transaction, context);
switch (this._tag) {
case 'input':
@@ -942,15 +923,17 @@ ReactDOMComponent.Mixin = {
lastProps,
nextProps,
transaction,
- isCustomComponentTag
+ isCustomComponentTag,
) {
var propKey;
var styleName;
var styleUpdates;
for (propKey in lastProps) {
- if (nextProps.hasOwnProperty(propKey) ||
- !lastProps.hasOwnProperty(propKey) ||
- lastProps[propKey] == null) {
+ if (
+ nextProps.hasOwnProperty(propKey) ||
+ !lastProps.hasOwnProperty(propKey) ||
+ lastProps[propKey] == null
+ ) {
continue;
}
if (propKey === STYLE) {
@@ -965,23 +948,23 @@ ReactDOMComponent.Mixin = {
// Do nothing for event names.
} else if (isCustomComponent(this._tag, lastProps)) {
if (!RESERVED_PROPS.hasOwnProperty(propKey)) {
- DOMPropertyOperations.deleteValueForAttribute(
- getNode(this),
- propKey
- );
+ DOMPropertyOperations.deleteValueForAttribute(getNode(this), propKey);
}
} else if (
- DOMProperty.properties[propKey] ||
- DOMProperty.isCustomAttribute(propKey)) {
+ DOMProperty.properties[propKey] ||
+ DOMProperty.isCustomAttribute(propKey)
+ ) {
DOMPropertyOperations.deleteValueForProperty(getNode(this), propKey);
}
}
for (propKey in nextProps) {
var nextProp = nextProps[propKey];
var lastProp = lastProps != null ? lastProps[propKey] : undefined;
- if (!nextProps.hasOwnProperty(propKey) ||
- nextProp === lastProp ||
- nextProp == null && lastProp == null) {
+ if (
+ !nextProps.hasOwnProperty(propKey) ||
+ nextProp === lastProp ||
+ (nextProp == null && lastProp == null)
+ ) {
continue;
}
if (propKey === STYLE) {
@@ -993,16 +976,20 @@ ReactDOMComponent.Mixin = {
if (lastProp) {
// Unset styles on `lastProp` but not on `nextProp`.
for (styleName in lastProp) {
- if (lastProp.hasOwnProperty(styleName) &&
- (!nextProp || !nextProp.hasOwnProperty(styleName))) {
+ if (
+ lastProp.hasOwnProperty(styleName) &&
+ (!nextProp || !nextProp.hasOwnProperty(styleName))
+ ) {
styleUpdates = styleUpdates || {};
styleUpdates[styleName] = '';
}
}
// Update styles that changed since `lastProp`.
for (styleName in nextProp) {
- if (nextProp.hasOwnProperty(styleName) &&
- lastProp[styleName] !== nextProp[styleName]) {
+ if (
+ nextProp.hasOwnProperty(styleName) &&
+ lastProp[styleName] !== nextProp[styleName]
+ ) {
styleUpdates = styleUpdates || {};
styleUpdates[styleName] = nextProp[styleName];
}
@@ -1020,12 +1007,13 @@ ReactDOMComponent.Mixin = {
DOMPropertyOperations.setValueForAttribute(
getNode(this),
propKey,
- nextProp
+ nextProp,
);
}
} else if (
- DOMProperty.properties[propKey] ||
- DOMProperty.isCustomAttribute(propKey)) {
+ DOMProperty.properties[propKey] ||
+ DOMProperty.isCustomAttribute(propKey)
+ ) {
var node = getNode(this);
// If we're updating to null or undefined, we should remove the property
// from the DOM node instead of inadvertently setting to a string. This
@@ -1048,7 +1036,7 @@ ReactDOMComponent.Mixin = {
CSSPropertyOperations.setValueForStyles(
getNode(this),
styleUpdates,
- this
+ this,
);
}
},
@@ -1063,16 +1051,16 @@ ReactDOMComponent.Mixin = {
* @param {object} context
*/
_updateDOMChildren: function(lastProps, nextProps, transaction, context) {
- var lastContent =
- CONTENT_TYPES[typeof lastProps.children] ? lastProps.children : null;
- var nextContent =
- CONTENT_TYPES[typeof nextProps.children] ? nextProps.children : null;
+ var lastContent = CONTENT_TYPES[typeof lastProps.children]
+ ? lastProps.children
+ : null;
+ var nextContent = CONTENT_TYPES[typeof nextProps.children]
+ ? nextProps.children
+ : null;
- var lastHtml =
- lastProps.dangerouslySetInnerHTML &&
+ var lastHtml = lastProps.dangerouslySetInnerHTML &&
lastProps.dangerouslySetInnerHTML.__html;
- var nextHtml =
- nextProps.dangerouslySetInnerHTML &&
+ var nextHtml = nextProps.dangerouslySetInnerHTML &&
nextProps.dangerouslySetInnerHTML.__html;
// Note the use of `!=` which checks for null or undefined.
@@ -1159,11 +1147,11 @@ ReactDOMComponent.Mixin = {
invariant(
false,
'<%s> tried to unmount. Because of cross-browser quirks it is ' +
- 'impossible to unmount some top-level components (eg <html>, ' +
- '<head>, and <body>) reliably and efficiently. To fix this, have a ' +
- 'single top-level component that never unmounts render these ' +
- 'elements.',
- this._tag
+ 'impossible to unmount some top-level components (eg <html>, ' +
+ '<head>, and <body>) reliably and efficiently. To fix this, have a ' +
+ 'single top-level component that never unmounts render these ' +
+ 'elements.',
+ this._tag,
);
break;
}
@@ -1196,13 +1184,12 @@ ReactDOMComponent.Mixin = {
getPublicInstance: function() {
return getNode(this);
},
-
};
Object.assign(
ReactDOMComponent.prototype,
ReactDOMComponent.Mixin,
- ReactMultiChild
+ ReactMultiChild,
);
module.exports = ReactDOMComponent;
diff --git a/src/renderers/dom/stack/client/ReactDOMContainerInfo.js b/src/renderers/dom/stack/client/ReactDOMContainerInfo.js
index 0f74f733a7..263c42c764 100644
--- a/src/renderers/dom/stack/client/ReactDOMContainerInfo.js
+++ b/src/renderers/dom/stack/client/ReactDOMContainerInfo.js
@@ -19,16 +19,17 @@ function ReactDOMContainerInfo(topLevelWrapper, node) {
var info = {
_topLevelWrapper: topLevelWrapper,
_idCounter: 1,
- _ownerDocument: node ?
- node.nodeType === DOC_NODE_TYPE ? node : node.ownerDocument :
- null,
+ _ownerDocument: node
+ ? node.nodeType === DOC_NODE_TYPE ? node : node.ownerDocument
+ : null,
_node: node,
_tag: node ? node.nodeName.toLowerCase() : null,
_namespaceURI: node ? node.namespaceURI : null,
};
if (__DEV__) {
- info._ancestorInfo = node ?
- validateDOMNesting.updatedAncestorInfo(null, info._tag, null) : null;
+ info._ancestorInfo = node
+ ? validateDOMNesting.updatedAncestorInfo(null, info._tag, null)
+ : null;
}
return info;
}
diff --git a/src/renderers/dom/stack/client/ReactDOMEmptyComponent.js b/src/renderers/dom/stack/client/ReactDOMEmptyComponent.js
index 0a7b8c6b2f..bbc6316342 100644
--- a/src/renderers/dom/stack/client/ReactDOMEmptyComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMEmptyComponent.js
@@ -14,7 +14,6 @@
var DOMLazyTree = require('DOMLazyTree');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
-
var ReactDOMEmptyComponent = function(instantiate) {
// ReactCompositeComponent uses this:
this._currentElement = null;
@@ -29,7 +28,7 @@ Object.assign(ReactDOMEmptyComponent.prototype, {
transaction,
hostParent,
hostContainerInfo,
- context
+ context,
) {
var domID = hostContainerInfo._idCounter++;
this._domID = domID;
@@ -52,8 +51,7 @@ Object.assign(ReactDOMEmptyComponent.prototype, {
return '<!--' + nodeValue + '-->';
}
},
- receiveComponent: function() {
- },
+ receiveComponent: function() {},
getHostNode: function() {
return ReactDOMComponentTree.getNodeFromInstance(this);
},
diff --git a/src/renderers/dom/stack/client/ReactDOMIDOperations.js b/src/renderers/dom/stack/client/ReactDOMIDOperations.js
index fd8c16797b..e24335341d 100644
--- a/src/renderers/dom/stack/client/ReactDOMIDOperations.js
+++ b/src/renderers/dom/stack/client/ReactDOMIDOperations.js
@@ -18,7 +18,6 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');
* Operations used to process updates to DOM nodes.
*/
var ReactDOMIDOperations = {
-
/**
* Updates a component's children by processing a series of updates.
*
diff --git a/src/renderers/dom/stack/client/ReactDOMStackInjection.js b/src/renderers/dom/stack/client/ReactDOMStackInjection.js
index 379628873c..8ca7c1c9ee 100644
--- a/src/renderers/dom/stack/client/ReactDOMStackInjection.js
+++ b/src/renderers/dom/stack/client/ReactDOMStackInjection.js
@@ -12,8 +12,7 @@
'use strict';
var ReactComponentEnvironment = require('ReactComponentEnvironment');
-var ReactComponentBrowserEnvironment =
- require('ReactComponentBrowserEnvironment');
+var ReactComponentBrowserEnvironment = require('ReactComponentBrowserEnvironment');
var ReactDOMComponent = require('ReactDOMComponent');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactDOMEmptyComponent = require('ReactDOMEmptyComponent');
@@ -40,31 +39,25 @@ function inject() {
alreadyInjected = true;
ReactGenericBatching.injection.injectStackBatchedUpdates(
- ReactUpdates.batchedUpdates
+ ReactUpdates.batchedUpdates,
);
- ReactHostComponent.injection.injectGenericComponentClass(
- ReactDOMComponent
- );
+ ReactHostComponent.injection.injectGenericComponentClass(ReactDOMComponent);
- ReactHostComponent.injection.injectTextComponentClass(
- ReactDOMTextComponent
- );
+ ReactHostComponent.injection.injectTextComponentClass(ReactDOMTextComponent);
ReactEmptyComponent.injection.injectEmptyComponentFactory(
function(instantiate) {
return new ReactDOMEmptyComponent(instantiate);
- }
+ },
);
- ReactUpdates.injection.injectReconcileTransaction(
- ReactReconcileTransaction
- );
- ReactUpdates.injection.injectBatchingStrategy(
- ReactDefaultBatchingStrategy
- );
+ ReactUpdates.injection.injectReconcileTransaction(ReactReconcileTransaction);
+ ReactUpdates.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy);
- ReactComponentEnvironment.injection.injectEnvironment(ReactComponentBrowserEnvironment);
+ ReactComponentEnvironment.injection.injectEnvironment(
+ ReactComponentBrowserEnvironment,
+ );
findDOMNode._injectStack(function(inst) {
inst = getHostComponentFromComposite(inst);
diff --git a/src/renderers/dom/stack/client/ReactDOMTextComponent.js b/src/renderers/dom/stack/client/ReactDOMTextComponent.js
index 1046b33e66..3ff3a47f92 100644
--- a/src/renderers/dom/stack/client/ReactDOMTextComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMTextComponent.js
@@ -50,7 +50,6 @@ var ReactDOMTextComponent = function(text) {
};
Object.assign(ReactDOMTextComponent.prototype, {
-
/**
* Creates the markup for this text node. This node is not intended to have
* any features besides containing text content.
@@ -63,7 +62,7 @@ Object.assign(ReactDOMTextComponent.prototype, {
transaction,
hostParent,
hostContainerInfo,
- context
+ context,
) {
if (__DEV__) {
var parentInfo;
@@ -93,7 +92,7 @@ Object.assign(ReactDOMTextComponent.prototype, {
if (this._stringText) {
DOMLazyTree.queueChild(
lazyTree,
- DOMLazyTree(ownerDocument.createTextNode(this._stringText))
+ DOMLazyTree(ownerDocument.createTextNode(this._stringText)),
);
}
DOMLazyTree.queueChild(lazyTree, DOMLazyTree(closingComment));
@@ -110,10 +109,13 @@ Object.assign(ReactDOMTextComponent.prototype, {
return escapedText;
}
- return (
- '<!--' + openingValue + '-->' + escapedText +
- '<!--' + closingValue + '-->'
- );
+ return '<!--' +
+ openingValue +
+ '-->' +
+ escapedText +
+ '<!--' +
+ closingValue +
+ '-->';
}
},
@@ -137,7 +139,7 @@ Object.assign(ReactDOMTextComponent.prototype, {
DOMChildrenOperations.replaceDelimitedText(
commentNodes[0],
commentNodes[1],
- nextStringText
+ nextStringText,
);
}
}
@@ -155,7 +157,7 @@ Object.assign(ReactDOMTextComponent.prototype, {
invariant(
node != null,
'Missing closing comment for text component %s',
- this._domID
+ this._domID,
);
if (node.nodeType === 8 && node.nodeValue === ' /react-text ') {
this._closingComment = node;
@@ -174,7 +176,6 @@ Object.assign(ReactDOMTextComponent.prototype, {
this._commentNodes = null;
ReactDOMComponentTree.uncacheNode(this);
},
-
});
module.exports = ReactDOMTextComponent;
diff --git a/src/renderers/dom/stack/client/ReactMount.js b/src/renderers/dom/stack/client/ReactMount.js
index aea392aeeb..20940c6fce 100644
--- a/src/renderers/dom/stack/client/ReactMount.js
+++ b/src/renderers/dom/stack/client/ReactMount.js
@@ -81,7 +81,7 @@ function internalGetID(node) {
// If node is something like a window, document, or text node, none of
// which support attributes or a .getAttribute method, gracefully return
// the empty string, as if the attribute were missing.
- return node.getAttribute && node.getAttribute(ATTR_NAME) || '';
+ return (node.getAttribute && node.getAttribute(ATTR_NAME)) || '';
}
/**
@@ -97,16 +97,14 @@ function mountComponentIntoNode(
container,
transaction,
shouldReuseMarkup,
- context
+ context,
) {
var markerName;
if (ReactFeatureFlags.logTopLevelRenders) {
var wrappedElement = wrapperInstance._currentElement.props.child;
var type = wrappedElement.type;
- markerName = 'React mount: ' + (
- typeof type === 'string' ? type :
- type.displayName || type.name
- );
+ markerName = 'React mount: ' +
+ (typeof type === 'string' ? type : type.displayName || type.name);
console.time(markerName);
}
@@ -116,7 +114,7 @@ function mountComponentIntoNode(
null,
ReactDOMContainerInfo(wrapperInstance, container),
context,
- 0 /* parentDebugID */
+ 0 /* parentDebugID */,
);
if (markerName) {
@@ -129,7 +127,7 @@ function mountComponentIntoNode(
container,
wrapperInstance,
shouldReuseMarkup,
- transaction
+ transaction,
);
}
@@ -144,11 +142,11 @@ function batchedMountComponentIntoNode(
componentInstance,
container,
shouldReuseMarkup,
- context
+ context,
) {
var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(
/* useCreateElement */
- !shouldReuseMarkup && ReactDOMFeatureFlags.useCreateElement
+ !shouldReuseMarkup && ReactDOMFeatureFlags.useCreateElement,
);
transaction.perform(
mountComponentIntoNode,
@@ -157,7 +155,7 @@ function batchedMountComponentIntoNode(
container,
transaction,
shouldReuseMarkup,
- context
+ context,
);
ReactUpdates.ReactReconcileTransaction.release(transaction);
}
@@ -178,7 +176,7 @@ function unmountComponentFromNode(instance, container) {
ReactReconciler.unmountComponent(
instance,
false /* safely */,
- false /* skipLifecycle */
+ false /* skipLifecycle */,
);
if (__DEV__) {
ReactInstrumentation.debugTool.onEndFlush();
@@ -222,7 +220,9 @@ function hasNonRootReactChild(container) {
*/
function nodeIsRenderedByOtherInstance(container) {
var rootEl = getReactRootElementInContainer(container);
- return !!(rootEl && isReactNode(rootEl) && !ReactDOMComponentTree.getInstanceFromNode(rootEl));
+ return !!(rootEl &&
+ isReactNode(rootEl) &&
+ !ReactDOMComponentTree.getInstanceFromNode(rootEl));
}
/**
@@ -233,11 +233,10 @@ function nodeIsRenderedByOtherInstance(container) {
* @internal
*/
function isValidContainer(node) {
- return !!(node && (
- node.nodeType === ELEMENT_NODE_TYPE ||
- node.nodeType === DOC_NODE_TYPE ||
- node.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE
- ));
+ return !!(node &&
+ (node.nodeType === ELEMENT_NODE_TYPE ||
+ node.nodeType === DOC_NODE_TYPE ||
+ node.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE));
}
/**
@@ -248,17 +247,17 @@ function isValidContainer(node) {
* @internal
*/
function isReactNode(node) {
- return isValidContainer(node) && (node.hasAttribute(ROOT_ATTR_NAME) || node.hasAttribute(ATTR_NAME));
+ return isValidContainer(node) &&
+ (node.hasAttribute(ROOT_ATTR_NAME) || node.hasAttribute(ATTR_NAME));
}
function getHostRootInstanceInContainer(container) {
var rootEl = getReactRootElementInContainer(container);
- var prevHostInstance =
- rootEl && ReactDOMComponentTree.getInstanceFromNode(rootEl);
- return (
- prevHostInstance && !prevHostInstance._hostParent ?
- prevHostInstance : null
- );
+ var prevHostInstance = rootEl &&
+ ReactDOMComponentTree.getInstanceFromNode(rootEl);
+ return prevHostInstance && !prevHostInstance._hostParent
+ ? prevHostInstance
+ : null;
}
function getTopLevelWrapperInContainer(container) {
@@ -303,7 +302,6 @@ TopLevelWrapper.isReactTopLevelWrapper = true;
* Inside of `container`, the first element rendered is the "reactRoot".
*/
var ReactMount = {
-
TopLevelWrapper: TopLevelWrapper,
/**
@@ -331,13 +329,18 @@ var ReactMount = {
* @param {?function} callback function triggered on completion
*/
_updateRootComponent: function(
- prevComponent,
- nextElement,
- nextContext,
- container,
- callback) {
+ prevComponent,
+ nextElement,
+ nextContext,
+ container,
+ callback,
+ ) {
ReactMount.scrollMonitor(container, function() {
- ReactUpdateQueue.enqueueElementInternal(prevComponent, nextElement, nextContext);
+ ReactUpdateQueue.enqueueElementInternal(
+ prevComponent,
+ nextElement,
+ nextContext,
+ );
if (callback) {
ReactUpdateQueue.enqueueCallbackInternal(prevComponent, callback);
}
@@ -359,7 +362,7 @@ var ReactMount = {
container,
shouldReuseMarkup,
context,
- callback
+ callback,
) {
// Various parts of our code (such as ReactCompositeComponent's
// _renderValidatedComponent) assume that calls to render aren't nested;
@@ -367,26 +370,30 @@ var ReactMount = {
warning(
ReactCurrentOwner.current == null,
'_renderNewRootComponent(): Render methods should be a pure function ' +
- 'of props and state; triggering nested component updates from ' +
- 'render is not allowed. If necessary, trigger nested updates in ' +
- 'componentDidUpdate.\n\nCheck the render method of %s.',
- ReactCurrentOwner.current && ReactCurrentOwner.current.getName() ||
- 'ReactCompositeComponent'
+ 'of props and state; triggering nested component updates from ' +
+ 'render is not allowed. If necessary, trigger nested updates in ' +
+ 'componentDidUpdate.\n\nCheck the render method of %s.',
+ (ReactCurrentOwner.current && ReactCurrentOwner.current.getName()) ||
+ 'ReactCompositeComponent',
);
invariant(
isValidContainer(container),
- '_registerComponent(...): Target container is not a DOM element.'
+ '_registerComponent(...): Target container is not a DOM element.',
);
ReactBrowserEventEmitter.ensureScrollValueMonitoring();
var componentInstance = instantiateReactComponent(nextElement, false);
if (callback) {
- componentInstance._pendingCallbacks = [function() {
- validateCallback(callback);
- callback.call(componentInstance._renderedComponent.getPublicInstance());
- }];
+ componentInstance._pendingCallbacks = [
+ function() {
+ validateCallback(callback);
+ callback.call(
+ componentInstance._renderedComponent.getPublicInstance(),
+ );
+ },
+ ];
}
// The initial render is synchronous but any updates that happen during
@@ -398,7 +405,7 @@ var ReactMount = {
componentInstance,
container,
shouldReuseMarkup,
- context
+ context,
);
var wrapperID = componentInstance._instance.rootID;
@@ -420,27 +427,37 @@ var ReactMount = {
* @param {?function} callback function triggered on completion
* @return {ReactComponent} Component instance rendered in `container`.
*/
- renderSubtreeIntoContainer: function(parentComponent, nextElement, container, callback) {
+ renderSubtreeIntoContainer: function(
+ parentComponent,
+ nextElement,
+ container,
+ callback,
+ ) {
invariant(
parentComponent != null && ReactInstanceMap.has(parentComponent),
- 'parentComponent must be a valid React Component'
+ 'parentComponent must be a valid React Component',
);
return ReactMount._renderSubtreeIntoContainer(
parentComponent,
nextElement,
container,
- callback
+ callback,
);
},
- _renderSubtreeIntoContainer: function(parentComponent, nextElement, container, callback) {
+ _renderSubtreeIntoContainer: function(
+ parentComponent,
+ nextElement,
+ container,
+ callback,
+ ) {
callback = callback === undefined ? null : callback;
if (__DEV__) {
warning(
callback === null || typeof callback === 'function',
'render(...): Expected the last optional `callback` argument to be a ' +
- 'function. Instead received: %s.',
- '' + callback
+ 'function. Instead received: %s.',
+ '' + callback,
);
}
if (!React.isValidElement(nextElement)) {
@@ -448,46 +465,45 @@ var ReactMount = {
invariant(
false,
'ReactDOM.render(): Invalid component element. Instead of ' +
- 'passing a string like \'div\', pass ' +
- 'React.createElement(\'div\') or <div />.'
+ "passing a string like 'div', pass " +
+ "React.createElement('div') or <div />.",
);
} else if (typeof nextElement === 'function') {
invariant(
false,
'ReactDOM.render(): Invalid component element. Instead of ' +
- 'passing a class like Foo, pass React.createElement(Foo) ' +
- 'or <Foo />.'
+ 'passing a class like Foo, pass React.createElement(Foo) ' +
+ 'or <Foo />.',
);
- } else if (nextElement != null && typeof nextElement.props !== 'undefined') {
+ } else if (
+ nextElement != null && typeof nextElement.props !== 'undefined'
+ ) {
// Check if it quacks like an element
invariant(
false,
'ReactDOM.render(): Invalid component element. This may be ' +
- 'caused by unintentionally loading two independent copies ' +
- 'of React.'
+ 'caused by unintentionally loading two independent copies ' +
+ 'of React.',
);
} else {
- invariant(
- false,
- 'ReactDOM.render(): Invalid component element.'
- );
+ invariant(false, 'ReactDOM.render(): Invalid component element.');
}
}
warning(
- !container || !container.tagName ||
- container.tagName.toUpperCase() !== 'BODY',
+ !container ||
+ !container.tagName ||
+ container.tagName.toUpperCase() !== 'BODY',
'render(): Rendering components directly into document.body is ' +
- 'discouraged, since its children are often manipulated by third-party ' +
- 'scripts and browser extensions. This may lead to subtle ' +
- 'reconciliation issues. Try rendering into a container element created ' +
- 'for your app.'
+ 'discouraged, since its children are often manipulated by third-party ' +
+ 'scripts and browser extensions. This may lead to subtle ' +
+ 'reconciliation issues. Try rendering into a container element created ' +
+ 'for your app.',
);
- var nextWrappedElement = React.createElement(
- TopLevelWrapper,
- { child: nextElement }
- );
+ var nextWrappedElement = React.createElement(TopLevelWrapper, {
+ child: nextElement,
+ });
var nextContext = getContextForSubtree(parentComponent);
var prevComponent = getTopLevelWrapperInContainer(container);
@@ -497,16 +513,17 @@ var ReactMount = {
var prevElement = prevWrappedElement.props.child;
if (shouldUpdateReactComponent(prevElement, nextElement)) {
var publicInst = prevComponent._renderedComponent.getPublicInstance();
- var updatedCallback = callback && function() {
- validateCallback(callback);
- callback.call(publicInst);
- };
+ var updatedCallback = callback &&
+ function() {
+ validateCallback(callback);
+ callback.call(publicInst);
+ };
ReactMount._updateRootComponent(
prevComponent,
nextWrappedElement,
nextContext,
container,
- updatedCallback
+ updatedCallback,
);
return publicInst;
} else {
@@ -515,17 +532,17 @@ var ReactMount = {
}
var reactRootElement = getReactRootElementInContainer(container);
- var containerHasReactMarkup =
- reactRootElement && !!internalGetID(reactRootElement);
+ var containerHasReactMarkup = reactRootElement &&
+ !!internalGetID(reactRootElement);
var containerHasNonRootReactChild = hasNonRootReactChild(container);
if (__DEV__) {
warning(
!containerHasNonRootReactChild,
'render(...): Replacing React-rendered children with a new root ' +
- 'component. If you intended to update the children of this node, ' +
- 'you should instead have the existing children update their state ' +
- 'and render the new components instead of calling ReactDOM.render.'
+ 'component. If you intended to update the children of this node, ' +
+ 'you should instead have the existing children update their state ' +
+ 'and render the new components instead of calling ReactDOM.render.',
);
if (!containerHasReactMarkup || reactRootElement.nextSibling) {
@@ -535,8 +552,8 @@ var ReactMount = {
warning(
false,
'render(): Target node has markup rendered by React, but there ' +
- 'are unrelated nodes as well. This is most commonly caused by ' +
- 'white-space inserted around server-rendered markup.'
+ 'are unrelated nodes as well. This is most commonly caused by ' +
+ 'white-space inserted around server-rendered markup.',
);
break;
}
@@ -545,8 +562,7 @@ var ReactMount = {
}
}
- var shouldReuseMarkup =
- containerHasReactMarkup &&
+ var shouldReuseMarkup = containerHasReactMarkup &&
!prevComponent &&
!containerHasNonRootReactChild;
var component = ReactMount._renderNewRootComponent(
@@ -554,12 +570,11 @@ var ReactMount = {
container,
shouldReuseMarkup,
nextContext,
- callback
+ callback,
)._renderedComponent.getPublicInstance();
return component;
},
-
/**
* Renders a React component into the DOM in the supplied `container`.
* See https://facebook.github.io/react/docs/react-dom.html#render
@@ -574,7 +589,12 @@ var ReactMount = {
* @return {ReactComponent} Component instance rendered in `container`.
*/
render: function(nextElement, container, callback) {
- return ReactMount._renderSubtreeIntoContainer(null, nextElement, container, callback);
+ return ReactMount._renderSubtreeIntoContainer(
+ null,
+ nextElement,
+ container,
+ callback,
+ );
},
/**
@@ -593,23 +613,23 @@ var ReactMount = {
warning(
ReactCurrentOwner.current == null,
'unmountComponentAtNode(): Render methods should be a pure function ' +
- 'of props and state; triggering nested component updates from render ' +
- 'is not allowed. If necessary, trigger nested updates in ' +
- 'componentDidUpdate.\n\nCheck the render method of %s.',
- ReactCurrentOwner.current && ReactCurrentOwner.current.getName() ||
- 'ReactCompositeComponent'
+ 'of props and state; triggering nested component updates from render ' +
+ 'is not allowed. If necessary, trigger nested updates in ' +
+ 'componentDidUpdate.\n\nCheck the render method of %s.',
+ (ReactCurrentOwner.current && ReactCurrentOwner.current.getName()) ||
+ 'ReactCompositeComponent',
);
invariant(
isValidContainer(container),
- 'unmountComponentAtNode(...): Target container is not a DOM element.'
+ 'unmountComponentAtNode(...): Target container is not a DOM element.',
);
if (__DEV__) {
warning(
!nodeIsRenderedByOtherInstance(container),
- 'unmountComponentAtNode(): The node you\'re attempting to unmount ' +
- 'was rendered by another copy of React.'
+ "unmountComponentAtNode(): The node you're attempting to unmount " +
+ 'was rendered by another copy of React.',
);
}
@@ -620,21 +640,19 @@ var ReactMount = {
var containerHasNonRootReactChild = hasNonRootReactChild(container);
// Check if the container itself is a React root node.
- var isContainerReactRoot =
- container.nodeType === 1 && container.hasAttribute(ROOT_ATTR_NAME);
+ var isContainerReactRoot = container.nodeType === 1 &&
+ container.hasAttribute(ROOT_ATTR_NAME);
if (__DEV__) {
warning(
!containerHasNonRootReactChild,
- 'unmountComponentAtNode(): The node you\'re attempting to unmount ' +
- 'was rendered by React and is not a top-level container. %s',
- (
- isContainerReactRoot ?
- 'You may have accidentally passed in a React root node instead ' +
- 'of its container.' :
- 'Instead, have the parent component update its state and ' +
- 'rerender in order to remove this component.'
- )
+ "unmountComponentAtNode(): The node you're attempting to unmount " +
+ 'was rendered by React and is not a top-level container. %s',
+ isContainerReactRoot
+ ? 'You may have accidentally passed in a React root node instead ' +
+ 'of its container.'
+ : 'Instead, have the parent component update its state and ' +
+ 'rerender in order to remove this component.',
);
}
@@ -644,7 +662,7 @@ var ReactMount = {
ReactUpdates.batchedUpdates(
unmountComponentFromNode,
prevComponent,
- container
+ container,
);
return true;
},
@@ -654,11 +672,11 @@ var ReactMount = {
container,
instance,
shouldReuseMarkup,
- transaction
+ transaction,
) {
invariant(
isValidContainer(container),
- 'mountComponentIntoNode(...): Target container is not valid.'
+ 'mountComponentIntoNode(...): Target container is not valid.',
);
if (shouldReuseMarkup) {
@@ -668,14 +686,14 @@ var ReactMount = {
return;
} else {
var checksum = rootElement.getAttribute(
- ReactMarkupChecksum.CHECKSUM_ATTR_NAME
+ ReactMarkupChecksum.CHECKSUM_ATTR_NAME,
);
rootElement.removeAttribute(ReactMarkupChecksum.CHECKSUM_ATTR_NAME);
var rootMarkup = rootElement.outerHTML;
rootElement.setAttribute(
ReactMarkupChecksum.CHECKSUM_ATTR_NAME,
- checksum
+ checksum,
);
var normalizedMarkup = markup;
@@ -701,33 +719,34 @@ var ReactMount = {
var diffIndex = firstDifferenceIndex(normalizedMarkup, rootMarkup);
var difference = ' (client) ' +
normalizedMarkup.substring(diffIndex - 20, diffIndex + 20) +
- '\n (server) ' + rootMarkup.substring(diffIndex - 20, diffIndex + 20);
+ '\n (server) ' +
+ rootMarkup.substring(diffIndex - 20, diffIndex + 20);
invariant(
container.nodeType !== DOC_NODE_TYPE,
- 'You\'re trying to render a component to the document using ' +
- 'server rendering but the checksum was invalid. This usually ' +
- 'means you rendered a different component type or props on ' +
- 'the client from the one on the server, or your render() ' +
- 'methods are impure. React cannot handle this case due to ' +
- 'cross-browser quirks by rendering at the document root. You ' +
- 'should look for environment dependent code in your components ' +
- 'and ensure the props are the same client and server side:\n%s',
- difference
+ "You're trying to render a component to the document using " +
+ 'server rendering but the checksum was invalid. This usually ' +
+ 'means you rendered a different component type or props on ' +
+ 'the client from the one on the server, or your render() ' +
+ 'methods are impure. React cannot handle this case due to ' +
+ 'cross-browser quirks by rendering at the document root. You ' +
+ 'should look for environment dependent code in your components ' +
+ 'and ensure the props are the same client and server side:\n%s',
+ difference,
);
if (__DEV__) {
warning(
false,
'React attempted to reuse markup in a container but the ' +
- 'checksum was invalid. This generally means that you are ' +
- 'using server rendering and the markup generated on the ' +
- 'server was not what the client was expecting. React injected ' +
- 'new markup to compensate which works but you have lost many ' +
- 'of the benefits of server rendering. Instead, figure out ' +
- 'why the markup being generated is different on the client ' +
- 'or server:\n%s',
- difference
+ 'checksum was invalid. This generally means that you are ' +
+ 'using server rendering and the markup generated on the ' +
+ 'server was not what the client was expecting. React injected ' +
+ 'new markup to compensate which works but you have lost many ' +
+ 'of the benefits of server rendering. Instead, figure out ' +
+ 'why the markup being generated is different on the client ' +
+ 'or server:\n%s',
+ difference,
);
}
}
@@ -735,10 +754,10 @@ var ReactMount = {
invariant(
container.nodeType !== DOC_NODE_TYPE,
- 'You\'re trying to render a component to the document but ' +
- 'you didn\'t use server rendering. We can\'t do this ' +
+ "You're trying to render a component to the document but " +
+ "you didn't use server rendering. We can't do this " +
'without using server rendering due to cross-browser quirks. ' +
- 'See ReactDOMServer.renderToString() for server rendering.'
+ 'See ReactDOMServer.renderToString() for server rendering.',
);
if (transaction.useCreateElement) {
@@ -752,7 +771,9 @@ var ReactMount = {
}
if (__DEV__) {
- var hostNode = ReactDOMComponentTree.getInstanceFromNode(container.firstChild);
+ var hostNode = ReactDOMComponentTree.getInstanceFromNode(
+ container.firstChild,
+ );
if (hostNode._debugID !== 0) {
ReactInstrumentation.debugTool.onHostOperation({
instanceID: hostNode._debugID,
diff --git a/src/renderers/dom/stack/client/ReactReconcileTransaction.js b/src/renderers/dom/stack/client/ReactReconcileTransaction.js
index a14cb71cbf..732709e211 100644
--- a/src/renderers/dom/stack/client/ReactReconcileTransaction.js
+++ b/src/renderers/dom/stack/client/ReactReconcileTransaction.js
@@ -19,7 +19,6 @@ var ReactInstrumentation = require('ReactInstrumentation');
var Transaction = require('Transaction');
var ReactUpdateQueue = require('ReactUpdateQueue');
-
/**
* Ensures that, when possible, the selection range (currently selected text
* input) is not disturbed by performing the transaction.
@@ -174,7 +173,6 @@ var Mixin = {
},
};
-
Object.assign(ReactReconcileTransaction.prototype, Transaction, Mixin);
PooledClass.addPoolingTo(ReactReconcileTransaction);
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
index b3118e949d..f1fc6a6068 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
@@ -49,23 +49,27 @@ var ReactDOMInput = {
var value = props.value;
var checked = props.checked;
- var hostProps = Object.assign({
- // Make sure we set .type before any other properties (setting .value
- // before .type means .value is lost in IE11 and below)
- type: undefined,
- // Make sure we set .step before .value (setting .value before .step
- // means .value is rounded on mount, based upon step precision)
- step: undefined,
- // Make sure we set .min & .max before .value (to ensure proper order
- // in corner cases such as min or max deriving from value, e.g. Issue #7170)
- min: undefined,
- max: undefined,
- }, props, {
- defaultChecked: undefined,
- defaultValue: undefined,
- value: value != null ? value : inst._wrapperState.initialValue,
- checked: checked != null ? checked : inst._wrapperState.initialChecked,
- });
+ var hostProps = Object.assign(
+ {
+ // Make sure we set .type before any other properties (setting .value
+ // before .type means .value is lost in IE11 and below)
+ type: undefined,
+ // Make sure we set .step before .value (setting .value before .step
+ // means .value is rounded on mount, based upon step precision)
+ step: undefined,
+ // Make sure we set .min & .max before .value (to ensure proper order
+ // in corner cases such as min or max deriving from value, e.g. Issue #7170)
+ min: undefined,
+ max: undefined,
+ },
+ props,
+ {
+ defaultChecked: undefined,
+ defaultValue: undefined,
+ value: value != null ? value : inst._wrapperState.initialValue,
+ checked: checked != null ? checked : inst._wrapperState.initialChecked,
+ },
+ );
return hostProps;
},
@@ -76,7 +80,7 @@ var ReactDOMInput = {
ReactControlledValuePropTypes.checkPropTypes(
'input',
props,
- owner ? owner.getName() : null
+ owner ? owner.getName() : null,
);
if (
@@ -87,13 +91,13 @@ var ReactDOMInput = {
warning(
false,
'%s contains an input of type %s with both checked and defaultChecked props. ' +
- 'Input elements must be either controlled or uncontrolled ' +
- '(specify either the checked prop, or the defaultChecked prop, but not ' +
- 'both). Decide between using a controlled or uncontrolled input ' +
- 'element and remove one of these props. More info: ' +
- 'https://fb.me/react-controlled-components',
- owner && owner.getName() || 'A component',
- props.type
+ 'Input elements must be either controlled or uncontrolled ' +
+ '(specify either the checked prop, or the defaultChecked prop, but not ' +
+ 'both). Decide between using a controlled or uncontrolled input ' +
+ 'element and remove one of these props. More info: ' +
+ 'https://fb.me/react-controlled-components',
+ (owner && owner.getName()) || 'A component',
+ props.type,
);
didWarnCheckedDefaultChecked = true;
}
@@ -105,13 +109,13 @@ var ReactDOMInput = {
warning(
false,
'%s contains an input of type %s with both value and defaultValue props. ' +
- 'Input elements must be either controlled or uncontrolled ' +
- '(specify either the value prop, or the defaultValue prop, but not ' +
- 'both). Decide between using a controlled or uncontrolled input ' +
- 'element and remove one of these props. More info: ' +
- 'https://fb.me/react-controlled-components',
- owner && owner.getName() || 'A component',
- props.type
+ 'Input elements must be either controlled or uncontrolled ' +
+ '(specify either the value prop, or the defaultValue prop, but not ' +
+ 'both). Decide between using a controlled or uncontrolled input ' +
+ 'element and remove one of these props. More info: ' +
+ 'https://fb.me/react-controlled-components',
+ (owner && owner.getName()) || 'A component',
+ props.type,
);
didWarnValueDefaultValue = true;
}
@@ -119,7 +123,9 @@ var ReactDOMInput = {
var defaultValue = props.defaultValue;
inst._wrapperState = {
- initialChecked: props.checked != null ? props.checked : props.defaultChecked,
+ initialChecked: props.checked != null
+ ? props.checked
+ : props.defaultChecked,
initialValue: props.value != null ? props.value : defaultValue,
listeners: null,
};
@@ -136,27 +142,35 @@ var ReactDOMInput = {
var controlled = isControlled(props);
var owner = inst._currentElement._owner;
- if (!inst._wrapperState.controlled && controlled && !didWarnUncontrolledToControlled) {
+ if (
+ !inst._wrapperState.controlled &&
+ controlled &&
+ !didWarnUncontrolledToControlled
+ ) {
warning(
false,
'%s is changing an uncontrolled input of type %s to be controlled. ' +
- 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
- owner && owner.getName() || 'A component',
- props.type
+ 'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+ (owner && owner.getName()) || 'A component',
+ props.type,
);
didWarnUncontrolledToControlled = true;
}
- if (inst._wrapperState.controlled && !controlled && !didWarnControlledToUncontrolled) {
+ if (
+ inst._wrapperState.controlled &&
+ !controlled &&
+ !didWarnControlledToUncontrolled
+ ) {
warning(
false,
'%s is changing a controlled input of type %s to be uncontrolled. ' +
- 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
- 'Decide between using a controlled or uncontrolled input ' +
- 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
- owner && owner.getName() || 'A component',
- props.type
+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
+ 'Decide between using a controlled or uncontrolled input ' +
+ 'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+ (owner && owner.getName()) || 'A component',
+ props.type,
);
didWarnControlledToUncontrolled = true;
}
@@ -167,14 +181,13 @@ var ReactDOMInput = {
DOMPropertyOperations.setValueForProperty(
ReactDOMComponentTree.getNodeFromInstance(inst),
'checked',
- checked || false
+ checked || false,
);
}
var node = ReactDOMComponentTree.getNodeFromInstance(inst);
var value = props.value;
if (value != null) {
-
// Cast `value` to a string to ensure the value is set correctly. While
// browsers typically do this as necessary, jsdom doesn't.
var newValue = '' + value;
@@ -281,12 +294,12 @@ function updateNamedCousins(thisInstance, props) {
// document. Let's just use the local `querySelectorAll` to ensure we don't
// miss anything.
var group = queryRoot.querySelectorAll(
- 'input[name=' + JSON.stringify('' + name) + '][type="radio"]');
+ 'input[name=' + JSON.stringify('' + name) + '][type="radio"]',
+ );
for (var i = 0; i < group.length; i++) {
var otherNode = group[i];
- if (otherNode === rootNode ||
- otherNode.form !== rootNode.form) {
+ if (otherNode === rootNode || otherNode.form !== rootNode.form) {
continue;
}
// This will throw if radio buttons rendered by different copies of React
@@ -297,7 +310,7 @@ function updateNamedCousins(thisInstance, props) {
invariant(
otherInstance,
'ReactDOMInput: Mixing React and non-React radio inputs with the ' +
- 'same `name` is not supported.'
+ 'same `name` is not supported.',
);
// If this is a controlled radio button group, forcing the input that
// was previously checked to update will cause it to be come re-checked
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js b/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js
index aeb08ef807..cc679ebd71 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js
@@ -33,7 +33,7 @@ function flattenChildren(children) {
didWarnInvalidOptionChildren = true;
warning(
false,
- 'Only strings and numbers are supported as <option> children.'
+ 'Only strings and numbers are supported as <option> children.',
);
}
});
@@ -51,7 +51,7 @@ var ReactDOMOption = {
warning(
props.selected == null,
'Use the `defaultValue` or `value` props on <select> instead of ' +
- 'setting `selected` on <option>.'
+ 'setting `selected` on <option>.',
);
}
@@ -89,7 +89,7 @@ var ReactDOMOption = {
}
}
} else {
- selected = ('' + selectValue === value);
+ selected = '' + selectValue === value;
}
}
@@ -106,7 +106,10 @@ var ReactDOMOption = {
},
getHostProps: function(inst, props) {
- var hostProps = Object.assign({selected: undefined, children: undefined}, props);
+ var hostProps = Object.assign(
+ {selected: undefined, children: undefined},
+ props,
+ );
// Read state only from initial mount because <select> updates value
// manually; we need the initial state only for server rendering
@@ -122,7 +125,6 @@ var ReactDOMOption = {
return hostProps;
},
-
};
module.exports = ReactDOMOption;
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
index 31ef3514d9..efc98b4134 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
@@ -39,7 +39,7 @@ function checkSelectPropTypes(inst, props) {
ReactControlledValuePropTypes.checkPropTypes(
'select',
props,
- owner ? owner.getName() : null
+ owner ? owner.getName() : null,
);
for (var i = 0; i < valuePropNames.length; i++) {
@@ -52,17 +52,17 @@ function checkSelectPropTypes(inst, props) {
warning(
false,
'The `%s` prop supplied to <select> must be an array if ' +
- '`multiple` is true.%s',
+ '`multiple` is true.%s',
propName,
- getDeclarationErrorAddendum(owner)
+ getDeclarationErrorAddendum(owner),
);
} else if (!props.multiple && isArray) {
warning(
false,
'The `%s` prop supplied to <select> must be a scalar ' +
- 'value if `multiple` is false.%s',
+ 'value if `multiple` is false.%s',
propName,
- getDeclarationErrorAddendum(owner)
+ getDeclarationErrorAddendum(owner),
);
}
}
@@ -146,10 +146,10 @@ var ReactDOMSelect = {
warning(
false,
'Select elements must be either controlled or uncontrolled ' +
- '(specify either the value prop, or the defaultValue prop, but not ' +
- 'both). Decide between using a controlled or uncontrolled select ' +
- 'element and remove one of these props. More info: ' +
- 'https://fb.me/react-controlled-components'
+ '(specify either the value prop, or the defaultValue prop, but not ' +
+ 'both). Decide between using a controlled or uncontrolled select ' +
+ 'element and remove one of these props. More info: ' +
+ 'https://fb.me/react-controlled-components',
);
didWarnValueDefaultValue = true;
}
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
index f8110dd56b..4ddf9e51a8 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
@@ -38,7 +38,7 @@ var ReactDOMTextarea = {
getHostProps: function(inst, props) {
invariant(
props.dangerouslySetInnerHTML == null,
- '`dangerouslySetInnerHTML` does not make sense on <textarea>.'
+ '`dangerouslySetInnerHTML` does not make sense on <textarea>.',
);
// Always set children to the same thing. In IE9, the selection range will
@@ -61,7 +61,7 @@ var ReactDOMTextarea = {
ReactControlledValuePropTypes.checkPropTypes(
'textarea',
props,
- owner ? owner.getName() : null
+ owner ? owner.getName() : null,
);
if (
props.value !== undefined &&
@@ -71,16 +71,15 @@ var ReactDOMTextarea = {
warning(
false,
'Textarea elements must be either controlled or uncontrolled ' +
- '(specify either the value prop, or the defaultValue prop, but not ' +
- 'both). Decide between using a controlled or uncontrolled textarea ' +
- 'and remove one of these props. More info: ' +
- 'https://fb.me/react-controlled-components'
+ '(specify either the value prop, or the defaultValue prop, but not ' +
+ 'both). Decide between using a controlled or uncontrolled textarea ' +
+ 'and remove one of these props. More info: ' +
+ 'https://fb.me/react-controlled-components',
);
didWarnValDefaultVal = true;
}
}
-
var value = props.value;
var initialValue = value;
@@ -94,17 +93,17 @@ var ReactDOMTextarea = {
warning(
false,
'Use the `defaultValue` or `value` props instead of setting ' +
- 'children on <textarea>.'
+ 'children on <textarea>.',
);
}
invariant(
defaultValue == null,
- 'If you supply `defaultValue` on a <textarea>, do not pass children.'
+ 'If you supply `defaultValue` on a <textarea>, do not pass children.',
);
if (Array.isArray(children)) {
invariant(
children.length <= 1,
- '<textarea> can only have at most one child.'
+ '<textarea> can only have at most one child.',
);
children = children[0];
}
@@ -167,7 +166,6 @@ var ReactDOMTextarea = {
ReactDOMTextarea.updateWrapper(inst);
}
},
-
};
module.exports = ReactDOMTextarea;
diff --git a/src/renderers/dom/stack/server/ReactMarkupChecksum.js b/src/renderers/dom/stack/server/ReactMarkupChecksum.js
index 8d02654263..09e477c477 100644
--- a/src/renderers/dom/stack/server/ReactMarkupChecksum.js
+++ b/src/renderers/dom/stack/server/ReactMarkupChecksum.js
@@ -16,7 +16,6 @@ var adler32 = require('adler32');
var TAG_END = /\/?>/;
var COMMENT_START = /^<\!\-\-/;
-
var ReactMarkupChecksum = {
CHECKSUM_ATTR_NAME: 'data-react-checksum',
@@ -33,7 +32,7 @@ var ReactMarkupChecksum = {
} else {
return markup.replace(
TAG_END,
- ' ' + ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '="' + checksum + '"$&'
+ ' ' + ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '="' + checksum + '"$&',
);
}
},
@@ -45,7 +44,7 @@ var ReactMarkupChecksum = {
*/
canReuseMarkup: function(markup, element) {
var existingChecksum = element.getAttribute(
- ReactMarkupChecksum.CHECKSUM_ATTR_NAME
+ ReactMarkupChecksum.CHECKSUM_ATTR_NAME,
);
existingChecksum = existingChecksum && parseInt(existingChecksum, 10);
var markupChecksum = adler32(markup);
diff --git a/src/renderers/dom/stack/server/ReactServerRendering.js b/src/renderers/dom/stack/server/ReactServerRendering.js
index 9ecb3bf0f5..e998e13199 100644
--- a/src/renderers/dom/stack/server/ReactServerRendering.js
+++ b/src/renderers/dom/stack/server/ReactServerRendering.js
@@ -16,8 +16,7 @@ var ReactInstrumentation = require('ReactInstrumentation');
var ReactMarkupChecksum = require('ReactMarkupChecksum');
var ReactReconciler = require('ReactReconciler');
var ReactServerBatchingStrategy = require('ReactServerBatchingStrategy');
-var ReactServerRenderingTransaction =
- require('ReactServerRenderingTransaction');
+var ReactServerRenderingTransaction = require('ReactServerRenderingTransaction');
var ReactUpdates = require('ReactUpdates');
var emptyObject = require('fbjs/lib/emptyObject');
@@ -41,35 +40,36 @@ function renderToStringImpl(element, makeStaticMarkup) {
pendingTransactions++;
- return transaction.perform(function() {
- var componentInstance = instantiateReactComponent(element, true);
- var markup = ReactReconciler.mountComponent(
- componentInstance,
- transaction,
- null,
- ReactDOMContainerInfo(),
- emptyObject,
- 0 /* parentDebugID */
- );
- if (__DEV__) {
- ReactInstrumentation.debugTool.onUnmountComponent(
- componentInstance._debugID
+ return transaction.perform(
+ function() {
+ var componentInstance = instantiateReactComponent(element, true);
+ var markup = ReactReconciler.mountComponent(
+ componentInstance,
+ transaction,
+ null,
+ ReactDOMContainerInfo(),
+ emptyObject,
+ 0 /* parentDebugID */,
);
- }
- if (!makeStaticMarkup) {
- markup = ReactMarkupChecksum.addChecksumToMarkup(markup);
- }
- return markup;
- }, null);
+ if (__DEV__) {
+ ReactInstrumentation.debugTool.onUnmountComponent(
+ componentInstance._debugID,
+ );
+ }
+ if (!makeStaticMarkup) {
+ markup = ReactMarkupChecksum.addChecksumToMarkup(markup);
+ }
+ return markup;
+ },
+ null,
+ );
} finally {
pendingTransactions--;
ReactServerRenderingTransaction.release(transaction);
// Revert to the DOM batching strategy since these two renderers
// currently share these stateful modules.
if (!pendingTransactions) {
- ReactUpdates.injection.injectBatchingStrategy(
- previousBatchingStrategy
- );
+ ReactUpdates.injection.injectBatchingStrategy(previousBatchingStrategy);
}
}
}
@@ -82,7 +82,7 @@ function renderToStringImpl(element, makeStaticMarkup) {
function renderToString(element) {
invariant(
React.isValidElement(element),
- 'renderToString(): You must pass a valid ReactElement.'
+ 'renderToString(): You must pass a valid ReactElement.',
);
return renderToStringImpl(element, false);
}
@@ -95,7 +95,7 @@ function renderToString(element) {
function renderToStaticMarkup(element) {
invariant(
React.isValidElement(element),
- 'renderToStaticMarkup(): You must pass a valid ReactElement.'
+ 'renderToStaticMarkup(): You must pass a valid ReactElement.',
);
return renderToStringImpl(element, true);
}
diff --git a/src/renderers/dom/stack/server/ReactServerRenderingTransaction.js b/src/renderers/dom/stack/server/ReactServerRenderingTransaction.js
index 0a8936bbb7..2fa930cc43 100644
--- a/src/renderers/dom/stack/server/ReactServerRenderingTransaction.js
+++ b/src/renderers/dom/stack/server/ReactServerRenderingTransaction.js
@@ -16,7 +16,6 @@ var Transaction = require('Transaction');
var ReactInstrumentation = require('ReactInstrumentation');
var ReactServerUpdateQueue = require('ReactServerUpdateQueue');
-
/**
* Executed within the scope of the `Transaction` instance. Consider these as
* being member methods, but with an implied ordering while being isolated from
@@ -75,22 +74,14 @@ var Mixin = {
* `PooledClass` looks for this, and will invoke this before allowing this
* instance to be reused.
*/
- destructor: function() {
- },
+ destructor: function() {},
- checkpoint: function() {
- },
+ checkpoint: function() {},
- rollback: function() {
- },
+ rollback: function() {},
};
-
-Object.assign(
- ReactServerRenderingTransaction.prototype,
- Transaction,
- Mixin
-);
+Object.assign(ReactServerRenderingTransaction.prototype, Transaction, Mixin);
PooledClass.addPoolingTo(ReactServerRenderingTransaction);
diff --git a/src/renderers/dom/stack/server/ReactServerUpdateQueue.js b/src/renderers/dom/stack/server/ReactServerUpdateQueue.js
index 34fe4e8405..35b064f543 100644
--- a/src/renderers/dom/stack/server/ReactServerUpdateQueue.js
+++ b/src/renderers/dom/stack/server/ReactServerUpdateQueue.js
@@ -16,19 +16,23 @@ var ReactUpdateQueue = require('ReactUpdateQueue');
var warning = require('fbjs/lib/warning');
-import type { Transaction } from 'Transaction';
+import type {Transaction} from 'Transaction';
-function warnNoop(publicInstance: ReactComponent<any, any, any>, callerName: string) {
+function warnNoop(
+ publicInstance: ReactComponent<any, any, any>,
+ callerName: string,
+) {
if (__DEV__) {
var constructor = publicInstance.constructor;
warning(
false,
'%s(...): Can only update a mounting component. ' +
- 'This usually means you called %s() outside componentWillMount() on the server. ' +
- 'This is a no-op.\n\nPlease check the code for the %s component.',
+ 'This usually means you called %s() outside componentWillMount() on the server. ' +
+ 'This is a no-op.\n\nPlease check the code for the %s component.',
callerName,
callerName,
- constructor && (constructor.displayName || constructor.name) || 'ReactClass'
+ (constructor && (constructor.displayName || constructor.name)) ||
+ 'ReactClass',
);
}
}
@@ -73,7 +77,11 @@ class ReactServerUpdateQueue {
* @param {?string} Name of the calling function in the public API.
* @internal
*/
- enqueueForceUpdate(publicInstance: ReactComponent<any, any, any>, callback?: Function, callerName?: string) {
+ enqueueForceUpdate(
+ publicInstance: ReactComponent<any, any, any>,
+ callback?: Function,
+ callerName?: string,
+ ) {
if (this.transaction.isInTransaction()) {
ReactUpdateQueue.enqueueForceUpdate(publicInstance, callback, callerName);
} else {
@@ -96,12 +104,17 @@ class ReactServerUpdateQueue {
*/
enqueueReplaceState(
publicInstance: ReactComponent<any, any, any>,
- completeState: Object|Function,
+ completeState: Object | Function,
callback?: Function,
- callerName?: string
+ callerName?: string,
) {
if (this.transaction.isInTransaction()) {
- ReactUpdateQueue.enqueueReplaceState(publicInstance, completeState, callback, callerName);
+ ReactUpdateQueue.enqueueReplaceState(
+ publicInstance,
+ completeState,
+ callback,
+ callerName,
+ );
} else {
warnNoop(publicInstance, 'replaceState');
}
@@ -119,12 +132,17 @@ class ReactServerUpdateQueue {
*/
enqueueSetState(
publicInstance: ReactComponent<any, any, any>,
- partialState: Object|Function,
+ partialState: Object | Function,
callback?: Function,
- callerName?: string
+ callerName?: string,
) {
if (this.transaction.isInTransaction()) {
- ReactUpdateQueue.enqueueSetState(publicInstance, partialState, callback, callerName);
+ ReactUpdateQueue.enqueueSetState(
+ publicInstance,
+ partialState,
+ callback,
+ callerName,
+ );
} else {
warnNoop(publicInstance, 'setState');
}
diff --git a/src/renderers/native/NativeMethodsMixin.js b/src/renderers/native/NativeMethodsMixin.js
index aa7af7f066..25062816e3 100644
--- a/src/renderers/native/NativeMethodsMixin.js
+++ b/src/renderers/native/NativeMethodsMixin.js
@@ -24,30 +24,34 @@ type MeasureOnSuccessCallback = (
width: number,
height: number,
pageX: number,
- pageY: number
-) => void
+ pageY: number,
+) => void;
type MeasureInWindowOnSuccessCallback = (
x: number,
y: number,
width: number,
height: number,
-) => void
+) => void;
type MeasureLayoutOnSuccessCallback = (
left: number,
top: number,
width: number,
- height: number
-) => void
+ height: number,
+) => void;
function warnForStyleProps(props, validAttributes) {
for (var key in validAttributes.style) {
if (!(validAttributes[key] || props[key] === undefined)) {
console.error(
- 'You are setting the style `{ ' + key + ': ... }` as a prop. You ' +
- 'should nest it in a style object. ' +
- 'E.g. `{ style: { ' + key + ': ... } }`'
+ 'You are setting the style `{ ' +
+ key +
+ ': ... }` as a prop. You ' +
+ 'should nest it in a style object. ' +
+ 'E.g. `{ style: { ' +
+ key +
+ ': ... } }`',
);
}
}
@@ -86,7 +90,7 @@ var NativeMethodsMixin = {
measure: function(callback: MeasureOnSuccessCallback) {
UIManager.measure(
ReactNative.findNodeHandle(this),
- mountSafeCallback(this, callback)
+ mountSafeCallback(this, callback),
);
},
@@ -108,7 +112,7 @@ var NativeMethodsMixin = {
measureInWindow: function(callback: MeasureInWindowOnSuccessCallback) {
UIManager.measureInWindow(
ReactNative.findNodeHandle(this),
- mountSafeCallback(this, callback)
+ mountSafeCallback(this, callback),
);
},
@@ -123,13 +127,13 @@ var NativeMethodsMixin = {
measureLayout: function(
relativeToNativeNode: number,
onSuccess: MeasureLayoutOnSuccessCallback,
- onFail: () => void /* currently unused */
+ onFail: () => void /* currently unused */,
) {
UIManager.measureLayout(
ReactNative.findNodeHandle(this),
relativeToNativeNode,
mountSafeCallback(this, onFail),
- mountSafeCallback(this, onSuccess)
+ mountSafeCallback(this, onSuccess),
);
},
@@ -146,13 +150,13 @@ var NativeMethodsMixin = {
var updatePayload = ReactNativeAttributePayload.create(
nativeProps,
- this.viewConfig.validAttributes
+ this.viewConfig.validAttributes,
);
UIManager.updateView(
- (ReactNative.findNodeHandle(this) : any),
+ (ReactNative.findNodeHandle(this): any),
this.viewConfig.uiViewClassName,
- updatePayload
+ updatePayload,
);
},
@@ -176,10 +180,14 @@ function throwOnStylesProp(component, props) {
if (props.styles !== undefined) {
var owner = component._owner || null;
var name = component.constructor.displayName;
- var msg = '`styles` is not a supported property of `' + name + '`, did ' +
+ var msg = '`styles` is not a supported property of `' +
+ name +
+ '`, did ' +
'you mean `style` (singular)?';
if (owner && owner.constructor && owner.constructor.displayName) {
- msg += '\n\nCheck the `' + owner.constructor.displayName + '` parent ' +
+ msg += '\n\nCheck the `' +
+ owner.constructor.displayName +
+ '` parent ' +
' component.';
}
throw new Error(msg);
@@ -192,8 +200,8 @@ if (__DEV__) {
var NativeMethodsMixin_DEV = (NativeMethodsMixin: any);
invariant(
!NativeMethodsMixin_DEV.componentWillMount &&
- !NativeMethodsMixin_DEV.componentWillReceiveProps,
- 'Do not override existing functions.'
+ !NativeMethodsMixin_DEV.componentWillReceiveProps,
+ 'Do not override existing functions.',
);
NativeMethodsMixin_DEV.componentWillMount = function() {
throwOnStylesProp(this, this.props);
@@ -209,10 +217,13 @@ if (__DEV__) {
*/
function mountSafeCallback(
context: ReactComponent<any, any, any>,
- callback: ?Function
+ callback: ?Function,
): any {
return function() {
- if (!callback || (typeof context.isMounted === 'function' && !context.isMounted())) {
+ if (
+ !callback ||
+ (typeof context.isMounted === 'function' && !context.isMounted())
+ ) {
return undefined;
}
return callback.apply(context, arguments);
diff --git a/src/renderers/native/ReactNativeAttributePayload.js b/src/renderers/native/ReactNativeAttributePayload.js
index c84d7284ab..ccd98c6fef 100644
--- a/src/renderers/native/ReactNativeAttributePayload.js
+++ b/src/renderers/native/ReactNativeAttributePayload.js
@@ -31,14 +31,15 @@ type AttributeDiffer = (prevProp: mixed, nextProp: mixed) => boolean;
type AttributePreprocessor = (nextProp: mixed) => mixed;
type CustomAttributeConfiguration =
- { diff: AttributeDiffer, process: AttributePreprocessor } |
- { diff: AttributeDiffer } |
- { process: AttributePreprocessor };
+ | {diff: AttributeDiffer, process: AttributePreprocessor}
+ | {diff: AttributeDiffer}
+ | {process: AttributePreprocessor};
-type AttributeConfiguration =
- { [key: string]: (
- CustomAttributeConfiguration | AttributeConfiguration /*| boolean*/
- ) };
+type AttributeConfiguration = {
+ [key: string]:
+ | CustomAttributeConfiguration
+ | AttributeConfiguration /*| boolean*/,
+};
type NestedNode = Array<NestedNode> | Object | number;
@@ -46,7 +47,7 @@ type NestedNode = Array<NestedNode> | Object | number;
var removedKeys = null;
var removedKeyCount = 0;
-function defaultDiffer(prevProp: mixed, nextProp: mixed) : boolean {
+function defaultDiffer(prevProp: mixed, nextProp: mixed): boolean {
if (typeof nextProp !== 'object' || nextProp === null) {
// Scalars have already been checked for equality
return true;
@@ -56,7 +57,7 @@ function defaultDiffer(prevProp: mixed, nextProp: mixed) : boolean {
}
}
-function resolveObject(idOrObject: number | Object) : Object {
+function resolveObject(idOrObject: number | Object): Object {
if (typeof idOrObject === 'number') {
return ReactNativePropRegistry.getByID(idOrObject);
}
@@ -66,7 +67,7 @@ function resolveObject(idOrObject: number | Object) : Object {
function restoreDeletedValuesInNestedArray(
updatePayload: Object,
node: NestedNode,
- validAttributes: AttributeConfiguration
+ validAttributes: AttributeConfiguration,
) {
if (Array.isArray(node)) {
var i = node.length;
@@ -74,7 +75,7 @@ function restoreDeletedValuesInNestedArray(
restoreDeletedValuesInNestedArray(
updatePayload,
node[i],
- validAttributes
+ validAttributes,
);
}
} else if (node && removedKeyCount > 0) {
@@ -103,12 +104,14 @@ function restoreDeletedValuesInNestedArray(
if (typeof attributeConfig !== 'object') {
// case: !Object is the default case
updatePayload[propKey] = nextProp;
- } else if (typeof attributeConfig.diff === 'function' ||
- typeof attributeConfig.process === 'function') {
+ } else if (
+ typeof attributeConfig.diff === 'function' ||
+ typeof attributeConfig.process === 'function'
+ ) {
// case: CustomAttributeConfiguration
- var nextValue = typeof attributeConfig.process === 'function' ?
- attributeConfig.process(nextProp) :
- nextProp;
+ var nextValue = typeof attributeConfig.process === 'function'
+ ? attributeConfig.process(nextProp)
+ : nextProp;
updatePayload[propKey] = nextValue;
}
removedKeys[propKey] = false;
@@ -118,14 +121,14 @@ function restoreDeletedValuesInNestedArray(
}
function diffNestedArrayProperty(
- updatePayload:? Object,
+ updatePayload: ?Object,
prevArray: Array<NestedNode>,
nextArray: Array<NestedNode>,
- validAttributes: AttributeConfiguration
-) : ?Object {
- var minLength = prevArray.length < nextArray.length ?
- prevArray.length :
- nextArray.length;
+ validAttributes: AttributeConfiguration,
+): ?Object {
+ var minLength = prevArray.length < nextArray.length
+ ? prevArray.length
+ : nextArray.length;
var i;
for (i = 0; i < minLength; i++) {
// Diff any items in the array in the forward direction. Repeated keys
@@ -134,7 +137,7 @@ function diffNestedArrayProperty(
updatePayload,
prevArray[i],
nextArray[i],
- validAttributes
+ validAttributes,
);
}
for (; i < prevArray.length; i++) {
@@ -142,7 +145,7 @@ function diffNestedArrayProperty(
updatePayload = clearNestedProperty(
updatePayload,
prevArray[i],
- validAttributes
+ validAttributes,
);
}
for (; i < nextArray.length; i++) {
@@ -150,19 +153,18 @@ function diffNestedArrayProperty(
updatePayload = addNestedProperty(
updatePayload,
nextArray[i],
- validAttributes
+ validAttributes,
);
}
return updatePayload;
}
function diffNestedProperty(
- updatePayload:? Object,
+ updatePayload: ?Object,
prevProp: NestedNode,
nextProp: NestedNode,
- validAttributes: AttributeConfiguration
-) : ?Object {
-
+ validAttributes: AttributeConfiguration,
+): ?Object {
if (!updatePayload && prevProp === nextProp) {
// If no properties have been added, then we can bail out quickly on object
// equality.
@@ -171,18 +173,10 @@ function diffNestedProperty(
if (!prevProp || !nextProp) {
if (nextProp) {
- return addNestedProperty(
- updatePayload,
- nextProp,
- validAttributes
- );
+ return addNestedProperty(updatePayload, nextProp, validAttributes);
}
if (prevProp) {
- return clearNestedProperty(
- updatePayload,
- prevProp,
- validAttributes
- );
+ return clearNestedProperty(updatePayload, prevProp, validAttributes);
}
return updatePayload;
}
@@ -193,7 +187,7 @@ function diffNestedProperty(
updatePayload,
resolveObject(prevProp),
resolveObject(nextProp),
- validAttributes
+ validAttributes,
);
}
@@ -203,7 +197,7 @@ function diffNestedProperty(
updatePayload,
prevProp,
nextProp,
- validAttributes
+ validAttributes,
);
}
@@ -214,16 +208,16 @@ function diffNestedProperty(
flattenStyle(prevProp),
// $FlowFixMe - We know that this isn't an array because of above flow.
resolveObject(nextProp),
- validAttributes
+ validAttributes,
);
}
return diffProperties(
updatePayload,
resolveObject(prevProp),
- // $FlowFixMe - We know that this is always an object when the input is.
+ // $FlowFixMe - We know that this is always an object when the input is.
flattenStyle(nextProp),
- validAttributes
+ validAttributes,
);
}
@@ -233,9 +227,9 @@ function diffNestedProperty(
* updatePayload.
*/
function addNestedProperty(
- updatePayload:? Object,
+ updatePayload: ?Object,
nextProp: NestedNode,
- validAttributes: AttributeConfiguration
+ validAttributes: AttributeConfiguration,
) {
if (!nextProp) {
return updatePayload;
@@ -246,7 +240,7 @@ function addNestedProperty(
return addProperties(
updatePayload,
resolveObject(nextProp),
- validAttributes
+ validAttributes,
);
}
@@ -255,7 +249,7 @@ function addNestedProperty(
updatePayload = addNestedProperty(
updatePayload,
nextProp[i],
- validAttributes
+ validAttributes,
);
}
@@ -267,10 +261,10 @@ function addNestedProperty(
* adds a null sentinel to the updatePayload, for each prop key.
*/
function clearNestedProperty(
- updatePayload:? Object,
+ updatePayload: ?Object,
prevProp: NestedNode,
- validAttributes: AttributeConfiguration
-) : ?Object {
+ validAttributes: AttributeConfiguration,
+): ?Object {
if (!prevProp) {
return updatePayload;
}
@@ -280,7 +274,7 @@ function clearNestedProperty(
return clearProperties(
updatePayload,
resolveObject(prevProp),
- validAttributes
+ validAttributes,
);
}
@@ -289,7 +283,7 @@ function clearNestedProperty(
updatePayload = clearNestedProperty(
updatePayload,
prevProp[i],
- validAttributes
+ validAttributes,
);
}
return updatePayload;
@@ -305,9 +299,9 @@ function diffProperties(
updatePayload: ?Object,
prevProps: Object,
nextProps: Object,
- validAttributes: AttributeConfiguration
+ validAttributes: AttributeConfiguration,
): ?Object {
- var attributeConfig : ?(CustomAttributeConfiguration | AttributeConfiguration);
+ var attributeConfig: ?(CustomAttributeConfiguration | AttributeConfiguration);
var nextProp;
var prevProp;
@@ -323,20 +317,20 @@ function diffProperties(
// functions are converted to booleans as markers that the associated
// events should be sent from native.
if (typeof nextProp === 'function') {
- nextProp = (true : any);
+ nextProp = (true: any);
// If nextProp is not a function, then don't bother changing prevProp
// since nextProp will win and go into the updatePayload regardless.
if (typeof prevProp === 'function') {
- prevProp = (true : any);
+ prevProp = (true: any);
}
}
// An explicit value of undefined is treated as a null because it overrides
// any other preceding value.
if (typeof nextProp === 'undefined') {
- nextProp = (null : any);
+ nextProp = (null: any);
if (typeof prevProp === 'undefined') {
- prevProp = (null : any);
+ prevProp = (null: any);
}
}
@@ -354,12 +348,14 @@ function diffProperties(
if (typeof attributeConfig !== 'object') {
// case: !Object is the default case
updatePayload[propKey] = nextProp;
- } else if (typeof attributeConfig.diff === 'function' ||
- typeof attributeConfig.process === 'function') {
+ } else if (
+ typeof attributeConfig.diff === 'function' ||
+ typeof attributeConfig.process === 'function'
+ ) {
// case: CustomAttributeConfiguration
- var nextValue = typeof attributeConfig.process === 'function' ?
- attributeConfig.process(nextProp) :
- nextProp;
+ var nextValue = typeof attributeConfig.process === 'function'
+ ? attributeConfig.process(nextProp)
+ : nextProp;
updatePayload[propKey] = nextValue;
}
continue;
@@ -376,18 +372,19 @@ function diffProperties(
// a normal leaf has changed
(updatePayload || (updatePayload = {}))[propKey] = nextProp;
}
- } else if (typeof attributeConfig.diff === 'function' ||
- typeof attributeConfig.process === 'function') {
+ } else if (
+ typeof attributeConfig.diff === 'function' ||
+ typeof attributeConfig.process === 'function'
+ ) {
// case: CustomAttributeConfiguration
- var shouldUpdate = prevProp === undefined || (
- typeof attributeConfig.diff === 'function' ?
- attributeConfig.diff(prevProp, nextProp) :
- defaultDiffer(prevProp, nextProp)
- );
+ var shouldUpdate = prevProp === undefined ||
+ (typeof attributeConfig.diff === 'function'
+ ? attributeConfig.diff(prevProp, nextProp)
+ : defaultDiffer(prevProp, nextProp));
if (shouldUpdate) {
- nextValue = typeof attributeConfig.process === 'function' ?
- attributeConfig.process(nextProp) :
- nextProp;
+ nextValue = typeof attributeConfig.process === 'function'
+ ? attributeConfig.process(nextProp)
+ : nextProp;
(updatePayload || (updatePayload = {}))[propKey] = nextValue;
}
} else {
@@ -400,13 +397,13 @@ function diffProperties(
updatePayload,
prevProp,
nextProp,
- ((attributeConfig : any) : AttributeConfiguration)
+ ((attributeConfig: any): AttributeConfiguration),
);
if (removedKeyCount > 0 && updatePayload) {
restoreDeletedValuesInNestedArray(
updatePayload,
nextProp,
- ((attributeConfig : any) : AttributeConfiguration)
+ ((attributeConfig: any): AttributeConfiguration),
);
removedKeys = null;
}
@@ -435,10 +432,11 @@ function diffProperties(
continue; // was already empty anyway
}
// Pattern match on: attributeConfig
- if (typeof attributeConfig !== 'object' ||
- typeof attributeConfig.diff === 'function' ||
- typeof attributeConfig.process === 'function') {
-
+ if (
+ typeof attributeConfig !== 'object' ||
+ typeof attributeConfig.diff === 'function' ||
+ typeof attributeConfig.process === 'function'
+ ) {
// case: CustomAttributeConfiguration | !Object
// Flag the leaf property for removal by sending a sentinel.
(updatePayload || (updatePayload = {}))[propKey] = null;
@@ -456,7 +454,7 @@ function diffProperties(
updatePayload = clearNestedProperty(
updatePayload,
prevProp,
- ((attributeConfig : any) : AttributeConfiguration)
+ ((attributeConfig: any): AttributeConfiguration),
);
}
}
@@ -469,8 +467,8 @@ function diffProperties(
function addProperties(
updatePayload: ?Object,
props: Object,
- validAttributes: AttributeConfiguration
-) : ?Object {
+ validAttributes: AttributeConfiguration,
+): ?Object {
// TODO: Fast path
return diffProperties(updatePayload, emptyObject, props, validAttributes);
}
@@ -482,38 +480,36 @@ function addProperties(
function clearProperties(
updatePayload: ?Object,
prevProps: Object,
- validAttributes: AttributeConfiguration
-) :? Object {
+ validAttributes: AttributeConfiguration,
+): ?Object {
// TODO: Fast path
return diffProperties(updatePayload, prevProps, emptyObject, validAttributes);
}
var ReactNativeAttributePayload = {
-
create: function(
props: Object,
- validAttributes: AttributeConfiguration
- ) : ?Object {
+ validAttributes: AttributeConfiguration,
+ ): ?Object {
return addProperties(
null, // updatePayload
props,
- validAttributes
+ validAttributes,
);
},
diff: function(
prevProps: Object,
nextProps: Object,
- validAttributes: AttributeConfiguration
- ) : ?Object {
+ validAttributes: AttributeConfiguration,
+ ): ?Object {
return diffProperties(
null, // updatePayload
prevProps,
nextProps,
- validAttributes
+ validAttributes,
);
},
-
};
module.exports = ReactNativeAttributePayload;
diff --git a/src/renderers/native/ReactNativeBaseComponent.js b/src/renderers/native/ReactNativeBaseComponent.js
index a254257714..ef13341420 100644
--- a/src/renderers/native/ReactNativeBaseComponent.js
+++ b/src/renderers/native/ReactNativeBaseComponent.js
@@ -23,7 +23,7 @@ var deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInD
type ReactNativeBaseComponentViewConfig = {
validAttributes: Object,
uiViewClassName: string,
-}
+};
// require('UIManagerStatTracker').install(); // uncomment to enable
@@ -34,7 +34,7 @@ type ReactNativeBaseComponentViewConfig = {
* @param {!object} UIKit View Configuration.
*/
var ReactNativeBaseComponent = function(
- viewConfig: ReactNativeBaseComponentViewConfig
+ viewConfig: ReactNativeBaseComponentViewConfig,
) {
this.viewConfig = viewConfig;
};
@@ -69,7 +69,6 @@ ReactNativeBaseComponent.Mixin = {
// no children - let's avoid calling out to the native bridge for a large
// portion of the children.
if (mountImages.length) {
-
// TODO: Pool these per platform view class. Reusing the `mountImages`
// array would likely be a jit deopt.
var createdTags = [];
@@ -105,14 +104,14 @@ ReactNativeBaseComponent.Mixin = {
var updatePayload = ReactNativeAttributePayload.diff(
prevElement.props,
nextElement.props,
- this.viewConfig.validAttributes
+ this.viewConfig.validAttributes,
);
if (updatePayload) {
UIManager.updateView(
this._rootNodeID,
this.viewConfig.uiViewClassName,
- updatePayload
+ updatePayload,
);
}
@@ -135,7 +134,12 @@ ReactNativeBaseComponent.Mixin = {
* @param {object} context
* @return {string} Unique iOS view tag.
*/
- mountComponent: function(transaction, hostParent, hostContainerInfo, context) {
+ mountComponent: function(
+ transaction,
+ hostParent,
+ hostContainerInfo,
+ context,
+ ) {
var tag = ReactNativeTagHandles.allocateTag();
this._rootNodeID = tag;
@@ -152,7 +156,7 @@ ReactNativeBaseComponent.Mixin = {
var updatePayload = ReactNativeAttributePayload.create(
this._currentElement.props,
- this.viewConfig.validAttributes
+ this.viewConfig.validAttributes,
);
var nativeTopRootTag = hostContainerInfo._tag;
@@ -160,7 +164,7 @@ ReactNativeBaseComponent.Mixin = {
tag,
this.viewConfig.uiViewClassName,
nativeTopRootTag,
- updatePayload
+ updatePayload,
);
ReactNativeComponentTree.precacheNode(this, tag);
@@ -169,7 +173,7 @@ ReactNativeBaseComponent.Mixin = {
this._currentElement.props.children,
tag,
transaction,
- context
+ context,
);
return tag;
},
@@ -183,7 +187,7 @@ Object.assign(
ReactNativeBaseComponent.prototype,
ReactMultiChild,
ReactNativeBaseComponent.Mixin,
- NativeMethodsMixin
+ NativeMethodsMixin,
);
module.exports = ReactNativeBaseComponent;
diff --git a/src/renderers/native/ReactNativeBridgeEventPlugin.js b/src/renderers/native/ReactNativeBridgeEventPlugin.js
index e0be0f1cbc..df1f439237 100644
--- a/src/renderers/native/ReactNativeBridgeEventPlugin.js
+++ b/src/renderers/native/ReactNativeBridgeEventPlugin.js
@@ -23,21 +23,22 @@ var customDirectEventTypes = UIManager.customDirectEventTypes;
var allTypesByEventName = {};
for (var bubblingTypeName in customBubblingEventTypes) {
- allTypesByEventName[bubblingTypeName] = customBubblingEventTypes[bubblingTypeName];
+ allTypesByEventName[bubblingTypeName] = customBubblingEventTypes[
+ bubblingTypeName
+ ];
}
for (var directTypeName in customDirectEventTypes) {
warning(
!customBubblingEventTypes[directTypeName],
'Event cannot be both direct and bubbling: %s',
- directTypeName
+ directTypeName,
);
allTypesByEventName[directTypeName] = customDirectEventTypes[directTypeName];
}
var ReactNativeBridgeEventPlugin = {
-
- eventTypes: { ...customBubblingEventTypes, ...customDirectEventTypes },
+ eventTypes: {...customBubblingEventTypes, ...customDirectEventTypes},
/**
* @see {EventPluginHub.extractEvents}
@@ -46,7 +47,7 @@ var ReactNativeBridgeEventPlugin = {
topLevelType: string,
targetInst: Object,
nativeEvent: Event,
- nativeEventTarget: Object
+ nativeEventTarget: Object,
): ?Object {
var bubbleDispatchConfig = customBubblingEventTypes[topLevelType];
var directDispatchConfig = customDirectEventTypes[topLevelType];
@@ -54,7 +55,7 @@ var ReactNativeBridgeEventPlugin = {
bubbleDispatchConfig || directDispatchConfig,
targetInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
);
if (bubbleDispatchConfig) {
EventPropagators.accumulateTwoPhaseDispatches(event);
diff --git a/src/renderers/native/ReactNativeComponentEnvironment.js b/src/renderers/native/ReactNativeComponentEnvironment.js
index 64e0c93716..0e1a3f5826 100644
--- a/src/renderers/native/ReactNativeComponentEnvironment.js
+++ b/src/renderers/native/ReactNativeComponentEnvironment.js
@@ -15,7 +15,6 @@ var ReactNativeDOMIDOperations = require('ReactNativeDOMIDOperations');
var ReactNativeReconcileTransaction = require('ReactNativeReconcileTransaction');
var ReactNativeComponentEnvironment = {
-
processChildrenUpdates: ReactNativeDOMIDOperations.dangerouslyProcessChildrenUpdates,
replaceNodeWithMarkup: ReactNativeDOMIDOperations.dangerouslyReplaceNodeWithMarkupByID,
@@ -23,9 +22,7 @@ var ReactNativeComponentEnvironment = {
/**
* @param {DOMElement} Element to clear.
*/
- clearNode: function(/*containerView*/) {
-
- },
+ clearNode: function(/*containerView*/) {},
ReactReconcileTransaction: ReactNativeReconcileTransaction,
};
diff --git a/src/renderers/native/ReactNativeDOMIDOperations.js b/src/renderers/native/ReactNativeDOMIDOperations.js
index 4c38f3c576..c008373f66 100644
--- a/src/renderers/native/ReactNativeDOMIDOperations.js
+++ b/src/renderers/native/ReactNativeDOMIDOperations.js
@@ -59,7 +59,7 @@ var dangerouslyProcessChildrenUpdates = function(inst, childrenUpdates) {
moveToIndices,
addChildTags,
addAtIndices,
- removeAtIndices
+ removeAtIndices,
);
};
diff --git a/src/renderers/native/ReactNativeEventEmitter.js b/src/renderers/native/ReactNativeEventEmitter.js
index 1e1c97e308..6cea86f9d6 100644
--- a/src/renderers/native/ReactNativeEventEmitter.js
+++ b/src/renderers/native/ReactNativeEventEmitter.js
@@ -56,7 +56,7 @@ var touchSubsequence = function(touches, indices) {
*/
var removeTouchesAtIndices = function(
touches: Array<Object>,
- indices: Array<number>
+ indices: Array<number>,
): Array<Object> {
var rippedOut = [];
// use an unsafe downcast to alias to nullable elements,
@@ -79,7 +79,6 @@ var removeTouchesAtIndices = function(
};
var ReactNativeEventEmitter = {
-
...ReactEventEmitterMixin,
registrationNames: EventPluginRegistry.registrationNameModules,
@@ -99,7 +98,7 @@ var ReactNativeEventEmitter = {
_receiveRootNodeIDEvent: function(
rootNodeID: number,
topLevelType: string,
- nativeEventParam: Object
+ nativeEventParam: Object,
) {
var nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT;
var inst = ReactNativeComponentTree.getInstanceFromNode(rootNodeID);
@@ -113,7 +112,7 @@ var ReactNativeEventEmitter = {
topLevelType,
inst,
nativeEvent,
- nativeEvent.target
+ nativeEvent.target,
);
});
// React Native doesn't use ReactControlledComponent but if it did, here's
@@ -130,13 +129,13 @@ var ReactNativeEventEmitter = {
receiveEvent: function(
tag: number,
topLevelType: string,
- nativeEventParam: Object
+ nativeEventParam: Object,
) {
var rootNodeID = tag;
ReactNativeEventEmitter._receiveRootNodeIDEvent(
rootNodeID,
topLevelType,
- nativeEventParam
+ nativeEventParam,
);
},
@@ -167,13 +166,12 @@ var ReactNativeEventEmitter = {
receiveTouches: function(
eventTopLevelType: string,
touches: Array<Object>,
- changedIndices: Array<number>
+ changedIndices: Array<number>,
) {
- var changedTouches =
- eventTopLevelType === 'topTouchEnd' ||
- eventTopLevelType === 'topTouchCancel' ?
- removeTouchesAtIndices(touches, changedIndices) :
- touchSubsequence(touches, changedIndices);
+ var changedTouches = eventTopLevelType === 'topTouchEnd' ||
+ eventTopLevelType === 'topTouchCancel'
+ ? removeTouchesAtIndices(touches, changedIndices)
+ : touchSubsequence(touches, changedIndices);
for (var jj = 0; jj < changedTouches.length; jj++) {
var touch = changedTouches[jj];
@@ -189,7 +187,7 @@ var ReactNativeEventEmitter = {
if (__DEV__) {
warning(
false,
- 'A view is reporting that a touch occurred on tag zero.'
+ 'A view is reporting that a touch occurred on tag zero.',
);
}
} else {
@@ -199,7 +197,7 @@ var ReactNativeEventEmitter = {
ReactNativeEventEmitter._receiveRootNodeIDEvent(
rootNodeID,
eventTopLevelType,
- nativeEvent
+ nativeEvent,
);
}
},
diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index 4278f62f5b..d617e02691 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -12,10 +12,12 @@
'use strict';
-import type { Element } from 'React';
-import type { Fiber } from 'ReactFiber';
-import type { ReactNodeList } from 'ReactTypes';
-import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';
+import type {Element} from 'React';
+import type {Fiber} from 'ReactFiber';
+import type {ReactNodeList} from 'ReactTypes';
+import type {
+ ReactNativeBaseComponentViewConfig,
+} from 'ReactNativeViewConfigRegistry';
const NativeMethodsMixin = require('NativeMethodsMixin');
const ReactFiberReconciler = require('ReactFiberReconciler');
@@ -33,7 +35,7 @@ const emptyObject = require('fbjs/lib/emptyObject');
const findNodeHandle = require('findNodeHandle');
const invariant = require('fbjs/lib/invariant');
-const { injectInternals } = require('ReactFiberDevToolsHook');
+const {injectInternals} = require('ReactFiberDevToolsHook');
const {
precacheFiberNode,
uncacheFiberNode,
@@ -58,26 +60,27 @@ function NativeHostComponent(tag, viewConfig) {
}
Object.assign(NativeHostComponent.prototype, NativeMethodsMixin);
-function recursivelyUncacheFiberNode(node : Instance | TextInstance) {
- if (typeof node === 'number') { // Leaf node (eg text)
+function recursivelyUncacheFiberNode(node: Instance | TextInstance) {
+ if (typeof node === 'number') {
+ // Leaf node (eg text)
uncacheFiberNode(node);
} else {
- uncacheFiberNode((node : any)._nativeTag);
+ uncacheFiberNode((node: any)._nativeTag);
- (node : any)._children.forEach(recursivelyUncacheFiberNode);
+ (node: any)._children.forEach(recursivelyUncacheFiberNode);
}
}
const NativeRenderer = ReactFiberReconciler({
appendChild(
- parentInstance : Instance | Container,
- child : Instance | TextInstance
- ) : void {
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ ): void {
if (typeof parentInstance === 'number') {
// Root container
UIManager.setChildren(
parentInstance, // containerTag
- [(child : any)._nativeTag] // reactTags
+ [(child: any)._nativeTag], // reactTags
);
} else {
const children = parentInstance._children;
@@ -88,22 +91,25 @@ const NativeRenderer = ReactFiberReconciler({
parentInstance._nativeTag, // containerTag
[], // moveFromIndices
[], // moveToIndices
- [(child : any)._nativeTag], // addChildReactTags
+ [(child: any)._nativeTag], // addChildReactTags
[children.length - 1], // addAtIndices
[], // removeAtIndices
);
}
},
- appendInitialChild(parentInstance : Instance, child : Instance | TextInstance) : void {
+ appendInitialChild(
+ parentInstance: Instance,
+ child: Instance | TextInstance,
+ ): void {
parentInstance._children.push(child);
},
commitTextUpdate(
- textInstance : TextInstance,
- oldText : string,
- newText : string
- ) : void {
+ textInstance: TextInstance,
+ oldText: string,
+ newText: string,
+ ): void {
UIManager.updateView(
textInstance, // reactTag
'RCTRawText', // viewName
@@ -112,22 +118,22 @@ const NativeRenderer = ReactFiberReconciler({
},
commitMount(
- instance : Instance,
- type : string,
- newProps : Props,
- internalInstanceHandle : Object
- ) : void {
+ instance: Instance,
+ type: string,
+ newProps: Props,
+ internalInstanceHandle: Object,
+ ): void {
// Noop
},
commitUpdate(
- instance : Instance,
- updatePayloadTODO : Object,
- type : string,
- oldProps : Props,
- newProps : Props,
- internalInstanceHandle : Object
- ) : void {
+ instance: Instance,
+ updatePayloadTODO: Object,
+ type: string,
+ oldProps: Props,
+ newProps: Props,
+ internalInstanceHandle: Object,
+ ): void {
const viewConfig = instance.viewConfig;
updateFiberProps(instance._nativeTag, newProps);
@@ -135,23 +141,23 @@ const NativeRenderer = ReactFiberReconciler({
const updatePayload = ReactNativeAttributePayload.diff(
oldProps,
newProps,
- viewConfig.validAttributes
+ viewConfig.validAttributes,
);
UIManager.updateView(
- (instance : any)._nativeTag, // reactTag
+ (instance: any)._nativeTag, // reactTag
viewConfig.uiViewClassName, // viewName
updatePayload, // props
);
},
createInstance(
- type : string,
- props : Props,
- rootContainerInstance : Container,
- hostContext : {||},
- internalInstanceHandle : Object
- ) : Instance {
+ type: string,
+ props: Props,
+ rootContainerInstance: Container,
+ hostContext: {},
+ internalInstanceHandle: Object,
+ ): Instance {
const tag = ReactNativeTagHandles.allocateTag();
const viewConfig = ReactNativeViewConfigRegistry.get(type);
@@ -165,7 +171,7 @@ const NativeRenderer = ReactFiberReconciler({
const updatePayload = ReactNativeAttributePayload.create(
props,
- viewConfig.validAttributes
+ viewConfig.validAttributes,
);
UIManager.createView(
@@ -184,18 +190,18 @@ const NativeRenderer = ReactFiberReconciler({
},
createTextInstance(
- text : string,
- rootContainerInstance : Container,
- hostContext : {||},
- internalInstanceHandle : Object,
- ) : TextInstance {
+ text: string,
+ rootContainerInstance: Container,
+ hostContext: {},
+ internalInstanceHandle: Object,
+ ): TextInstance {
const tag = ReactNativeTagHandles.allocateTag();
UIManager.createView(
tag, // reactTag
'RCTRawText', // viewName
rootContainerInstance, // rootTag
- {text: text} // props
+ {text: text}, // props
);
precacheFiberNode(internalInstanceHandle, tag);
@@ -204,11 +210,11 @@ const NativeRenderer = ReactFiberReconciler({
},
finalizeInitialChildren(
- parentInstance : Instance,
- type : string,
- props : Props,
- rootContainerInstance : Container,
- ) : boolean {
+ parentInstance: Instance,
+ type: string,
+ props: Props,
+ rootContainerInstance: Container,
+ ): boolean {
// Don't send a no-op message over the bridge.
if (parentInstance._children.length === 0) {
return false;
@@ -217,24 +223,25 @@ const NativeRenderer = ReactFiberReconciler({
// Map from child objects to native tags.
// Either way we need to pass a copy of the Array to prevent it from being frozen.
const nativeTags = parentInstance._children.map(
- (child) => typeof child === 'number'
- ? child // Leaf node (eg text)
- : child._nativeTag
+ child =>
+ typeof child === 'number'
+ ? child // Leaf node (eg text)
+ : child._nativeTag,
);
UIManager.setChildren(
parentInstance._nativeTag, // containerTag
- nativeTags // reactTags
+ nativeTags, // reactTags
);
return false;
},
- getRootHostContext() : {||} {
+ getRootHostContext(): {} {
return emptyObject;
},
- getChildHostContext() : {||} {
+ getChildHostContext(): {} {
return emptyObject;
},
@@ -243,10 +250,10 @@ const NativeRenderer = ReactFiberReconciler({
},
insertBefore(
- parentInstance : Instance | Container,
- child : Instance | TextInstance,
- beforeChild : Instance | TextInstance
- ) : void {
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ beforeChild: Instance | TextInstance,
+ ): void {
// TODO (bvaughn): Remove this check when...
// We create a wrapper object for the container in ReactNative render()
// Or we refactor to remove wrapper objects entirely.
@@ -256,7 +263,7 @@ const NativeRenderer = ReactFiberReconciler({
'Container does not support insertBefore operation',
);
- const children = (parentInstance : any)._children;
+ const children = (parentInstance: any)._children;
const beforeChildIndex = children.indexOf(beforeChild);
const index = children.indexOf(child);
@@ -267,7 +274,7 @@ const NativeRenderer = ReactFiberReconciler({
children.splice(beforeChildIndex, 0, child);
UIManager.manageChildren(
- (parentInstance : any)._nativeTag, // containerID
+ (parentInstance: any)._nativeTag, // containerID
[index], // moveFromIndices
[beforeChildIndex], // moveToIndices
[], // addChildReactTags
@@ -278,35 +285,35 @@ const NativeRenderer = ReactFiberReconciler({
children.splice(beforeChildIndex, 0, child);
UIManager.manageChildren(
- (parentInstance : any)._nativeTag, // containerID
+ (parentInstance: any)._nativeTag, // containerID
[], // moveFromIndices
[], // moveToIndices
- [(child : any)._nativeTag], // addChildReactTags
+ [(child: any)._nativeTag], // addChildReactTags
[beforeChildIndex], // addAtIndices
[], // removeAtIndices
);
}
},
- prepareForCommit() : void {
+ prepareForCommit(): void {
// Noop
},
prepareUpdate(
- instance : Instance,
- type : string,
- oldProps : Props,
- newProps : Props,
- rootContainerInstance : Container,
- hostContext : {||}
- ) : null | Object {
+ instance: Instance,
+ type: string,
+ oldProps: Props,
+ newProps: Props,
+ rootContainerInstance: Container,
+ hostContext: {},
+ ): null | Object {
return emptyObject;
},
removeChild(
- parentInstance : Instance | Container,
- child : Instance | TextInstance
- ) : void {
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ ): void {
recursivelyUncacheFiberNode(child);
if (typeof parentInstance === 'number') {
@@ -335,15 +342,15 @@ const NativeRenderer = ReactFiberReconciler({
}
},
- resetAfterCommit() : void {
+ resetAfterCommit(): void {
// Noop
},
- resetTextContent(instance : Instance) : void {
+ resetTextContent(instance: Instance): void {
// Noop
},
- shouldDeprioritizeSubtree(type : string, props : Props) : boolean {
+ shouldDeprioritizeSubtree(type: string, props: Props): boolean {
return false;
},
@@ -351,7 +358,7 @@ const NativeRenderer = ReactFiberReconciler({
scheduleDeferredCallback: global.requestIdleCallback,
- shouldSetTextContent(props : Props) : boolean {
+ shouldSetTextContent(props: Props): boolean {
// TODO (bvaughn) Revisit this decision.
// Always returning false simplifies the createInstance() implementation,
// But creates an additional child Fiber for raw text children.
@@ -365,25 +372,21 @@ const NativeRenderer = ReactFiberReconciler({
});
ReactGenericBatching.injection.injectFiberBatchedUpdates(
- NativeRenderer.batchedUpdates
+ NativeRenderer.batchedUpdates,
);
const roots = new Map();
-findNodeHandle.injection.injectFindNode(
- (fiber: Fiber) => {
- const instance: any = NativeRenderer.findHostInstance(fiber);
- return instance ? instance._nativeTag : null;
- }
-);
-findNodeHandle.injection.injectFindRootNodeID(
- (instance) => instance._nativeTag
-);
+findNodeHandle.injection.injectFindNode((fiber: Fiber) => {
+ const instance: any = NativeRenderer.findHostInstance(fiber);
+ return instance ? instance._nativeTag : null;
+});
+findNodeHandle.injection.injectFindRootNodeID(instance => instance._nativeTag);
const ReactNative = {
findNodeHandle,
- render(element : Element<any>, containerTag : any, callback: ?Function) {
+ render(element: Element<any>, containerTag: any, callback: ?Function) {
let root = roots.get(containerTag);
if (!root) {
@@ -397,7 +400,7 @@ const ReactNative = {
return NativeRenderer.getPublicRootInstance(root);
},
- unmountComponentAtNode(containerTag : number) {
+ unmountComponentAtNode(containerTag: number) {
const root = roots.get(containerTag);
if (root) {
// TODO: Is it safe to reset this now or should I wait since this unmount could be deferred?
@@ -414,12 +417,15 @@ const ReactNative = {
UIManager.removeRootView(containerTag);
},
- unstable_createPortal(children: ReactNodeList, containerTag : number, key : ?string = null) {
+ unstable_createPortal(
+ children: ReactNodeList,
+ containerTag: number,
+ key: ?string = null,
+ ) {
return ReactPortal.createPortal(children, containerTag, null, key);
},
unstable_batchedUpdates: ReactGenericBatching.batchedUpdates,
-
};
if (typeof injectInternals === 'function') {
diff --git a/src/renderers/native/ReactNativeInjection.js b/src/renderers/native/ReactNativeInjection.js
index d3000c8d0a..116948d7bd 100644
--- a/src/renderers/native/ReactNativeInjection.js
+++ b/src/renderers/native/ReactNativeInjection.js
@@ -42,7 +42,7 @@ function inject() {
EventPluginUtils.injection.injectComponentTree(ReactNativeComponentTree);
ResponderEventPlugin.injection.injectGlobalResponderHandler(
- ReactNativeGlobalResponderHandler
+ ReactNativeGlobalResponderHandler,
);
/**
@@ -50,8 +50,8 @@ function inject() {
* them).
*/
EventPluginHub.injection.injectEventPluginsByName({
- 'ResponderEventPlugin': ResponderEventPlugin,
- 'ReactNativeBridgeEventPlugin': ReactNativeBridgeEventPlugin,
+ ResponderEventPlugin: ResponderEventPlugin,
+ ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin,
});
}
diff --git a/src/renderers/native/ReactNativeMount.js b/src/renderers/native/ReactNativeMount.js
index f5974d813f..ee4a28f45a 100644
--- a/src/renderers/native/ReactNativeMount.js
+++ b/src/renderers/native/ReactNativeMount.js
@@ -47,17 +47,14 @@ TopLevelWrapper.isReactTopLevelWrapper = true;
* @param {number} containerTag container element to mount into.
* @param {ReactReconcileTransaction} transaction
*/
-function mountComponentIntoNode(
- componentInstance,
- containerTag,
- transaction) {
+function mountComponentIntoNode(componentInstance, containerTag, transaction) {
var markup = ReactReconciler.mountComponent(
componentInstance,
transaction,
null,
ReactNativeContainerInfo(containerTag),
emptyObject,
- 0 /* parentDebugID */
+ 0 /* parentDebugID */,
);
componentInstance._renderedComponent._topLevelWrapper = componentInstance;
ReactNativeMount._mountImageIntoNode(markup, containerTag);
@@ -70,16 +67,14 @@ function mountComponentIntoNode(
* @param {number} rootID ID of the root node.
* @param {number} containerTag container element to mount into.
*/
-function batchedMountComponentIntoNode(
- componentInstance,
- containerTag) {
+function batchedMountComponentIntoNode(componentInstance, containerTag) {
var transaction = ReactUpdates.ReactReconcileTransaction.getPooled();
transaction.perform(
mountComponentIntoNode,
null,
componentInstance,
containerTag,
- transaction
+ transaction,
);
ReactUpdates.ReactReconcileTransaction.release(transaction);
}
@@ -101,12 +96,11 @@ var ReactNativeMount = {
renderComponent: function(
nextElement: ReactElement<*>,
containerTag: number,
- callback?: ?(() => void)
+ callback?: ?() => void,
): ?ReactComponent<any, any, any> {
- var nextWrappedElement = React.createElement(
- TopLevelWrapper,
- { child: nextElement }
- );
+ var nextWrappedElement = React.createElement(TopLevelWrapper, {
+ child: nextElement,
+ });
var topRootNodeID = containerTag;
var prevComponent = ReactNativeMount._instancesByContainerID[topRootNodeID];
@@ -114,7 +108,11 @@ var ReactNativeMount = {
var prevWrappedElement = prevComponent._currentElement;
var prevElement = prevWrappedElement.props.child;
if (shouldUpdateReactComponent(prevElement, nextElement)) {
- ReactUpdateQueue.enqueueElementInternal(prevComponent, nextWrappedElement, emptyObject);
+ ReactUpdateQueue.enqueueElementInternal(
+ prevComponent,
+ nextWrappedElement,
+ emptyObject,
+ );
if (callback) {
ReactUpdateQueue.enqueueCallbackInternal(prevComponent, callback);
}
@@ -136,9 +134,11 @@ var ReactNativeMount = {
if (callback) {
var nonNullCallback = callback;
- instance._pendingCallbacks = [function() {
- nonNullCallback.call(instance._renderedComponent.getPublicInstance());
- }];
+ instance._pendingCallbacks = [
+ function() {
+ nonNullCallback.call(instance._renderedComponent.getPublicInstance());
+ },
+ ];
}
// The initial render is synchronous but any updates that happen during
@@ -148,7 +148,7 @@ var ReactNativeMount = {
ReactUpdates.batchedUpdates(
batchedMountComponentIntoNode,
instance,
- containerTag
+ containerTag,
);
var component = instance._renderedComponent.getPublicInstance();
return component;
@@ -158,14 +158,11 @@ var ReactNativeMount = {
* @param {View} view View tree image.
* @param {number} containerViewID View to insert sub-view into.
*/
- _mountImageIntoNode: function(mountImage : number, containerID : number) {
+ _mountImageIntoNode: function(mountImage: number, containerID: number) {
// Since we now know that the `mountImage` has been mounted, we can
// mark it as such.
var childTag = mountImage;
- UIManager.setChildren(
- containerID,
- [childTag]
- );
+ UIManager.setChildren(containerID, [childTag]);
},
/**
@@ -176,9 +173,7 @@ var ReactNativeMount = {
* asynchronously, it's easier to just have this method be the one that calls
* for removal of the view.
*/
- unmountComponentAtNodeAndRemoveContainer: function(
- containerTag: number
- ) {
+ unmountComponentAtNodeAndRemoveContainer: function(containerTag: number) {
ReactNativeMount.unmountComponentAtNode(containerTag);
// call back into native to remove all of the subviews from this container
UIManager.removeRootView(containerTag);
@@ -221,13 +216,12 @@ var ReactNativeMount = {
*/
unmountComponentFromNode: function(
instance: ReactComponent<any, any, any>,
- containerID: number
+ containerID: number,
) {
// Call back into native to remove all of the subviews from this container
ReactReconciler.unmountComponent(instance);
UIManager.removeSubviewsFromContainerWithID(containerID);
},
-
};
module.exports = ReactNativeMount;
diff --git a/src/renderers/native/ReactNativeReconcileTransaction.js b/src/renderers/native/ReactNativeReconcileTransaction.js
index de34a657b5..9ee4fc9815 100644
--- a/src/renderers/native/ReactNativeReconcileTransaction.js
+++ b/src/renderers/native/ReactNativeReconcileTransaction.js
@@ -124,7 +124,7 @@ Object.assign(
ReactNativeReconcileTransaction.prototype,
Transaction,
ReactNativeReconcileTransaction,
- Mixin
+ Mixin,
);
PooledClass.addPoolingTo(ReactNativeReconcileTransaction);
diff --git a/src/renderers/native/ReactNativeStack.js b/src/renderers/native/ReactNativeStack.js
index 55cf71fa1c..2781d2e622 100644
--- a/src/renderers/native/ReactNativeStack.js
+++ b/src/renderers/native/ReactNativeStack.js
@@ -25,17 +25,13 @@ ReactNativeStackInjection.inject();
var render = function(
element: ReactElement<any>,
mountInto: number,
- callback?: ?(() => void)
+ callback?: ?() => void,
): ?ReactComponent<any, any, any> {
return ReactNativeMount.renderComponent(element, mountInto, callback);
};
-findNodeHandle.injection.injectFindNode(
- (instance) => instance.getHostNode()
-);
-findNodeHandle.injection.injectFindRootNodeID(
- (instance) => instance._rootNodeID
-);
+findNodeHandle.injection.injectFindNode(instance => instance.getHostNode());
+findNodeHandle.injection.injectFindRootNodeID(instance => instance._rootNodeID);
var ReactNative = {
hasReactNativeInitialized: false,
@@ -55,7 +51,8 @@ var ReactNative = {
/* globals __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== 'undefined' &&
- typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject === 'function') {
+ typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject === 'function'
+) {
__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({
ComponentTree: {
getClosestInstanceFromNode: function(node) {
diff --git a/src/renderers/native/ReactNativeStackInjection.js b/src/renderers/native/ReactNativeStackInjection.js
index 63ca4e124b..d1127b86b3 100644
--- a/src/renderers/native/ReactNativeStackInjection.js
+++ b/src/renderers/native/ReactNativeStackInjection.js
@@ -35,44 +35,40 @@ var invariant = require('fbjs/lib/invariant');
function inject() {
ReactGenericBatching.injection.injectStackBatchedUpdates(
- ReactUpdates.batchedUpdates
+ ReactUpdates.batchedUpdates,
);
ReactUpdates.injection.injectReconcileTransaction(
- ReactNativeComponentEnvironment.ReactReconcileTransaction
+ ReactNativeComponentEnvironment.ReactReconcileTransaction,
);
- ReactUpdates.injection.injectBatchingStrategy(
- ReactDefaultBatchingStrategy
- );
+ ReactUpdates.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy);
ReactComponentEnvironment.injection.injectEnvironment(
- ReactNativeComponentEnvironment
+ ReactNativeComponentEnvironment,
);
- var EmptyComponent = (instantiate) => {
+ var EmptyComponent = instantiate => {
// Can't import View at the top because it depends on React to make its composite
var View = require('View');
return new ReactSimpleEmptyComponent(
React.createElement(View, {
collapsable: true,
- style: { position: 'absolute' },
+ style: {position: 'absolute'},
}),
- instantiate
+ instantiate,
);
};
- findNodeHandle.injection.injectFindNode(
- (instance) => instance.getHostNode()
- );
+ findNodeHandle.injection.injectFindNode(instance => instance.getHostNode());
findNodeHandle.injection.injectFindRootNodeID(
- (instance) => instance._rootNodeID
+ instance => instance._rootNodeID,
);
ReactEmptyComponent.injection.injectEmptyComponentFactory(EmptyComponent);
ReactHostComponent.injection.injectTextComponentClass(
- ReactNativeTextComponent
+ ReactNativeTextComponent,
);
ReactHostComponent.injection.injectGenericComponentClass(function(tag) {
// Show a nicer error message for non-function tags
diff --git a/src/renderers/native/ReactNativeTagHandles.js b/src/renderers/native/ReactNativeTagHandles.js
index 17e7e5d8e6..51e54d4033 100644
--- a/src/renderers/native/ReactNativeTagHandles.js
+++ b/src/renderers/native/ReactNativeTagHandles.js
@@ -44,7 +44,8 @@ var ReactNativeTagHandles = {
assertRootTag: function(tag: number): void {
invariant(
this.reactTagIsNativeTopRootID(tag),
- 'Expect a native root tag, instead got %s', tag
+ 'Expect a native root tag, instead got %s',
+ tag,
);
},
diff --git a/src/renderers/native/ReactNativeTextComponent.js b/src/renderers/native/ReactNativeTextComponent.js
index eb8525a49e..6f7988403a 100644
--- a/src/renderers/native/ReactNativeTextComponent.js
+++ b/src/renderers/native/ReactNativeTextComponent.js
@@ -26,24 +26,25 @@ var ReactNativeTextComponent = function(text) {
};
Object.assign(ReactNativeTextComponent.prototype, {
-
- mountComponent: function(transaction, hostParent, hostContainerInfo, context) {
+ mountComponent: function(
+ transaction,
+ hostParent,
+ hostContainerInfo,
+ context,
+ ) {
// TODO: hostParent should have this context already. Stop abusing context.
invariant(
context.isInAParentText,
'RawText "%s" must be wrapped in an explicit <Text> component.',
- this._stringText
+ this._stringText,
);
this._hostParent = hostParent;
var tag = ReactNativeTagHandles.allocateTag();
this._rootNodeID = tag;
var nativeTopRootTag = hostContainerInfo._tag;
- UIManager.createView(
- tag,
- 'RCTRawText',
- nativeTopRootTag,
- {text: this._stringText}
- );
+ UIManager.createView(tag, 'RCTRawText', nativeTopRootTag, {
+ text: this._stringText,
+ });
ReactNativeComponentTree.precacheNode(this, tag);
@@ -60,11 +61,9 @@ Object.assign(ReactNativeTextComponent.prototype, {
var nextStringText = '' + nextText;
if (nextStringText !== this._stringText) {
this._stringText = nextStringText;
- UIManager.updateView(
- this._rootNodeID,
- 'RCTRawText',
- {text: this._stringText}
- );
+ UIManager.updateView(this._rootNodeID, 'RCTRawText', {
+ text: this._stringText,
+ });
}
}
},
@@ -75,7 +74,6 @@ Object.assign(ReactNativeTextComponent.prototype, {
this._stringText = null;
this._rootNodeID = 0;
},
-
});
module.exports = ReactNativeTextComponent;
diff --git a/src/renderers/native/ReactNativeViewConfigRegistry.js b/src/renderers/native/ReactNativeViewConfigRegistry.js
index 39f95046e6..23a783cb31 100644
--- a/src/renderers/native/ReactNativeViewConfigRegistry.js
+++ b/src/renderers/native/ReactNativeViewConfigRegistry.js
@@ -25,12 +25,12 @@ const viewConfigs = new Map();
const prefix = 'topsecret-';
const ReactNativeViewConfigRegistry = {
- register(viewConfig : ReactNativeBaseComponentViewConfig) {
+ register(viewConfig: ReactNativeBaseComponentViewConfig) {
const name = viewConfig.uiViewClassName;
invariant(
!viewConfigs.has(name),
'Tried to register two views with the same name %s',
- name
+ name,
);
const secretName = prefix + name;
viewConfigs.set(secretName, viewConfig);
@@ -38,11 +38,7 @@ const ReactNativeViewConfigRegistry = {
},
get(secretName: string) {
const config = viewConfigs.get(secretName);
- invariant(
- config,
- 'View config not found for name %s',
- secretName
- );
+ invariant(config, 'View config not found for name %s', secretName);
return config;
},
};
diff --git a/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js b/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js
index 568764dc0a..77c8ae799c 100644
--- a/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js
+++ b/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js
@@ -15,55 +15,45 @@ var ReactNativePropRegistry = require('ReactNativePropRegistry');
var diff = ReactNativeAttributePayload.diff;
describe('ReactNativeAttributePayload', () => {
-
it('should work with simple example', () => {
- expect(diff(
- {a: 1, c: 3},
- {b: 2, c: 3},
- {a: true, b: true}
- )).toEqual({a: null, b: 2});
+ expect(diff({a: 1, c: 3}, {b: 2, c: 3}, {a: true, b: true})).toEqual({
+ a: null,
+ b: 2,
+ });
});
it('should skip fields that are equal', () => {
- expect(diff(
- {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
- {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
- {a: true, b: true, c: true, d: true, e: true, f: true}
- )).toEqual(null);
+ expect(
+ diff(
+ {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
+ {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
+ {a: true, b: true, c: true, d: true, e: true, f: true},
+ ),
+ ).toEqual(null);
});
it('should remove fields', () => {
- expect(diff(
- {a: 1},
- {},
- {a: true}
- )).toEqual({a: null});
+ expect(diff({a: 1}, {}, {a: true})).toEqual({a: null});
});
it('should remove fields that are set to undefined', () => {
- expect(diff(
- {a: 1},
- {a: undefined},
- {a: true}
- )).toEqual({a: null});
+ expect(diff({a: 1}, {a: undefined}, {a: true})).toEqual({a: null});
});
it('should ignore invalid fields', () => {
- expect(diff(
- {a: 1},
- {b: 2},
- {}
- )).toEqual(null);
+ expect(diff({a: 1}, {b: 2}, {})).toEqual(null);
});
it('should use the diff attribute', () => {
var diffA = jest.fn((a, b) => true);
var diffB = jest.fn((a, b) => false);
- expect(diff(
- {a: [1], b: [3]},
- {a: [2], b: [4]},
- {a: {diff: diffA}, b: {diff: diffB}}
- )).toEqual({a: [2]});
+ expect(
+ diff(
+ {a: [1], b: [3]},
+ {a: [2], b: [4]},
+ {a: {diff: diffA}, b: {diff: diffB}},
+ ),
+ ).toEqual({a: [2]});
expect(diffA).toBeCalledWith([1], [2]);
expect(diffB).toBeCalledWith([3], [4]);
});
@@ -71,171 +61,176 @@ describe('ReactNativeAttributePayload', () => {
it('should not use the diff attribute on addition/removal', () => {
var diffA = jest.fn();
var diffB = jest.fn();
- expect(diff(
- {a: [1]},
- {b: [2]},
- {a: {diff: diffA}, b: {diff: diffB}}
- )).toEqual({a: null, b: [2]});
+ expect(
+ diff({a: [1]}, {b: [2]}, {a: {diff: diffA}, b: {diff: diffB}}),
+ ).toEqual({a: null, b: [2]});
expect(diffA).not.toBeCalled();
expect(diffB).not.toBeCalled();
});
it('should do deep diffs of Objects by default', () => {
- expect(diff(
- {a: [1], b: {k: [3, 4]}, c: {k: [4, 4]} },
- {a: [2], b: {k: [3, 4]}, c: {k: [4, 5]} },
- {a: true, b: true, c: true}
- )).toEqual({a: [2], c: {k: [4, 5]}});
+ expect(
+ diff(
+ {a: [1], b: {k: [3, 4]}, c: {k: [4, 4]}},
+ {a: [2], b: {k: [3, 4]}, c: {k: [4, 5]}},
+ {a: true, b: true, c: true},
+ ),
+ ).toEqual({a: [2], c: {k: [4, 5]}});
});
it('should work with undefined styles', () => {
- expect(diff(
- { style: { a: '#ffffff', b: 1 } },
- { style: undefined },
- { style: { b: true } }
- )).toEqual({ b: null });
- expect(diff(
- { style: undefined },
- { style: { a: '#ffffff', b: 1 } },
- { style: { b: true } }
- )).toEqual({ b: 1 });
- expect(diff(
- { style: undefined },
- { style: undefined },
- { style: { b: true } }
- )).toEqual(null);
+ expect(
+ diff(
+ {style: {a: '#ffffff', b: 1}},
+ {style: undefined},
+ {style: {b: true}},
+ ),
+ ).toEqual({b: null});
+ expect(
+ diff(
+ {style: undefined},
+ {style: {a: '#ffffff', b: 1}},
+ {style: {b: true}},
+ ),
+ ).toEqual({b: 1});
+ expect(
+ diff({style: undefined}, {style: undefined}, {style: {b: true}}),
+ ).toEqual(null);
});
it('should work with empty styles', () => {
- expect(diff(
- {a: 1, c: 3},
- {},
- {a: true, b: true}
- )).toEqual({a: null});
- expect(diff(
- {},
- {a: 1, c: 3},
- {a: true, b: true}
- )).toEqual({a: 1});
- expect(diff(
- {},
- {},
- {a: true, b: true}
- )).toEqual(null);
+ expect(diff({a: 1, c: 3}, {}, {a: true, b: true})).toEqual({a: null});
+ expect(diff({}, {a: 1, c: 3}, {a: true, b: true})).toEqual({a: 1});
+ expect(diff({}, {}, {a: true, b: true})).toEqual(null);
});
it('should flatten nested styles and predefined styles', () => {
- var validStyleAttribute = { someStyle: { foo: true, bar: true } };
+ var validStyleAttribute = {someStyle: {foo: true, bar: true}};
- expect(diff(
- {},
- { someStyle: [{ foo: 1 }, { bar: 2 }]},
- validStyleAttribute
- )).toEqual({ foo: 1, bar: 2 });
+ expect(
+ diff({}, {someStyle: [{foo: 1}, {bar: 2}]}, validStyleAttribute),
+ ).toEqual({foo: 1, bar: 2});
- expect(diff(
- { someStyle: [{ foo: 1 }, { bar: 2 }]},
- {},
- validStyleAttribute
- )).toEqual({ foo: null, bar: null });
+ expect(
+ diff({someStyle: [{foo: 1}, {bar: 2}]}, {}, validStyleAttribute),
+ ).toEqual({foo: null, bar: null});
var barStyle = ReactNativePropRegistry.register({
bar: 3,
});
- expect(diff(
- {},
- { someStyle: [[{ foo: 1 }, { foo: 2 }], barStyle]},
- validStyleAttribute
- )).toEqual({ foo: 2, bar: 3 });
+ expect(
+ diff(
+ {},
+ {someStyle: [[{foo: 1}, {foo: 2}], barStyle]},
+ validStyleAttribute,
+ ),
+ ).toEqual({foo: 2, bar: 3});
});
it('should reset a value to a previous if it is removed', () => {
- var validStyleAttribute = { someStyle: { foo: true, bar: true } };
+ var validStyleAttribute = {someStyle: {foo: true, bar: true}};
- expect(diff(
- { someStyle: [{ foo: 1 }, { foo: 3 }]},
- { someStyle: [{ foo: 1 }, { bar: 2 }]},
- validStyleAttribute
- )).toEqual({ foo: 1, bar: 2 });
+ expect(
+ diff(
+ {someStyle: [{foo: 1}, {foo: 3}]},
+ {someStyle: [{foo: 1}, {bar: 2}]},
+ validStyleAttribute,
+ ),
+ ).toEqual({foo: 1, bar: 2});
});
it('should not clear removed props if they are still in another slot', () => {
- var validStyleAttribute = { someStyle: { foo: true, bar: true } };
+ var validStyleAttribute = {someStyle: {foo: true, bar: true}};
- expect(diff(
- { someStyle: [{}, { foo: 3, bar: 2 }]},
- { someStyle: [{ foo: 3 }, { bar: 2 }]},
- validStyleAttribute
- )).toEqual({ foo: 3 }); // this should ideally be null. heuristic tradeoff.
+ expect(
+ diff(
+ {someStyle: [{}, {foo: 3, bar: 2}]},
+ {someStyle: [{foo: 3}, {bar: 2}]},
+ validStyleAttribute,
+ ),
+ ).toEqual({foo: 3}); // this should ideally be null. heuristic tradeoff.
- expect(diff(
- { someStyle: [{}, { foo: 3, bar: 2 }]},
- { someStyle: [{ foo: 1, bar: 1 }, { bar: 2 }]},
- validStyleAttribute
- )).toEqual({ bar: 2, foo: 1 });
+ expect(
+ diff(
+ {someStyle: [{}, {foo: 3, bar: 2}]},
+ {someStyle: [{foo: 1, bar: 1}, {bar: 2}]},
+ validStyleAttribute,
+ ),
+ ).toEqual({bar: 2, foo: 1});
});
it('should clear a prop if a later style is explicit null/undefined', () => {
- var validStyleAttribute = { someStyle: { foo: true, bar: true } };
- expect(diff(
- { someStyle: [{}, { foo: 3, bar: 2 }]},
- { someStyle: [{ foo: 1 }, { bar: 2, foo: null }]},
- validStyleAttribute
- )).toEqual({ foo: null });
+ var validStyleAttribute = {someStyle: {foo: true, bar: true}};
+ expect(
+ diff(
+ {someStyle: [{}, {foo: 3, bar: 2}]},
+ {someStyle: [{foo: 1}, {bar: 2, foo: null}]},
+ validStyleAttribute,
+ ),
+ ).toEqual({foo: null});
- expect(diff(
- { someStyle: [{ foo: 3 }, { foo: null, bar: 2 }]},
- { someStyle: [{ foo: null }, { bar: 2 }]},
- validStyleAttribute
- )).toEqual({ foo: null });
+ expect(
+ diff(
+ {someStyle: [{foo: 3}, {foo: null, bar: 2}]},
+ {someStyle: [{foo: null}, {bar: 2}]},
+ validStyleAttribute,
+ ),
+ ).toEqual({foo: null});
- expect(diff(
- { someStyle: [{ foo: 1 }, { foo: null }]},
- { someStyle: [{ foo: 2 }, { foo: null }]},
- validStyleAttribute
- )).toEqual({ foo: null }); // this should ideally be null. heuristic.
+ expect(
+ diff(
+ {someStyle: [{foo: 1}, {foo: null}]},
+ {someStyle: [{foo: 2}, {foo: null}]},
+ validStyleAttribute,
+ ),
+ ).toEqual({foo: null}); // this should ideally be null. heuristic.
// Test the same case with object equality because an early bailout doesn't
// work in this case.
- var fooObj = { foo: 3 };
- expect(diff(
- { someStyle: [{ foo: 1 }, fooObj]},
- { someStyle: [{ foo: 2 }, fooObj]},
- validStyleAttribute
- )).toEqual({ foo: 3 }); // this should ideally be null. heuristic.
+ var fooObj = {foo: 3};
+ expect(
+ diff(
+ {someStyle: [{foo: 1}, fooObj]},
+ {someStyle: [{foo: 2}, fooObj]},
+ validStyleAttribute,
+ ),
+ ).toEqual({foo: 3}); // this should ideally be null. heuristic.
- expect(diff(
- { someStyle: [{ foo: 1 }, { foo: 3 }]},
- { someStyle: [{ foo: 2 }, { foo: undefined }]},
- validStyleAttribute
- )).toEqual({ foo: null }); // this should ideally be null. heuristic.
+ expect(
+ diff(
+ {someStyle: [{foo: 1}, {foo: 3}]},
+ {someStyle: [{foo: 2}, {foo: undefined}]},
+ validStyleAttribute,
+ ),
+ ).toEqual({foo: null}); // this should ideally be null. heuristic.
});
// Function properties are just markers to native that events should be sent.
it('should convert functions to booleans', () => {
// Note that if the property changes from one function to another, we don't
// need to send an update.
- expect(diff(
- {
- a: function() {
- return 1;
+ expect(
+ diff(
+ {
+ a: function() {
+ return 1;
+ },
+ b: function() {
+ return 2;
+ },
+ c: 3,
},
- b: function() {
- return 2;
+ {
+ b: function() {
+ return 9;
+ },
+ c: function() {
+ return 3;
+ },
},
- c: 3,
- },
- {
- b: function() {
- return 9;
- },
- c: function() {
- return 3;
- },
- },
- {a: true, b: true, c: true}
- )).toEqual({a: null, c: true});
+ {a: true, b: true, c: true},
+ ),
+ ).toEqual({a: null, c: true});
});
-
});
diff --git a/src/renderers/native/__tests__/ReactNativeEvents-test.js b/src/renderers/native/__tests__/ReactNativeEvents-test.js
index b9ae12aa04..c6d0085a59 100644
--- a/src/renderers/native/__tests__/ReactNativeEvents-test.js
+++ b/src/renderers/native/__tests__/ReactNativeEvents-test.js
@@ -33,7 +33,7 @@ it('handles events', () => {
expect(RCTEventEmitter.register.mock.calls.length).toBe(1);
var EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
var View = createReactNativeComponentClass({
- validAttributes: { foo: true },
+ validAttributes: {foo: true},
uiViewClassName: 'View',
});
@@ -53,7 +53,7 @@ it('handles events', () => {
onTouchStart={() => log.push('inner touchstart')}
/>
</View>,
- 1
+ 1,
);
expect(UIManager.createView.mock.calls.length).toBe(2);
@@ -61,18 +61,18 @@ it('handles events', () => {
// Don't depend on the order of createView() calls.
// Stack creates views outside-in; fiber creates them inside-out.
var innerTag = UIManager.createView.mock.calls.find(
- args => args[3].foo === 'inner'
+ args => args[3].foo === 'inner',
)[0];
EventEmitter.receiveTouches(
'topTouchStart',
[{target: innerTag, identifier: 17}],
- [0]
+ [0],
);
EventEmitter.receiveTouches(
'topTouchEnd',
[{target: innerTag, identifier: 17}],
- [0]
+ [0],
);
expect(log).toEqual([
@@ -90,13 +90,13 @@ it('handles events', () => {
it('handles when a responder is unmounted while a touch sequence is in progress', () => {
var EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
var View = createReactNativeComponentClass({
- validAttributes: { id: true },
+ validAttributes: {id: true},
uiViewClassName: 'View',
});
function getViewById(id) {
return UIManager.createView.mock.calls.find(
- args => args[3] && args[3].id === id
+ args => args[3] && args[3].id === id,
)[0];
}
@@ -131,13 +131,13 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
/>
</View>
</View>,
- 1
+ 1,
);
EventEmitter.receiveTouches(
'topTouchStart',
[{target: getViewById('one'), identifier: 17}],
- [0]
+ [0],
);
expect(getResponderId()).toBe('one');
@@ -155,7 +155,7 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
/>
</View>
</View>,
- 1
+ 1,
);
// TODO Verify the onResponderEnd listener has been called (before the unmount)
@@ -165,7 +165,7 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
EventEmitter.receiveTouches(
'topTouchEnd',
[{target: getViewById('two'), identifier: 17}],
- [0]
+ [0],
);
expect(getResponderId()).toBeNull();
@@ -174,7 +174,7 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
EventEmitter.receiveTouches(
'topTouchStart',
[{target: getViewById('two'), identifier: 17}],
- [0]
+ [0],
);
expect(getResponderId()).toBe('two');
diff --git a/src/renderers/native/__tests__/ReactNativeMount-test.js b/src/renderers/native/__tests__/ReactNativeMount-test.js
index c4fb4b77d0..9c9bf936f8 100644
--- a/src/renderers/native/__tests__/ReactNativeMount-test.js
+++ b/src/renderers/native/__tests__/ReactNativeMount-test.js
@@ -28,7 +28,7 @@ describe('ReactNative', () => {
it('should be able to create and render a native component', () => {
var View = createReactNativeComponentClass({
- validAttributes: { foo: true },
+ validAttributes: {foo: true},
uiViewClassName: 'View',
});
@@ -41,7 +41,7 @@ describe('ReactNative', () => {
it('should be able to create and update a native component', () => {
var View = createReactNativeComponentClass({
- validAttributes: { foo: true },
+ validAttributes: {foo: true},
uiViewClassName: 'View',
});
@@ -57,28 +57,27 @@ describe('ReactNative', () => {
expect(UIManager.createView.mock.calls.length).toBe(1);
expect(UIManager.setChildren.mock.calls.length).toBe(1);
expect(UIManager.manageChildren).not.toBeCalled();
- expect(UIManager.updateView).toBeCalledWith(2, 'View', { foo: 'bar' });
+ expect(UIManager.updateView).toBeCalledWith(2, 'View', {foo: 'bar'});
});
it('returns the correct instance and calls it in the callback', () => {
var View = createReactNativeComponentClass({
- validAttributes: { foo: true },
+ validAttributes: {foo: true},
uiViewClassName: 'View',
});
var a;
var b;
var c = ReactNative.render(
- <View foo="foo" ref={(v) => a = v} />,
+ <View foo="foo" ref={v => a = v} />,
11,
function() {
b = this;
- }
+ },
);
expect(a).toBeTruthy();
expect(a).toBe(b);
expect(a).toBe(c);
});
-
});
diff --git a/src/renderers/native/createReactNativeComponentClass.js b/src/renderers/native/createReactNativeComponentClass.js
index 0d560c0553..9e4039a9f2 100644
--- a/src/renderers/native/createReactNativeComponentClass.js
+++ b/src/renderers/native/createReactNativeComponentClass.js
@@ -28,7 +28,7 @@ type ReactNativeBaseComponentViewConfig = {
* @private
*/
const createReactNativeFiberComponentClass = function(
- viewConfig: ReactNativeBaseComponentViewConfig
+ viewConfig: ReactNativeBaseComponentViewConfig,
): string {
return ReactNativeViewConfigRegistry.register(viewConfig);
};
@@ -38,7 +38,7 @@ const createReactNativeFiberComponentClass = function(
* @private
*/
const createReactNativeComponentClass = function(
- viewConfig: ReactNativeBaseComponentViewConfig
+ viewConfig: ReactNativeBaseComponentViewConfig,
): ReactClass<any> {
const Constructor = function(element) {
this._currentElement = element;
diff --git a/src/renderers/native/findNodeHandle.js b/src/renderers/native/findNodeHandle.js
index 7edb378924..5b02c1054c 100644
--- a/src/renderers/native/findNodeHandle.js
+++ b/src/renderers/native/findNodeHandle.js
@@ -18,7 +18,7 @@ var ReactInstanceMap = require('ReactInstanceMap');
var invariant = require('fbjs/lib/invariant');
var warning = require('fbjs/lib/warning');
-import type { ReactInstance } from 'ReactInstanceType';
+import type {ReactInstance} from 'ReactInstanceType';
/**
* ReactNative vs ReactWeb
@@ -61,11 +61,11 @@ function findNodeHandle(componentOrHandle: any): ?number {
warning(
owner._warnedAboutRefsInRender,
'%s is accessing findNodeHandle inside its render(). ' +
- 'render() should be a pure function of props and state. It should ' +
- 'never access something that requires stale data from the previous ' +
- 'render, such as refs. Move this logic to componentDidMount and ' +
- 'componentDidUpdate instead.',
- owner.getName() || 'A component'
+ 'render() should be a pure function of props and state. It should ' +
+ 'never access something that requires stale data from the previous ' +
+ 'render, such as refs. Move this logic to componentDidMount and ' +
+ 'componentDidUpdate instead.',
+ owner.getName() || 'A component',
);
owner._warnedAboutRefsInRender = true;
@@ -92,27 +92,21 @@ function findNodeHandle(componentOrHandle: any): ?number {
return rootNodeID;
} else {
invariant(
- (
- // Native
- typeof component === 'object' &&
- (
- '_rootNodeID' in component || // TODO (bvaughn) Clean up once Stack is deprecated
- '_nativeTag' in component
- )
- ) || (
+ // Native
+ (typeof component === 'object' &&
+ ('_rootNodeID' in component || // TODO (bvaughn) Clean up once Stack is deprecated
+ '_nativeTag' in component)) ||
// Composite
- component.render != null &&
- typeof component.render === 'function'
- ),
+ (component.render != null && typeof component.render === 'function'),
'findNodeHandle(...): Argument is not a component ' +
- '(type: %s, keys: %s)',
+ '(type: %s, keys: %s)',
typeof component,
- Object.keys(component)
+ Object.keys(component),
);
invariant(
false,
'findNodeHandle(...): Unable to find node handle for unmounted ' +
- 'component.'
+ 'component.',
);
}
}
diff --git a/src/renderers/noop/ReactNoop.js b/src/renderers/noop/ReactNoop.js
index d0e2f74c15..54f411dabe 100644
--- a/src/renderers/noop/ReactNoop.js
+++ b/src/renderers/noop/ReactNoop.js
@@ -19,8 +19,8 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
-import type { UpdateQueue } from 'ReactFiberUpdateQueue';
+import type {Fiber} from 'ReactFiber';
+import type {UpdateQueue} from 'ReactFiberUpdateQueue';
var ReactFiberReconciler = require('ReactFiberReconciler');
var ReactInstanceMap = require('ReactInstanceMap');
@@ -34,17 +34,21 @@ const UPDATE_SIGNAL = {};
var scheduledAnimationCallback = null;
var scheduledDeferredCallback = null;
-type Container = { rootID: string, children: Array<Instance | TextInstance> };
-type Props = { prop: any, hidden ?: boolean };
-type Instance = {| type: string, id: number, children: Array<Instance | TextInstance>, prop: any |};
-type TextInstance = {| text: string, id: number |};
+type Container = {rootID: string, children: Array<Instance | TextInstance>};
+type Props = {prop: any, hidden?: boolean};
+type Instance = {|
+ type: string,
+ id: number,
+ children: Array<Instance | TextInstance>,
+ prop: any,
+|};
+type TextInstance = {|text: string, id: number|};
var instanceCounter = 0;
var failInBeginPhase = false;
var NoopRenderer = ReactFiberReconciler({
-
getRootHostContext() {
if (failInBeginPhase) {
throw new Error('Error in host config.');
@@ -60,7 +64,7 @@ var NoopRenderer = ReactFiberReconciler({
return instance;
},
- createInstance(type : string, props : Props) : Instance {
+ createInstance(type: string, props: Props): Instance {
const inst = {
id: instanceCounter++,
type: type,
@@ -68,60 +72,83 @@ var NoopRenderer = ReactFiberReconciler({
prop: props.prop,
};
// Hide from unit tests
- Object.defineProperty(inst, 'id', { value: inst.id, enumerable: false });
+ Object.defineProperty(inst, 'id', {value: inst.id, enumerable: false});
return inst;
},
- appendInitialChild(parentInstance : Instance, child : Instance | TextInstance) : void {
+ appendInitialChild(
+ parentInstance: Instance,
+ child: Instance | TextInstance,
+ ): void {
parentInstance.children.push(child);
},
- finalizeInitialChildren(domElement : Instance, type : string, props : Props) : boolean {
+ finalizeInitialChildren(
+ domElement: Instance,
+ type: string,
+ props: Props,
+ ): boolean {
return false;
},
- prepareUpdate(instance : Instance, type : string, oldProps : Props, newProps : Props) : null | {} {
+ prepareUpdate(
+ instance: Instance,
+ type: string,
+ oldProps: Props,
+ newProps: Props,
+ ): null | {} {
return UPDATE_SIGNAL;
},
- commitMount(instance : Instance, type : string, newProps : Props) : void {
+ commitMount(instance: Instance, type: string, newProps: Props): void {
// Noop
},
- commitUpdate(instance : Instance, updatePayload : Object, type : string, oldProps : Props, newProps : Props) : void {
+ commitUpdate(
+ instance: Instance,
+ updatePayload: Object,
+ type: string,
+ oldProps: Props,
+ newProps: Props,
+ ): void {
instance.prop = newProps.prop;
},
- shouldSetTextContent(props : Props) : boolean {
- return (
- typeof props.children === 'string' ||
- typeof props.children === 'number'
- );
+ shouldSetTextContent(props: Props): boolean {
+ return typeof props.children === 'string' ||
+ typeof props.children === 'number';
},
- resetTextContent(instance : Instance) : void {},
+ resetTextContent(instance: Instance): void {},
- shouldDeprioritizeSubtree(type : string, props : Props) : boolean {
+ shouldDeprioritizeSubtree(type: string, props: Props): boolean {
return !!props.hidden;
},
createTextInstance(
- text : string,
- rootContainerInstance : Container,
- hostContext : Object,
- internalInstanceHandle : Object
- ) : TextInstance {
- var inst = { text : text, id: instanceCounter++ };
+ text: string,
+ rootContainerInstance: Container,
+ hostContext: Object,
+ internalInstanceHandle: Object,
+ ): TextInstance {
+ var inst = {text: text, id: instanceCounter++};
// Hide from unit tests
- Object.defineProperty(inst, 'id', { value: inst.id, enumerable: false });
+ Object.defineProperty(inst, 'id', {value: inst.id, enumerable: false});
return inst;
},
- commitTextUpdate(textInstance : TextInstance, oldText : string, newText : string) : void {
+ commitTextUpdate(
+ textInstance: TextInstance,
+ oldText: string,
+ newText: string,
+ ): void {
textInstance.text = newText;
},
- appendChild(parentInstance : Instance | Container, child : Instance | TextInstance) : void {
+ appendChild(
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ ): void {
const index = parentInstance.children.indexOf(child);
if (index !== -1) {
parentInstance.children.splice(index, 1);
@@ -130,10 +157,10 @@ var NoopRenderer = ReactFiberReconciler({
},
insertBefore(
- parentInstance : Instance | Container,
- child : Instance | TextInstance,
- beforeChild : Instance | TextInstance
- ) : void {
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ beforeChild: Instance | TextInstance,
+ ): void {
const index = parentInstance.children.indexOf(child);
if (index !== -1) {
parentInstance.children.splice(index, 1);
@@ -145,7 +172,10 @@ var NoopRenderer = ReactFiberReconciler({
parentInstance.children.splice(beforeIndex, 0, child);
},
- removeChild(parentInstance : Instance | Container, child : Instance | TextInstance) : void {
+ removeChild(
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ ): void {
const index = parentInstance.children.indexOf(child);
if (index === -1) {
throw new Error('This child does not exist.');
@@ -157,7 +187,7 @@ var NoopRenderer = ReactFiberReconciler({
if (scheduledAnimationCallback) {
throw new Error(
'Scheduling an animation callback twice is excessive. ' +
- 'Instead, keep track of whether the callback has already been scheduled.'
+ 'Instead, keep track of whether the callback has already been scheduled.',
);
}
scheduledAnimationCallback = callback;
@@ -167,18 +197,15 @@ var NoopRenderer = ReactFiberReconciler({
if (scheduledDeferredCallback) {
throw new Error(
'Scheduling deferred callback twice is excessive. ' +
- 'Instead, keep track of whether the callback has already been scheduled.'
+ 'Instead, keep track of whether the callback has already been scheduled.',
);
}
scheduledDeferredCallback = callback;
},
- prepareForCommit() : void {
- },
-
- resetAfterCommit() : void {
- },
+ prepareForCommit(): void {},
+ resetAfterCommit(): void {},
});
var rootContainers = new Map();
@@ -186,8 +213,7 @@ var roots = new Map();
var DEFAULT_ROOT_ID = '<default>';
var ReactNoop = {
-
- getChildren(rootID : string = DEFAULT_ROOT_ID) {
+ getChildren(rootID: string = DEFAULT_ROOT_ID) {
const container = rootContainers.get(rootID);
if (container) {
return container.children;
@@ -197,14 +223,18 @@ var ReactNoop = {
},
// Shortcut for testing a single root
- render(element : ReactElement<any>, callback: ?Function) {
+ render(element: ReactElement<any>, callback: ?Function) {
ReactNoop.renderToRootWithID(element, DEFAULT_ROOT_ID, callback);
},
- renderToRootWithID(element : ReactElement<any>, rootID : string, callback : ?Function) {
+ renderToRootWithID(
+ element: ReactElement<any>,
+ rootID: string,
+ callback: ?Function,
+ ) {
let root = roots.get(rootID);
if (!root) {
- const container = { rootID: rootID, children: [] };
+ const container = {rootID: rootID, children: []};
rootContainers.set(rootID, container);
root = NoopRenderer.createContainer(container);
roots.set(rootID, root);
@@ -212,7 +242,7 @@ var ReactNoop = {
NoopRenderer.updateContainer(element, root, null, callback);
},
- unmountRootWithID(rootID : string) {
+ unmountRootWithID(rootID: string) {
const root = roots.get(rootID);
if (root) {
NoopRenderer.updateContainer(null, root, null, () => {
@@ -222,12 +252,14 @@ var ReactNoop = {
}
},
- findInstance(componentOrElement : Element | ?ReactComponent<any, any, any>) : null | Instance | TextInstance {
+ findInstance(
+ componentOrElement: Element | ?ReactComponent<any, any, any>,
+ ): null | Instance | TextInstance {
if (componentOrElement == null) {
return null;
}
// Unsound duck typing.
- const component = (componentOrElement : any);
+ const component = (componentOrElement: any);
if (typeof component.id === 'number') {
return component;
}
@@ -244,7 +276,7 @@ var ReactNoop = {
cb();
},
- flushDeferredPri(timeout : number = Infinity) {
+ flushDeferredPri(timeout: number = Infinity) {
var cb = scheduledDeferredCallback;
if (cb === null) {
return;
@@ -279,7 +311,7 @@ var ReactNoop = {
syncUpdates: NoopRenderer.syncUpdates,
// Logs the current state of the tree.
- dumpTree(rootID : string = DEFAULT_ROOT_ID) {
+ dumpTree(rootID: string = DEFAULT_ROOT_ID) {
const root = roots.get(rootID);
const rootContainer = rootContainers.get(rootID);
if (!root || !rootContainer) {
@@ -306,15 +338,13 @@ var ReactNoop = {
}
}
}
- function logContainer(container : Container, depth) {
+ function logContainer(container: Container, depth) {
log(' '.repeat(depth) + '- [root#' + container.rootID + ']');
logHostInstances(container.children, depth + 1);
}
- function logUpdateQueue(updateQueue : UpdateQueue, depth) {
- log(
- ' '.repeat(depth + 1) + 'QUEUED UPDATES'
- );
+ function logUpdateQueue(updateQueue: UpdateQueue, depth) {
+ log(' '.repeat(depth + 1) + 'QUEUED UPDATES');
const firstUpdate = updateQueue.first;
if (!firstUpdate) {
return;
@@ -324,30 +354,34 @@ var ReactNoop = {
' '.repeat(depth + 1) + '~',
firstUpdate && firstUpdate.partialState,
firstUpdate.callback ? 'with callback' : '',
- '[' + firstUpdate.priorityLevel + ']'
+ '[' + firstUpdate.priorityLevel + ']',
);
var next;
- while (next = firstUpdate.next) {
+ while ((next = firstUpdate.next)) {
log(
' '.repeat(depth + 1) + '~',
next.partialState,
next.callback ? 'with callback' : '',
- '[' + firstUpdate.priorityLevel + ']'
+ '[' + firstUpdate.priorityLevel + ']',
);
}
}
- function logFiber(fiber : Fiber, depth) {
+ function logFiber(fiber: Fiber, depth) {
log(
- ' '.repeat(depth) + '- ' + (fiber.type ? fiber.type.name || fiber.type : '[root]'),
- '[' + fiber.pendingWorkPriority + (fiber.pendingProps ? '*' : '') + ']'
+ ' '.repeat(depth) +
+ '- ' +
+ (fiber.type ? fiber.type.name || fiber.type : '[root]'),
+ '[' + fiber.pendingWorkPriority + (fiber.pendingProps ? '*' : '') + ']',
);
if (fiber.updateQueue) {
logUpdateQueue(fiber.updateQueue, depth);
}
const childInProgress = fiber.progressedChild;
if (childInProgress && childInProgress !== fiber.child) {
- log(' '.repeat(depth + 1) + 'IN PROGRESS: ' + fiber.progressedPriority);
+ log(
+ ' '.repeat(depth + 1) + 'IN PROGRESS: ' + fiber.progressedPriority,
+ );
logFiber(childInProgress, depth + 1);
if (fiber.child) {
log(' '.repeat(depth + 1) + 'CURRENT');
@@ -371,7 +405,7 @@ var ReactNoop = {
console.log(...bufferedLog);
},
- simulateErrorInHostConfig(fn : () => void) {
+ simulateErrorInHostConfig(fn: () => void) {
failInBeginPhase = true;
try {
fn();
@@ -379,7 +413,6 @@ var ReactNoop = {
failInBeginPhase = false;
}
},
-
};
module.exports = ReactNoop;
diff --git a/src/renderers/shared/ReactDebugTool.js b/src/renderers/shared/ReactDebugTool.js
index 6a3781f947..b5ad9efeb9 100644
--- a/src/renderers/shared/ReactDebugTool.js
+++ b/src/renderers/shared/ReactDebugTool.js
@@ -20,22 +20,22 @@ var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var performanceNow = require('fbjs/lib/performanceNow');
var warning = require('fbjs/lib/warning');
-import type { ReactElement } from 'ReactElementType';
-import type { DebugID } from 'ReactInstanceType';
-import type { Operation } from 'ReactHostOperationHistoryHook';
+import type {ReactElement} from 'ReactElementType';
+import type {DebugID} from 'ReactInstanceType';
+import type {Operation} from 'ReactHostOperationHistoryHook';
type Hook = any;
type TimerType =
- 'ctor' |
- 'render' |
- 'componentWillMount' |
- 'componentWillUnmount' |
- 'componentWillReceiveProps' |
- 'shouldComponentUpdate' |
- 'componentWillUpdate' |
- 'componentDidUpdate' |
- 'componentDidMount';
+ | 'ctor'
+ | 'render'
+ | 'componentWillMount'
+ | 'componentWillUnmount'
+ | 'componentWillReceiveProps'
+ | 'shouldComponentUpdate'
+ | 'componentWillUpdate'
+ | 'componentDidUpdate'
+ | 'componentDidMount';
type Measurement = {
timerType: TimerType,
@@ -51,7 +51,7 @@ type TreeSnapshot = {
childIDs: Array<DebugID>,
ownerID: DebugID,
parentID: DebugID,
- }
+ },
};
type HistoryItem = {
@@ -78,7 +78,7 @@ if (__DEV__) {
didHookThrowForEvent[event],
'Exception thrown by hook while handling %s: %s',
event,
- e + '\n' + e.stack
+ e + '\n' + e.stack,
);
didHookThrowForEvent[event] = true;
}
@@ -113,22 +113,25 @@ if (__DEV__) {
};
const getTreeSnapshot = function(registeredIDs) {
- return registeredIDs.reduce((tree, id) => {
- var ownerID = ReactComponentTreeHook.getOwnerID(id);
- var parentID = ReactComponentTreeHook.getParentID(id);
- tree[id] = {
- displayName: ReactComponentTreeHook.getDisplayName(id),
- text: ReactComponentTreeHook.getText(id),
- updateCount: ReactComponentTreeHook.getUpdateCount(id),
- childIDs: ReactComponentTreeHook.getChildIDs(id),
- // Text nodes don't have owners but this is close enough.
- ownerID: ownerID ||
- parentID && ReactComponentTreeHook.getOwnerID(parentID) ||
- 0,
- parentID,
- };
- return tree;
- }, {});
+ return registeredIDs.reduce(
+ (tree, id) => {
+ var ownerID = ReactComponentTreeHook.getOwnerID(id);
+ var parentID = ReactComponentTreeHook.getParentID(id);
+ tree[id] = {
+ displayName: ReactComponentTreeHook.getDisplayName(id),
+ text: ReactComponentTreeHook.getText(id),
+ updateCount: ReactComponentTreeHook.getUpdateCount(id),
+ childIDs: ReactComponentTreeHook.getChildIDs(id),
+ // Text nodes don't have owners but this is close enough.
+ ownerID: ownerID ||
+ (parentID && ReactComponentTreeHook.getOwnerID(parentID)) ||
+ 0,
+ parentID,
+ };
+ return tree;
+ },
+ {},
+ );
};
const resetMeasurements = function() {
@@ -175,11 +178,11 @@ if (__DEV__) {
warning(
false,
'There is an internal error in the React performance measurement code.' +
- '\n\nDid not expect %s timer to start while %s timer is still in ' +
- 'progress for %s instance.',
+ '\n\nDid not expect %s timer to start while %s timer is still in ' +
+ 'progress for %s instance.',
timerType,
currentTimerType || 'no',
- (debugID === currentTimerDebugID) ? 'the same' : 'another'
+ debugID === currentTimerDebugID ? 'the same' : 'another',
);
lifeCycleTimerHasWarned = true;
}
@@ -197,11 +200,11 @@ if (__DEV__) {
warning(
false,
'There is an internal error in the React performance measurement code. ' +
- 'We did not expect %s timer to stop while %s timer is still in ' +
- 'progress for %s instance. Please report this as a bug in React.',
+ 'We did not expect %s timer to stop while %s timer is still in ' +
+ 'progress for %s instance. Please report this as a bug in React.',
timerType,
currentTimerType || 'no',
- (debugID === currentTimerDebugID) ? 'the same' : 'another'
+ debugID === currentTimerDebugID ? 'the same' : 'another',
);
lifeCycleTimerHasWarned = true;
}
@@ -209,7 +212,9 @@ if (__DEV__) {
currentFlushMeasurements.push({
timerType,
instanceID: debugID,
- duration: performanceNow() - currentTimerStartTime - currentTimerNestedFlushDuration,
+ duration: performanceNow() -
+ currentTimerStartTime -
+ currentTimerNestedFlushDuration,
});
}
currentTimerStartTime = 0;
@@ -233,7 +238,12 @@ if (__DEV__) {
};
const resumeCurrentLifeCycleTimer = function() {
- var {startTime, nestedFlushStartTime, debugID, timerType} = lifeCycleTimerStack.pop();
+ var {
+ startTime,
+ nestedFlushStartTime,
+ debugID,
+ timerType,
+ } = lifeCycleTimerStack.pop();
var nestedFlushDuration = performanceNow() - nestedFlushStartTime;
currentTimerStartTime = startTime;
currentTimerNestedFlushDuration += nestedFlushDuration;
@@ -242,8 +252,7 @@ if (__DEV__) {
};
var lastMarkTimeStamp = 0;
- var canUsePerformanceMeasure: boolean =
- typeof performance !== 'undefined' &&
+ var canUsePerformanceMeasure: boolean = typeof performance !== 'undefined' &&
typeof performance.mark === 'function' &&
typeof performance.clearMarks === 'function' &&
typeof performance.measure === 'function' &&
@@ -280,7 +289,8 @@ if (__DEV__) {
}
var markName = `${debugID}::${markType}`;
- var displayName = ReactComponentTreeHook.getDisplayName(debugID) || 'Unknown';
+ var displayName = ReactComponentTreeHook.getDisplayName(debugID) ||
+ 'Unknown';
// Chrome has an issue of dropping markers recorded too fast:
// https://bugs.chromium.org/p/chromium/issues/detail?id=640652
@@ -377,7 +387,11 @@ if (__DEV__) {
childDebugIDs.forEach(checkDebugID);
emitEvent('onSetChildren', debugID, childDebugIDs);
},
- onBeforeMountComponent(debugID: DebugID, element: ReactElement, parentDebugID: DebugID): void {
+ onBeforeMountComponent(
+ debugID: DebugID,
+ element: ReactElement,
+ parentDebugID: DebugID,
+ ): void {
checkDebugID(debugID);
checkDebugID(parentDebugID, true);
emitEvent('onBeforeMountComponent', debugID, element, parentDebugID);
@@ -416,7 +430,7 @@ if (__DEV__) {
ReactDebugTool.addHook(ReactInvalidSetStateWarningHook);
ReactDebugTool.addHook(ReactComponentTreeHook);
var url = (ExecutionEnvironment.canUseDOM && window.location.href) || '';
- if ((/[?&]react_perf\b/).test(url)) {
+ if (/[?&]react_perf\b/.test(url)) {
ReactDebugTool.beginProfiling();
}
}
diff --git a/src/renderers/shared/ReactPerf.js b/src/renderers/shared/ReactPerf.js
index 17620aee1c..f7f8984c0b 100644
--- a/src/renderers/shared/ReactPerf.js
+++ b/src/renderers/shared/ReactPerf.js
@@ -16,7 +16,7 @@ var ReactDebugTool = require('ReactDebugTool');
var warning = require('fbjs/lib/warning');
var alreadyWarned = false;
-import type { FlushHistory } from 'ReactDebugTool';
+import type {FlushHistory} from 'ReactDebugTool';
function roundFloat(val, base = 2) {
var n = Math.pow(10, base);
@@ -37,7 +37,7 @@ function warnInProduction() {
if (typeof console !== 'undefined') {
console.error(
'ReactPerf is not supported in the production builds of React. ' +
- 'To collect measurements, please use the development build of React instead.'
+ 'To collect measurements, please use the development build of React instead.',
);
}
}
@@ -60,19 +60,24 @@ function getExclusive(flushHistory = getLastMeasurements()) {
var aggregatedStats = {};
var affectedIDs = {};
- function updateAggregatedStats(treeSnapshot, instanceID, timerType, applyUpdate) {
+ function updateAggregatedStats(
+ treeSnapshot,
+ instanceID,
+ timerType,
+ applyUpdate,
+ ) {
var {displayName} = treeSnapshot[instanceID];
var key = displayName;
var stats = aggregatedStats[key];
if (!stats) {
affectedIDs[key] = {};
- stats = aggregatedStats[key] = {
+ stats = (aggregatedStats[key] = {
key,
instanceCount: 0,
counts: {},
durations: {},
totalDuration: 0,
- };
+ });
}
if (!stats.durations[timerType]) {
stats.durations[timerType] = 0;
@@ -101,9 +106,7 @@ function getExclusive(flushHistory = getLastMeasurements()) {
...aggregatedStats[key],
instanceCount: Object.keys(affectedIDs[key]).length,
}))
- .sort((a, b) =>
- b.totalDuration - a.totalDuration
- );
+ .sort((a, b) => b.totalDuration - a.totalDuration);
}
function getInclusive(flushHistory = getLastMeasurements()) {
@@ -122,12 +125,12 @@ function getInclusive(flushHistory = getLastMeasurements()) {
var stats = aggregatedStats[key];
if (!stats) {
affectedIDs[key] = {};
- stats = aggregatedStats[key] = {
+ stats = (aggregatedStats[key] = {
key,
instanceCount: 0,
inclusiveRenderDuration: 0,
renderCount: 0,
- };
+ });
}
affectedIDs[key][instanceID] = true;
applyUpdate(stats);
@@ -174,9 +177,7 @@ function getInclusive(flushHistory = getLastMeasurements()) {
...aggregatedStats[key],
instanceCount: Object.keys(affectedIDs[key]).length,
}))
- .sort((a, b) =>
- b.inclusiveRenderDuration - a.inclusiveRenderDuration
- );
+ .sort((a, b) => b.inclusiveRenderDuration - a.inclusiveRenderDuration);
}
function getWasted(flushHistory = getLastMeasurements()) {
@@ -195,12 +196,12 @@ function getWasted(flushHistory = getLastMeasurements()) {
var stats = aggregatedStats[key];
if (!stats) {
affectedIDs[key] = {};
- stats = aggregatedStats[key] = {
+ stats = (aggregatedStats[key] = {
key,
instanceCount: 0,
inclusiveRenderDuration: 0,
renderCount: 0,
- };
+ });
}
affectedIDs[key][instanceID] = true;
applyUpdate(stats);
@@ -240,7 +241,7 @@ function getWasted(flushHistory = getLastMeasurements()) {
// If there was a DOM update below this component, or it has just been
// mounted, its render() is not considered wasted.
- var { updateCount } = treeSnapshot[instanceID];
+ var {updateCount} = treeSnapshot[instanceID];
if (isDefinitelyNotWastedByID[instanceID] || updateCount === 0) {
return;
}
@@ -254,8 +255,7 @@ function getWasted(flushHistory = getLastMeasurements()) {
while (nextParentID) {
// Any parents rendered during this batch are considered wasted
// unless we previously marked them as dirty.
- var isWasted =
- renderedCompositeIDs[nextParentID] &&
+ var isWasted = renderedCompositeIDs[nextParentID] &&
!isDefinitelyNotWastedByID[nextParentID];
if (isWasted) {
updateAggregatedStats(treeSnapshot, nextParentID, stats => {
@@ -272,9 +272,7 @@ function getWasted(flushHistory = getLastMeasurements()) {
...aggregatedStats[key],
instanceCount: Object.keys(affectedIDs[key]).length,
}))
- .sort((a, b) =>
- b.inclusiveRenderDuration - a.inclusiveRenderDuration
- );
+ .sort((a, b) => b.inclusiveRenderDuration - a.inclusiveRenderDuration);
}
function getOperations(flushHistory = getLastMeasurements()) {
@@ -317,13 +315,13 @@ function printExclusive(flushHistory?: FlushHistory) {
var renderCount = item.counts.render || 0;
var renderDuration = item.durations.render || 0;
return {
- 'Component': key,
+ Component: key,
'Total time (ms)': roundFloat(totalDuration),
'Instance count': instanceCount,
'Total render time (ms)': roundFloat(renderDuration),
- 'Average render time (ms)': renderCount ?
- roundFloat(renderDuration / renderCount) :
- undefined,
+ 'Average render time (ms)': renderCount
+ ? roundFloat(renderDuration / renderCount)
+ : undefined,
'Render count': renderCount,
'Total lifecycle time (ms)': roundFloat(totalDuration - renderDuration),
};
@@ -378,10 +376,10 @@ function printOperations(flushHistory?: FlushHistory) {
var stats = getOperations(flushHistory);
var table = stats.map(stat => ({
'Owner > Node': stat.key,
- 'Operation': stat.type,
- 'Payload': typeof stat.payload === 'object' ?
- JSON.stringify(stat.payload) :
- stat.payload,
+ Operation: stat.type,
+ Payload: typeof stat.payload === 'object'
+ ? JSON.stringify(stat.payload)
+ : stat.payload,
'Flush index': stat.flushIndex,
'Owner Component ID': stat.ownerID,
'DOM Component ID': stat.instanceID,
@@ -394,7 +392,7 @@ function printDOM(measurements: FlushHistory) {
warning(
warnedAboutPrintDOM,
'`ReactPerf.printDOM(...)` is deprecated. Use ' +
- '`ReactPerf.printOperations(...)` instead.'
+ '`ReactPerf.printOperations(...)` instead.',
);
warnedAboutPrintDOM = true;
return printOperations(measurements);
@@ -405,7 +403,7 @@ function getMeasurementsSummaryMap(measurements: FlushHistory) {
warning(
warnedAboutGetMeasurementsSummaryMap,
'`ReactPerf.getMeasurementsSummaryMap(...)` is deprecated. Use ' +
- '`ReactPerf.getWasted(...)` instead.'
+ '`ReactPerf.getWasted(...)` instead.',
);
warnedAboutGetMeasurementsSummaryMap = true;
return getWasted(measurements);
diff --git a/src/renderers/shared/__tests__/ReactDebugTool-test.js b/src/renderers/shared/__tests__/ReactDebugTool-test.js
index f356127c84..3082b9eab9 100644
--- a/src/renderers/shared/__tests__/ReactDebugTool-test.js
+++ b/src/renderers/shared/__tests__/ReactDebugTool-test.js
@@ -65,8 +65,7 @@ describe('ReactDebugTool', () => {
ReactDebugTool.onTestEvent();
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
- 'Exception thrown by hook while handling ' +
- 'onTestEvent: Error: Hi.'
+ 'Exception thrown by hook while handling ' + 'onTestEvent: Error: Hi.',
);
ReactDebugTool.onTestEvent();
diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index 0d51f03db6..9c8c416abb 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -12,12 +12,12 @@
'use strict';
-import type { ReactElement } from 'ReactElementType';
-import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';
-import type { ReactPortal } from 'ReactPortal';
-import type { Fiber } from 'ReactFiber';
-import type { ReactInstance } from 'ReactInstanceType';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {ReactElement} from 'ReactElementType';
+import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
+import type {ReactPortal} from 'ReactPortal';
+import type {Fiber} from 'ReactFiber';
+import type {ReactInstance} from 'ReactInstanceType';
+import type {PriorityLevel} from 'ReactPriorityLevel';
var REACT_ELEMENT_TYPE = require('ReactElementSymbol');
var {
@@ -39,7 +39,7 @@ var ReactFeatureFlags = require('ReactFeatureFlags');
var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
if (__DEV__) {
- var { getCurrentFiberStackAddendum } = require('ReactDebugCurrentFiber');
+ var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber');
var getComponentName = require('getComponentName');
var warning = require('fbjs/lib/warning');
var didWarnAboutMaps = false;
@@ -77,27 +77,34 @@ function coerceRef(current: Fiber | null, element: ReactElement) {
let mixedRef = element.ref;
if (mixedRef !== null && typeof mixedRef !== 'function') {
if (element._owner) {
- const owner : ?(Fiber | ReactInstance) = (element._owner : any);
+ const owner: ?(Fiber | ReactInstance) = (element._owner: any);
let inst;
if (owner) {
if (typeof owner.tag === 'number') {
- const ownerFiber = ((owner : any) : Fiber);
- invariant(ownerFiber.tag === ClassComponent, 'Stateless function components cannot have refs.');
+ const ownerFiber = ((owner: any): Fiber);
+ invariant(
+ ownerFiber.tag === ClassComponent,
+ 'Stateless function components cannot have refs.',
+ );
inst = ownerFiber.stateNode;
} else {
// Stack
- inst = (owner : any).getPublicInstance();
+ inst = (owner: any).getPublicInstance();
}
}
invariant(
inst,
'Missing owner for string ref %s. This error is likely caused by a ' +
- 'bug in React. Please file an issue.',
- mixedRef
+ 'bug in React. Please file an issue.',
+ mixedRef,
);
const stringRef = '' + mixedRef;
// Check if previous string ref matches new string ref
- if (current !== null && current.ref !== null && current.ref._stringRef === stringRef) {
+ if (
+ current !== null &&
+ current.ref !== null &&
+ current.ref._stringRef === stringRef
+ ) {
return current.ref;
}
const ref = function(value) {
@@ -115,17 +122,16 @@ function coerceRef(current: Fiber | null, element: ReactElement) {
return mixedRef;
}
-function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
+function throwOnInvalidObjectType(returnFiber: Fiber, newChild: Object) {
if (returnFiber.type !== 'textarea') {
let addendum = '';
if (__DEV__) {
- addendum =
- ' If you meant to render a collection of children, use an array ' +
+ addendum = ' If you meant to render a collection of children, use an array ' +
'instead or wrap the object using createFragment(object) from the ' +
'React add-ons.';
const owner = ReactCurrentOwner.owner || returnFiber._debugOwner;
if (owner && typeof owner.tag === 'number') {
- const name = getComponentName((owner : any));
+ const name = getComponentName((owner: any));
if (name) {
addendum += '\n\nCheck the render method of `' + name + '`.';
}
@@ -134,10 +140,10 @@ function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
invariant(
false,
'Objects are not valid as a React child (found: %s).%s',
- Object.prototype.toString.call(newChild) === '[object Object]' ?
- 'object with keys {' + Object.keys(newChild).join(', ') + '}' :
- newChild,
- addendum
+ Object.prototype.toString.call(newChild) === '[object Object]'
+ ? 'object with keys {' + Object.keys(newChild).join(', ') + '}'
+ : newChild,
+ addendum,
);
}
}
@@ -147,11 +153,7 @@ function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
// a compiler or we can do it manually. Helpers that don't need this branching
// live outside of this function.
function ChildReconciler(shouldClone, shouldTrackSideEffects) {
-
- function deleteChild(
- returnFiber : Fiber,
- childToDelete : Fiber
- ) : void {
+ function deleteChild(returnFiber: Fiber, childToDelete: Fiber): void {
if (!shouldTrackSideEffects) {
// Noop.
return;
@@ -171,18 +173,16 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
last.nextEffect = childToDelete;
returnFiber.progressedLastDeletion = childToDelete;
} else {
- returnFiber.progressedFirstDeletion =
- returnFiber.progressedLastDeletion =
- childToDelete;
+ returnFiber.progressedFirstDeletion = (returnFiber.progressedLastDeletion = childToDelete);
}
childToDelete.nextEffect = null;
childToDelete.effectTag = Deletion;
}
function deleteRemainingChildren(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null
- ) : null {
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ ): null {
if (!shouldTrackSideEffects) {
// Noop.
return null;
@@ -199,13 +199,13 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function mapRemainingChildren(
- returnFiber : Fiber,
- currentFirstChild : Fiber
- ) : Map<string | number, Fiber> {
+ returnFiber: Fiber,
+ currentFirstChild: Fiber,
+ ): Map<string | number, Fiber> {
// Add the remaining children to a temporary map so that we can find them by
// keys quickly. Implicit (null) keys get added to this set with their index
// instead.
- const existingChildren : Map<string | number, Fiber> = new Map();
+ const existingChildren: Map<string | number, Fiber> = new Map();
let existingChild = currentFirstChild;
while (existingChild !== null) {
@@ -219,7 +219,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
return existingChildren;
}
- function useFiber(fiber : Fiber, priority : PriorityLevel) : Fiber {
+ function useFiber(fiber: Fiber, priority: PriorityLevel): Fiber {
// We currently set sibling to null and index to 0 here because it is easy
// to forget to do before returning it. E.g. for the single child case.
if (shouldClone) {
@@ -239,7 +239,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
}
- function placeChild(newFiber : Fiber, lastPlacedIndex : number, newIndex : number) : number {
+ function placeChild(
+ newFiber: Fiber,
+ lastPlacedIndex: number,
+ newIndex: number,
+ ): number {
newFiber.index = newIndex;
if (!shouldTrackSideEffects) {
// Noop.
@@ -263,7 +267,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
}
- function placeSingleChild(newFiber : Fiber) : Fiber {
+ function placeSingleChild(newFiber: Fiber): Fiber {
// This is simpler for the single child case. We only need to do a
// placement for inserting new children.
if (shouldTrackSideEffects && newFiber.alternate === null) {
@@ -273,10 +277,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function updateTextNode(
- returnFiber : Fiber,
- current : Fiber | null,
- textContent : string,
- priority : PriorityLevel
+ returnFiber: Fiber,
+ current: Fiber | null,
+ textContent: string,
+ priority: PriorityLevel,
) {
if (current === null || current.tag !== HostText) {
// Insert
@@ -293,11 +297,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function updateElement(
- returnFiber : Fiber,
- current : Fiber | null,
- element : ReactElement,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ current: Fiber | null,
+ element: ReactElement,
+ priority: PriorityLevel,
+ ): Fiber {
if (current === null || current.type !== element.type) {
// Insert
const created = createFiberFromElement(element, priority);
@@ -319,11 +323,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function updateCoroutine(
- returnFiber : Fiber,
- current : Fiber | null,
- coroutine : ReactCoroutine,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ current: Fiber | null,
+ coroutine: ReactCoroutine,
+ priority: PriorityLevel,
+ ): Fiber {
// TODO: Should this also compare handler to determine whether to reuse?
if (current === null || current.tag !== CoroutineComponent) {
// Insert
@@ -340,11 +344,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function updateYield(
- returnFiber : Fiber,
- current : Fiber | null,
- yieldNode : ReactYield,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ current: Fiber | null,
+ yieldNode: ReactYield,
+ priority: PriorityLevel,
+ ): Fiber {
if (current === null || current.tag !== YieldComponent) {
// Insert
const created = createFiberFromYield(yieldNode, priority);
@@ -361,11 +365,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function updatePortal(
- returnFiber : Fiber,
- current : Fiber | null,
- portal : ReactPortal,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ current: Fiber | null,
+ portal: ReactPortal,
+ priority: PriorityLevel,
+ ): Fiber {
if (
current === null ||
current.tag !== HostPortal ||
@@ -386,11 +390,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function updateFragment(
- returnFiber : Fiber,
- current : Fiber | null,
- fragment : Iterable<*>,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ current: Fiber | null,
+ fragment: Iterable<*>,
+ priority: PriorityLevel,
+ ): Fiber {
if (current === null || current.tag !== Fragment) {
// Insert
const created = createFiberFromFragment(fragment, priority);
@@ -406,10 +410,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function createChild(
- returnFiber : Fiber,
- newChild : any,
- priority : PriorityLevel
- ) : Fiber | null {
+ returnFiber: Fiber,
+ newChild: any,
+ priority: PriorityLevel,
+ ): Fiber | null {
if (typeof newChild === 'string' || typeof newChild === 'number') {
// Text nodes doesn't have keys. If the previous node is implicitly keyed
// we can continue to replace it without aborting even if it is not a text
@@ -461,11 +465,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function updateSlot(
- returnFiber : Fiber,
- oldFiber : Fiber | null,
- newChild : any,
- priority : PriorityLevel
- ) : Fiber | null {
+ returnFiber: Fiber,
+ oldFiber: Fiber | null,
+ newChild: any,
+ priority: PriorityLevel,
+ ): Fiber | null {
// Update the fiber if the keys match, otherwise return null.
const key = oldFiber !== null ? oldFiber.key : null;
@@ -534,13 +538,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function updateFromMap(
- existingChildren : Map<string | number, Fiber>,
- returnFiber : Fiber,
- newIdx : number,
- newChild : any,
- priority : PriorityLevel
- ) : Fiber | null {
-
+ existingChildren: Map<string | number, Fiber>,
+ returnFiber: Fiber,
+ newIdx: number,
+ newChild: any,
+ priority: PriorityLevel,
+ ): Fiber | null {
if (typeof newChild === 'string' || typeof newChild === 'number') {
// Text nodes doesn't have keys, so we neither have to check the old nor
// new node for the key. If both are text nodes, they match.
@@ -552,14 +555,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
switch (newChild.$$typeof) {
case REACT_ELEMENT_TYPE: {
const matchedFiber = existingChildren.get(
- newChild.key === null ? newIdx : newChild.key
+ newChild.key === null ? newIdx : newChild.key,
) || null;
return updateElement(returnFiber, matchedFiber, newChild, priority);
}
case REACT_COROUTINE_TYPE: {
const matchedFiber = existingChildren.get(
- newChild.key === null ? newIdx : newChild.key
+ newChild.key === null ? newIdx : newChild.key,
) || null;
return updateCoroutine(returnFiber, matchedFiber, newChild, priority);
}
@@ -573,7 +576,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
case REACT_PORTAL_TYPE: {
const matchedFiber = existingChildren.get(
- newChild.key === null ? newIdx : newChild.key
+ newChild.key === null ? newIdx : newChild.key,
) || null;
return updatePortal(returnFiber, matchedFiber, newChild, priority);
}
@@ -591,9 +594,9 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function warnOnDuplicateKey(
- child : mixed,
- knownKeys : Set<string> | null
- ) : Set<string> | null {
+ child: mixed,
+ knownKeys: Set<string> | null,
+ ): Set<string> | null {
if (__DEV__) {
if (typeof child !== 'object' || child === null) {
return knownKeys;
@@ -618,10 +621,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
warning(
false,
'Encountered two children with the same key, ' +
- '`%s`. Child keys must be unique; when two children share a key, ' +
- 'only the first child will be used.%s',
+ '`%s`. Child keys must be unique; when two children share a key, ' +
+ 'only the first child will be used.%s',
key,
- getCurrentFiberStackAddendum()
+ getCurrentFiberStackAddendum(),
);
break;
default:
@@ -632,11 +635,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function reconcileChildrenArray(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null,
- newChildren : Array<*>,
- priority : PriorityLevel) : Fiber | null {
-
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ newChildren: Array<*>,
+ priority: PriorityLevel,
+ ): Fiber | null {
// This algorithm can't optimize by searching from boths ends since we
// don't have backpointers on fibers. I'm trying to see how far we can get
// with that model. If it ends up not being worth the tradeoffs, we can
@@ -665,8 +668,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
}
- let resultingFirstChild : Fiber | null = null;
- let previousNewFiber : Fiber | null = null;
+ let resultingFirstChild: Fiber | null = null;
+ let previousNewFiber: Fiber | null = null;
let oldFiber = currentFirstChild;
let lastPlacedIndex = 0;
@@ -683,7 +686,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
returnFiber,
oldFiber,
newChildren[newIdx],
- priority
+ priority,
);
if (newFiber === null) {
// TODO: This breaks on empty slots like null children. That's
@@ -730,7 +733,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
const newFiber = createChild(
returnFiber,
newChildren[newIdx],
- priority
+ priority,
);
if (!newFiber) {
continue;
@@ -757,7 +760,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
returnFiber,
newIdx,
newChildren[newIdx],
- priority
+ priority,
);
if (newFiber) {
if (shouldTrackSideEffects) {
@@ -767,7 +770,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
// it from the child list so that we don't add it to the deletion
// list.
existingChildren.delete(
- newFiber.key === null ? newIdx : newFiber.key
+ newFiber.key === null ? newIdx : newFiber.key,
);
}
}
@@ -791,11 +794,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function reconcileChildrenIterator(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null,
- newChildrenIterable : Iterable<*>,
- priority : PriorityLevel) : Fiber | null {
-
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ newChildrenIterable: Iterable<*>,
+ priority: PriorityLevel,
+ ): Fiber | null {
// This is the same implementation as reconcileChildrenArray(),
// but using the iterator instead.
@@ -803,28 +806,30 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
invariant(
typeof iteratorFn === 'function',
'An object is not an iterable. This error is likely caused by a bug in ' +
- 'React. Please file an issue.'
+ 'React. Please file an issue.',
);
if (__DEV__) {
// Warn about using Maps as children
if (typeof newChildrenIterable.entries === 'function') {
- const possibleMap = (newChildrenIterable : any);
+ const possibleMap = (newChildrenIterable: any);
if (possibleMap.entries === iteratorFn) {
let mapsAsChildrenAddendum = '';
const owner = ReactCurrentOwner.owner || returnFiber._debugOwner;
if (owner && typeof owner.tag === 'number') {
- const mapsAsChildrenOwnerName = getComponentName((owner : any));
+ const mapsAsChildrenOwnerName = getComponentName((owner: any));
if (mapsAsChildrenOwnerName) {
- mapsAsChildrenAddendum = '\n\nCheck the render method of `' + mapsAsChildrenOwnerName + '`.';
+ mapsAsChildrenAddendum = '\n\nCheck the render method of `' +
+ mapsAsChildrenOwnerName +
+ '`.';
}
}
warning(
didWarnAboutMaps,
'Using Maps as children is unsupported and will likely yield ' +
- 'unexpected results. Convert it to a sequence/iterable of keyed ' +
- 'ReactElements instead.%s',
- mapsAsChildrenAddendum
+ 'unexpected results. Convert it to a sequence/iterable of keyed ' +
+ 'ReactElements instead.%s',
+ mapsAsChildrenAddendum,
);
didWarnAboutMaps = true;
}
@@ -844,13 +849,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
const newChildren = iteratorFn.call(newChildrenIterable);
- invariant(
- newChildren != null,
- 'An iterable object provided no iterator.',
- );
+ invariant(newChildren != null, 'An iterable object provided no iterator.');
- let resultingFirstChild : Fiber | null = null;
- let previousNewFiber : Fiber | null = null;
+ let resultingFirstChild: Fiber | null = null;
+ let previousNewFiber: Fiber | null = null;
let oldFiber = currentFirstChild;
let lastPlacedIndex = 0;
@@ -858,19 +860,18 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
let nextOldFiber = null;
let step = newChildren.next();
- for (; oldFiber !== null && !step.done; newIdx++, step = newChildren.next()) {
+ for (
+ ;
+ oldFiber !== null && !step.done;
+ newIdx++, (step = newChildren.next())
+ ) {
if (oldFiber.index > newIdx) {
nextOldFiber = oldFiber;
oldFiber = null;
} else {
nextOldFiber = oldFiber.sibling;
}
- const newFiber = updateSlot(
- returnFiber,
- oldFiber,
- step.value,
- priority
- );
+ const newFiber = updateSlot(returnFiber, oldFiber, step.value, priority);
if (newFiber === null) {
// TODO: This breaks on empty slots like null children. That's
// unfortunate because it triggers the slow path all the time. We need
@@ -912,12 +913,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
if (oldFiber === null) {
// If we don't have any more existing children we can choose a fast path
// since the rest will all be insertions.
- for (; !step.done; newIdx++, step = newChildren.next()) {
- const newFiber = createChild(
- returnFiber,
- step.value,
- priority
- );
+ for (; !step.done; newIdx++, (step = newChildren.next())) {
+ const newFiber = createChild(returnFiber, step.value, priority);
if (newFiber === null) {
continue;
}
@@ -937,13 +934,13 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
const existingChildren = mapRemainingChildren(returnFiber, oldFiber);
// Keep scanning and use the map to restore deleted items as moves.
- for (; !step.done; newIdx++, step = newChildren.next()) {
+ for (; !step.done; newIdx++, (step = newChildren.next())) {
const newFiber = updateFromMap(
existingChildren,
returnFiber,
newIdx,
step.value,
- priority
+ priority,
);
if (newFiber !== null) {
if (shouldTrackSideEffects) {
@@ -953,7 +950,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
// it from the child list so that we don't add it to the deletion
// list.
existingChildren.delete(
- newFiber.key === null ? newIdx : newFiber.key
+ newFiber.key === null ? newIdx : newFiber.key,
);
}
}
@@ -977,11 +974,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function reconcileSingleTextNode(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null,
- textContent : string,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ textContent: string,
+ priority: PriorityLevel,
+ ): Fiber {
// There's no need to check for keys on text nodes since we don't have a
// way to define them.
if (currentFirstChild !== null && currentFirstChild.tag === HostText) {
@@ -1002,11 +999,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function reconcileSingleElement(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null,
- element : ReactElement,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ element: ReactElement,
+ priority: PriorityLevel,
+ ): Fiber {
const key = element.key;
let child = currentFirstChild;
while (child !== null) {
@@ -1041,11 +1038,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function reconcileSingleCoroutine(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null,
- coroutine : ReactCoroutine,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ coroutine: ReactCoroutine,
+ priority: PriorityLevel,
+ ): Fiber {
const key = coroutine.key;
let child = currentFirstChild;
while (child !== null) {
@@ -1074,11 +1071,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function reconcileSingleYield(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null,
- yieldNode : ReactYield,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ yieldNode: ReactYield,
+ priority: PriorityLevel,
+ ): Fiber {
// There's no need to check for keys on yields since they're stateless.
let child = currentFirstChild;
if (child !== null) {
@@ -1100,11 +1097,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
function reconcileSinglePortal(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null,
- portal : ReactPortal,
- priority : PriorityLevel
- ) : Fiber {
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ portal: ReactPortal,
+ priority: PriorityLevel,
+ ): Fiber {
const key = portal.key;
let child = currentFirstChild;
while (child !== null) {
@@ -1140,11 +1137,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
// itself. They will be added to the side-effect list as we pass through the
// children and the parent.
function reconcileChildFibers(
- returnFiber : Fiber,
- currentFirstChild : Fiber | null,
- newChild : any,
- priority : PriorityLevel
- ) : Fiber | null {
+ returnFiber: Fiber,
+ currentFirstChild: Fiber | null,
+ newChild: any,
+ priority: PriorityLevel,
+ ): Fiber | null {
// This function is not recursive.
// If the top level item is an array, we treat it as a set of children,
// not as a fragment. Nested arrays on the other hand will be treated as
@@ -1160,54 +1157,66 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
if (disableNewFiberFeatures) {
switch (newChild.$$typeof) {
case REACT_ELEMENT_TYPE:
- return placeSingleChild(reconcileSingleElement(
- returnFiber,
- currentFirstChild,
- newChild,
- priority
- ));
+ return placeSingleChild(
+ reconcileSingleElement(
+ returnFiber,
+ currentFirstChild,
+ newChild,
+ priority,
+ ),
+ );
case REACT_PORTAL_TYPE:
- return placeSingleChild(reconcileSinglePortal(
- returnFiber,
- currentFirstChild,
- newChild,
- priority
- ));
+ return placeSingleChild(
+ reconcileSinglePortal(
+ returnFiber,
+ currentFirstChild,
+ newChild,
+ priority,
+ ),
+ );
}
} else {
switch (newChild.$$typeof) {
case REACT_ELEMENT_TYPE:
- return placeSingleChild(reconcileSingleElement(
- returnFiber,
- currentFirstChild,
- newChild,
- priority
- ));
+ return placeSingleChild(
+ reconcileSingleElement(
+ returnFiber,
+ currentFirstChild,
+ newChild,
+ priority,
+ ),
+ );
case REACT_COROUTINE_TYPE:
- return placeSingleChild(reconcileSingleCoroutine(
- returnFiber,
- currentFirstChild,
- newChild,
- priority
- ));
+ return placeSingleChild(
+ reconcileSingleCoroutine(
+ returnFiber,
+ currentFirstChild,
+ newChild,
+ priority,
+ ),
+ );
case REACT_YIELD_TYPE:
- return placeSingleChild(reconcileSingleYield(
- returnFiber,
- currentFirstChild,
- newChild,
- priority
- ));
+ return placeSingleChild(
+ reconcileSingleYield(
+ returnFiber,
+ currentFirstChild,
+ newChild,
+ priority,
+ ),
+ );
case REACT_PORTAL_TYPE:
- return placeSingleChild(reconcileSinglePortal(
- returnFiber,
- currentFirstChild,
- newChild,
- priority
- ));
+ return placeSingleChild(
+ reconcileSinglePortal(
+ returnFiber,
+ currentFirstChild,
+ newChild,
+ priority,
+ ),
+ );
}
}
}
@@ -1219,7 +1228,9 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
case ClassComponent: {
if (__DEV__) {
const instance = returnFiber.stateNode;
- if (instance.render._isMockFunction && typeof newChild === 'undefined') {
+ if (
+ instance.render._isMockFunction && typeof newChild === 'undefined'
+ ) {
// We allow auto-mocks to proceed as if they're
// returning null.
break;
@@ -1229,8 +1240,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
invariant(
newChild === null || newChild === false,
'%s.render(): A valid React element (or null) must be returned. ' +
- 'You may have returned undefined, an array or some other ' +
- 'invalid object.',
+ 'You may have returned undefined, an array or some other ' +
+ 'invalid object.',
Component.displayName || Component.name || 'Component',
);
break;
@@ -1241,8 +1252,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
invariant(
newChild === null || newChild === false,
'%s(...): A valid React element (or null) must be returned. ' +
- 'You may have returned undefined, an array or some other ' +
- 'invalid object.',
+ 'You may have returned undefined, an array or some other ' +
+ 'invalid object.',
Component.displayName || Component.name || 'Component',
);
break;
@@ -1251,12 +1262,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
}
if (typeof newChild === 'string' || typeof newChild === 'number') {
- return placeSingleChild(reconcileSingleTextNode(
- returnFiber,
- currentFirstChild,
- '' + newChild,
- priority
- ));
+ return placeSingleChild(
+ reconcileSingleTextNode(
+ returnFiber,
+ currentFirstChild,
+ '' + newChild,
+ priority,
+ ),
+ );
}
if (isArray(newChild)) {
@@ -1264,7 +1277,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
returnFiber,
currentFirstChild,
newChild,
- priority
+ priority,
);
}
@@ -1273,7 +1286,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
returnFiber,
currentFirstChild,
newChild,
- priority
+ priority,
);
}
@@ -1303,9 +1316,9 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
invariant(
false,
'%s(...): Nothing was returned from render. This usually means a ' +
- 'return statement is missing. Or, to render nothing, ' +
- 'return null.',
- Component.displayName || Component.name || 'Component'
+ 'return statement is missing. Or, to render nothing, ' +
+ 'return null.',
+ Component.displayName || Component.name || 'Component',
);
}
}
@@ -1324,7 +1337,10 @@ exports.reconcileChildFibersInPlace = ChildReconciler(false, true);
exports.mountChildFibersInPlace = ChildReconciler(false, false);
-exports.cloneChildFibers = function(current : Fiber | null, workInProgress : Fiber) : void {
+exports.cloneChildFibers = function(
+ current: Fiber | null,
+ workInProgress: Fiber,
+): void {
if (!workInProgress.child) {
return;
}
@@ -1346,10 +1362,10 @@ exports.cloneChildFibers = function(current : Fiber | null, workInProgress : Fib
newChild.return = workInProgress;
while (currentChild.sibling !== null) {
currentChild = currentChild.sibling;
- newChild = newChild.sibling = cloneFiber(
+ newChild = (newChild.sibling = cloneFiber(
currentChild,
- currentChild.pendingWorkPriority
- );
+ currentChild.pendingWorkPriority,
+ ));
newChild.return = workInProgress;
}
newChild.sibling = null;
diff --git a/src/renderers/shared/fiber/ReactDebugCurrentFiber.js b/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
index 539c19e085..8e6f9c727c 100644
--- a/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
+++ b/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
@@ -12,16 +12,18 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
type LifeCyclePhase = 'render' | 'getChildContext';
if (__DEV__) {
var getComponentName = require('getComponentName');
- var { getStackAddendumByWorkInProgressFiber } = require('ReactFiberComponentTreeHook');
+ var {
+ getStackAddendumByWorkInProgressFiber,
+ } = require('ReactFiberComponentTreeHook');
}
-function getCurrentFiberOwnerName() : string | null {
+function getCurrentFiberOwnerName(): string | null {
if (__DEV__) {
const fiber = ReactDebugCurrentFiber.current;
if (fiber === null) {
@@ -34,7 +36,7 @@ function getCurrentFiberOwnerName() : string | null {
return null;
}
-function getCurrentFiberStackAddendum() : string | null {
+function getCurrentFiberStackAddendum(): string | null {
if (__DEV__) {
const fiber = ReactDebugCurrentFiber.current;
if (fiber === null) {
@@ -48,8 +50,8 @@ function getCurrentFiberStackAddendum() : string | null {
}
var ReactDebugCurrentFiber = {
- current: (null : Fiber | null),
- phase: (null : LifeCyclePhase | null),
+ current: (null: Fiber | null),
+ phase: (null: LifeCyclePhase | null),
getCurrentFiberOwnerName,
getCurrentFiberStackAddendum,
diff --git a/src/renderers/shared/fiber/ReactDebugFiberPerf.js b/src/renderers/shared/fiber/ReactDebugFiberPerf.js
index 0469cb9872..331430cf3a 100644
--- a/src/renderers/shared/fiber/ReactDebugFiberPerf.js
+++ b/src/renderers/shared/fiber/ReactDebugFiberPerf.js
@@ -10,17 +10,17 @@
* @flow
*/
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
type MeasurementPhase =
- 'componentWillMount' |
- 'componentWillUnmount' |
- 'componentWillReceiveProps' |
- 'shouldComponentUpdate' |
- 'componentWillUpdate' |
- 'componentDidUpdate' |
- 'componentDidMount' |
- 'getChildContext';
+ | 'componentWillMount'
+ | 'componentWillUnmount'
+ | 'componentWillReceiveProps'
+ | 'shouldComponentUpdate'
+ | 'componentWillUpdate'
+ | 'componentDidUpdate'
+ | 'componentDidMount'
+ | 'getChildContext';
// Trust the developer to only use this with a __DEV__ check
let ReactDebugFiberPerf = ((null: any): typeof ReactDebugFiberPerf);
@@ -41,8 +41,7 @@ if (__DEV__) {
// Longer prefixes are hard to read in DevTools.
const reactEmoji = '\u269B';
const warningEmoji = '\u26D4';
- const supportsUserTiming =
- typeof performance !== 'undefined' &&
+ const supportsUserTiming = typeof performance !== 'undefined' &&
typeof performance.mark === 'function' &&
typeof performance.clearMarks === 'function' &&
typeof performance.measure === 'function' &&
@@ -50,44 +49,44 @@ if (__DEV__) {
// Keep track of current fiber so that we know the path to unwind on pause.
// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
- let currentFiber : Fiber | null = null;
+ let currentFiber: Fiber | null = null;
// If we're in the middle of user code, which fiber and method is it?
// Reusing `currentFiber` would be confusing for this because user code fiber
// can change during commit phase too, but we don't need to unwind it (since
// lifecycles in the commit phase don't resemble a tree).
- let currentPhase : MeasurementPhase | null = null;
- let currentPhaseFiber : Fiber | null = null;
+ let currentPhase: MeasurementPhase | null = null;
+ let currentPhaseFiber: Fiber | null = null;
// Did lifecycle hook schedule an update? This is often a performance problem,
// so we will keep track of it, and include it in the report.
// Track commits caused by cascading updates.
- let isCommitting : boolean = false;
- let hasScheduledUpdateInCurrentCommit : boolean = false;
- let hasScheduledUpdateInCurrentPhase : boolean = false;
- let commitCountInCurrentWorkLoop : number = 0;
- let effectCountInCurrentCommit : number = 0;
+ let isCommitting: boolean = false;
+ let hasScheduledUpdateInCurrentCommit: boolean = false;
+ let hasScheduledUpdateInCurrentPhase: boolean = false;
+ let commitCountInCurrentWorkLoop: number = 0;
+ let effectCountInCurrentCommit: number = 0;
// During commits, we only show a measurement once per method name
// to avoid stretch the commit phase with measurement overhead.
- const labelsInCurrentCommit : Set<string> = new Set();
+ const labelsInCurrentCommit: Set<string> = new Set();
- const formatMarkName = (markName : string) => {
+ const formatMarkName = (markName: string) => {
return `${reactEmoji} ${markName}`;
};
- const formatLabel = (label : string, warning : string | null) => {
+ const formatLabel = (label: string, warning: string | null) => {
const prefix = warning ? `${warningEmoji} ` : `${reactEmoji} `;
const suffix = warning ? ` Warning: ${warning}` : '';
return `${prefix}${label}${suffix}`;
};
- const beginMark = (markName : string) => {
+ const beginMark = (markName: string) => {
performance.mark(formatMarkName(markName));
};
- const clearMark = (markName : string) => {
+ const clearMark = (markName: string) => {
performance.clearMarks(formatMarkName(markName));
};
- const endMark = (label : string, markName : string, warning : string | null) => {
+ const endMark = (label: string, markName: string, warning: string | null) => {
const formattedMarkName = formatMarkName(markName);
const formattedLabel = formatLabel(label, warning);
try {
@@ -102,14 +101,14 @@ if (__DEV__) {
performance.clearMeasures(formattedLabel);
};
- const getFiberMarkName = (label : string, debugID : number) => {
+ const getFiberMarkName = (label: string, debugID: number) => {
return `${label} (#${debugID})`;
};
const getFiberLabel = (
- componentName : string,
- isMounted : boolean,
- phase : MeasurementPhase | null,
+ componentName: string,
+ isMounted: boolean,
+ phase: MeasurementPhase | null,
) => {
if (phase === null) {
// These are composite component total time measurements.
@@ -121,11 +120,11 @@ if (__DEV__) {
};
const beginFiberMark = (
- fiber : Fiber,
- phase : MeasurementPhase | null,
- ) : boolean => {
+ fiber: Fiber,
+ phase: MeasurementPhase | null,
+ ): boolean => {
const componentName = getComponentName(fiber) || 'Unknown';
- const debugID = ((fiber._debugID : any) : number);
+ const debugID = ((fiber._debugID: any): number);
const isMounted = fiber.alternate !== null;
const label = getFiberLabel(componentName, isMounted, phase);
@@ -142,9 +141,9 @@ if (__DEV__) {
return true;
};
- const clearFiberMark = (fiber : Fiber, phase : MeasurementPhase | null) => {
+ const clearFiberMark = (fiber: Fiber, phase: MeasurementPhase | null) => {
const componentName = getComponentName(fiber) || 'Unknown';
- const debugID = ((fiber._debugID : any) : number);
+ const debugID = ((fiber._debugID: any): number);
const isMounted = fiber.alternate !== null;
const label = getFiberLabel(componentName, isMounted, phase);
const markName = getFiberMarkName(label, debugID);
@@ -152,19 +151,19 @@ if (__DEV__) {
};
const endFiberMark = (
- fiber : Fiber,
- phase : MeasurementPhase | null,
- warning : string | null,
+ fiber: Fiber,
+ phase: MeasurementPhase | null,
+ warning: string | null,
) => {
const componentName = getComponentName(fiber) || 'Unknown';
- const debugID = ((fiber._debugID : any) : number);
+ const debugID = ((fiber._debugID: any): number);
const isMounted = fiber.alternate !== null;
const label = getFiberLabel(componentName, isMounted, phase);
const markName = getFiberMarkName(label, debugID);
endMark(label, markName, warning);
};
- const shouldIgnoreFiber = (fiber : Fiber) : boolean => {
+ const shouldIgnoreFiber = (fiber: Fiber): boolean => {
// Host components should be skipped in the timeline.
// We could check typeof fiber.type, but does this work with RN?
switch (fiber.tag) {
@@ -201,7 +200,7 @@ if (__DEV__) {
}
};
- const resumeTimersRecursively = (fiber : Fiber) => {
+ const resumeTimersRecursively = (fiber: Fiber) => {
if (fiber.return !== null) {
resumeTimersRecursively(fiber.return);
}
@@ -218,11 +217,11 @@ if (__DEV__) {
};
ReactDebugFiberPerf = {
- recordEffect() : void {
+ recordEffect(): void {
effectCountInCurrentCommit++;
},
- recordScheduleUpdate() : void {
+ recordScheduleUpdate(): void {
if (isCommitting) {
hasScheduledUpdateInCurrentCommit = true;
}
@@ -235,7 +234,7 @@ if (__DEV__) {
}
},
- startWorkTimer(fiber : Fiber) : void {
+ startWorkTimer(fiber: Fiber): void {
if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
return;
}
@@ -247,7 +246,7 @@ if (__DEV__) {
fiber._debugIsCurrentlyTiming = true;
},
- cancelWorkTimer(fiber : Fiber) : void {
+ cancelWorkTimer(fiber: Fiber): void {
if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
return;
}
@@ -257,7 +256,7 @@ if (__DEV__) {
clearFiberMark(fiber, null);
},
- stopWorkTimer(fiber : Fiber) : void {
+ stopWorkTimer(fiber: Fiber): void {
if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
return;
}
@@ -270,10 +269,7 @@ if (__DEV__) {
endFiberMark(fiber, null, null);
},
- startPhaseTimer(
- fiber : Fiber,
- phase : MeasurementPhase,
- ) : void {
+ startPhaseTimer(fiber: Fiber, phase: MeasurementPhase): void {
if (!supportsUserTiming) {
return;
}
@@ -285,21 +281,21 @@ if (__DEV__) {
currentPhase = phase;
},
- stopPhaseTimer() : void {
+ stopPhaseTimer(): void {
if (!supportsUserTiming) {
return;
}
if (currentPhase !== null && currentPhaseFiber !== null) {
- const warning = hasScheduledUpdateInCurrentPhase ?
- 'Scheduled a cascading update' :
- null;
+ const warning = hasScheduledUpdateInCurrentPhase
+ ? 'Scheduled a cascading update'
+ : null;
endFiberMark(currentPhaseFiber, currentPhase, warning);
}
currentPhase = null;
currentPhaseFiber = null;
},
- startWorkLoopTimer() : void {
+ startWorkLoopTimer(): void {
if (!supportsUserTiming) {
return;
}
@@ -311,13 +307,13 @@ if (__DEV__) {
resumeTimers();
},
- stopWorkLoopTimer() : void {
+ stopWorkLoopTimer(): void {
if (!supportsUserTiming) {
return;
}
- const warning = commitCountInCurrentWorkLoop > 1 ?
- 'There were cascading updates' :
- null;
+ const warning = commitCountInCurrentWorkLoop > 1
+ ? 'There were cascading updates'
+ : null;
commitCountInCurrentWorkLoop = 0;
// Pause any measurements until the next loop.
pauseTimers();
@@ -328,7 +324,7 @@ if (__DEV__) {
);
},
- startCommitTimer() : void {
+ startCommitTimer(): void {
if (!supportsUserTiming) {
return;
}
@@ -338,7 +334,7 @@ if (__DEV__) {
beginMark('(Committing Changes)');
},
- stopCommitTimer() : void {
+ stopCommitTimer(): void {
if (!supportsUserTiming) {
return;
}
@@ -354,14 +350,10 @@ if (__DEV__) {
isCommitting = false;
labelsInCurrentCommit.clear();
- endMark(
- '(Committing Changes)',
- '(Committing Changes)',
- warning,
- );
+ endMark('(Committing Changes)', '(Committing Changes)', warning);
},
- startCommitHostEffectsTimer() : void {
+ startCommitHostEffectsTimer(): void {
if (!supportsUserTiming) {
return;
}
@@ -369,7 +361,7 @@ if (__DEV__) {
beginMark('(Committing Host Effects)');
},
- stopCommitHostEffectsTimer() : void {
+ stopCommitHostEffectsTimer(): void {
if (!supportsUserTiming) {
return;
}
@@ -382,7 +374,7 @@ if (__DEV__) {
);
},
- startCommitLifeCyclesTimer() : void {
+ startCommitLifeCyclesTimer(): void {
if (!supportsUserTiming) {
return;
}
@@ -390,7 +382,7 @@ if (__DEV__) {
beginMark('(Calling Lifecycle Methods)');
},
- stopCommitLifeCyclesTimer() : void {
+ stopCommitLifeCyclesTimer(): void {
if (!supportsUserTiming) {
return;
}
diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
index 0b34566378..faf8f95d37 100644
--- a/src/renderers/shared/fiber/ReactFiber.js
+++ b/src/renderers/shared/fiber/ReactFiber.js
@@ -12,15 +12,15 @@
'use strict';
-import type { ReactElement, Source } from 'ReactElementType';
-import type { ReactInstance, DebugID } from 'ReactInstanceType';
-import type { ReactFragment } from 'ReactTypes';
-import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';
-import type { ReactPortal } from 'ReactPortal';
-import type { TypeOfWork } from 'ReactTypeOfWork';
-import type { TypeOfSideEffect } from 'ReactTypeOfSideEffect';
-import type { PriorityLevel } from 'ReactPriorityLevel';
-import type { UpdateQueue } from 'ReactFiberUpdateQueue';
+import type {ReactElement, Source} from 'ReactElementType';
+import type {ReactInstance, DebugID} from 'ReactInstanceType';
+import type {ReactFragment} from 'ReactTypes';
+import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
+import type {ReactPortal} from 'ReactPortal';
+import type {TypeOfWork} from 'ReactTypeOfWork';
+import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect';
+import type {PriorityLevel} from 'ReactPriorityLevel';
+import type {UpdateQueue} from 'ReactFiberUpdateQueue';
var ReactTypeOfWork = require('ReactTypeOfWork');
var {
@@ -57,10 +57,10 @@ if (__DEV__) {
// be more than one per component.
export type Fiber = {
// __DEV__ only
- _debugID ?: DebugID,
- _debugSource ?: Source | null,
- _debugOwner ?: Fiber | ReactInstance | null, // Stack compatible
- _debugIsCurrentlyTiming ?: boolean,
+ _debugID?: DebugID,
+ _debugSource?: Source | null,
+ _debugOwner?: Fiber | ReactInstance | null, // Stack compatible
+ _debugIsCurrentlyTiming?: boolean,
// These first fields are conceptually members of an Instance. This used to
// be split into a separate type and intersected with the other Fiber fields,
@@ -103,7 +103,7 @@ export type Fiber = {
// The ref last used to attach this node.
// I'll avoid adding an owner field for prod and model that as functions.
- ref: null | (((handle : mixed) => void) & { _stringRef: ?string }),
+ ref: null | (((handle: mixed) => void) & {_stringRef: ?string}),
// Input is the data coming into process this fiber. Arguments. Props.
pendingProps: any, // This type will be more specific once we overload the tag.
@@ -157,7 +157,6 @@ export type Fiber = {
// Conceptual aliases
// workInProgress : Fiber -> alternate The alternate used for reuse happens
// to be the same as work in progress.
-
};
if (__DEV__) {
@@ -177,9 +176,8 @@ if (__DEV__) {
// to optimize in a non-JIT environment.
// 5) It should be easy to port this to a C struct and keep a C implementation
// compatible.
-var createFiber = function(tag : TypeOfWork, key : null | string) : Fiber {
- var fiber : Fiber = {
-
+var createFiber = function(tag: TypeOfWork, key: null | string): Fiber {
+ var fiber: Fiber = {
// Instance
tag: tag,
@@ -217,7 +215,6 @@ var createFiber = function(tag : TypeOfWork, key : null | string) : Fiber {
progressedLastDeletion: null,
alternate: null,
-
};
if (__DEV__) {
@@ -230,7 +227,6 @@ var createFiber = function(tag : TypeOfWork, key : null | string) : Fiber {
}
}
-
return fiber;
};
@@ -240,7 +236,10 @@ function shouldConstruct(Component) {
// This is used to create an alternate fiber to do work on.
// TODO: Rename to createWorkInProgressFiber or something like that.
-exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fiber {
+exports.cloneFiber = function(
+ fiber: Fiber,
+ priorityLevel: PriorityLevel,
+): Fiber {
// We clone to get a work in progress. That means that this fiber is the
// current. To make it safe to reuse that fiber later on as work in progress
// we need to reset its work in progress flag now. We don't have an
@@ -298,12 +297,15 @@ exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fi
return alt;
};
-exports.createHostRootFiber = function() : Fiber {
+exports.createHostRootFiber = function(): Fiber {
const fiber = createFiber(HostRoot, null);
return fiber;
};
-exports.createFiberFromElement = function(element : ReactElement, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromElement = function(
+ element: ReactElement,
+ priorityLevel: PriorityLevel,
+): Fiber {
let owner = null;
if (__DEV__) {
owner = element._owner;
@@ -321,7 +323,10 @@ exports.createFiberFromElement = function(element : ReactElement, priorityLevel
return fiber;
};
-exports.createFiberFromFragment = function(elements : ReactFragment, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromFragment = function(
+ elements: ReactFragment,
+ priorityLevel: PriorityLevel,
+): Fiber {
// TODO: Consider supporting keyed fragments. Technically, we accidentally
// support that in the existing React.
const fiber = createFiber(Fragment, null);
@@ -330,7 +335,10 @@ exports.createFiberFromFragment = function(elements : ReactFragment, priorityLev
return fiber;
};
-exports.createFiberFromText = function(content : string, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromText = function(
+ content: string,
+ priorityLevel: PriorityLevel,
+): Fiber {
const fiber = createFiber(HostText, null);
fiber.pendingProps = content;
fiber.pendingWorkPriority = priorityLevel;
@@ -338,23 +346,21 @@ exports.createFiberFromText = function(content : string, priorityLevel : Priorit
};
function createFiberFromElementType(
- type : mixed,
- key : null | string,
- debugOwner : null | Fiber | ReactInstance
-) : Fiber {
+ type: mixed,
+ key: null | string,
+ debugOwner: null | Fiber | ReactInstance,
+): Fiber {
let fiber;
if (typeof type === 'function') {
- fiber = shouldConstruct(type) ?
- createFiber(ClassComponent, key) :
- createFiber(IndeterminateComponent, key);
+ fiber = shouldConstruct(type)
+ ? createFiber(ClassComponent, key)
+ : createFiber(IndeterminateComponent, key);
fiber.type = type;
} else if (typeof type === 'string') {
fiber = createFiber(HostComponent, key);
fiber.type = type;
} else if (
- typeof type === 'object' &&
- type !== null &&
- typeof type.tag === 'number'
+ typeof type === 'object' && type !== null && typeof type.tag === 'number'
) {
// Currently assumed to be a continuation and therefore is a fiber already.
// TODO: The yield system is currently broken for updates in some cases.
@@ -362,19 +368,18 @@ function createFiberFromElementType(
// the current or a workInProgress? When the continuation gets rendered here
// we don't know if we can reuse that fiber or if we need to clone it.
// There is probably a clever way to restructure this.
- fiber = ((type : any) : Fiber);
+ fiber = ((type: any): Fiber);
} else {
let info = '';
if (__DEV__) {
if (
type === undefined ||
- typeof type === 'object' &&
- type !== null &&
- Object.keys(type).length === 0
+ (typeof type === 'object' &&
+ type !== null &&
+ Object.keys(type).length === 0)
) {
- info +=
- ' You likely forgot to export your component from the file ' +
- 'it\'s defined in.';
+ info += ' You likely forgot to export your component from the file ' +
+ "it's defined in.";
}
const ownerName = debugOwner ? getComponentName(debugOwner) : null;
if (ownerName) {
@@ -384,7 +389,7 @@ function createFiberFromElementType(
invariant(
false,
'Element type is invalid: expected a string (for built-in components) ' +
- 'or a class/function (for composite components) but got: %s.%s',
+ 'or a class/function (for composite components) but got: %s.%s',
type == null ? type : typeof type,
info,
);
@@ -394,7 +399,10 @@ function createFiberFromElementType(
exports.createFiberFromElementType = createFiberFromElementType;
-exports.createFiberFromCoroutine = function(coroutine : ReactCoroutine, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromCoroutine = function(
+ coroutine: ReactCoroutine,
+ priorityLevel: PriorityLevel,
+): Fiber {
const fiber = createFiber(CoroutineComponent, coroutine.key);
fiber.type = coroutine.handler;
fiber.pendingProps = coroutine;
@@ -402,12 +410,18 @@ exports.createFiberFromCoroutine = function(coroutine : ReactCoroutine, priority
return fiber;
};
-exports.createFiberFromYield = function(yieldNode : ReactYield, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromYield = function(
+ yieldNode: ReactYield,
+ priorityLevel: PriorityLevel,
+): Fiber {
const fiber = createFiber(YieldComponent, null);
return fiber;
};
-exports.createFiberFromPortal = function(portal : ReactPortal, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromPortal = function(
+ portal: ReactPortal,
+ priorityLevel: PriorityLevel,
+): Fiber {
const fiber = createFiber(HostPortal, portal.key);
fiber.pendingProps = portal.children || [];
fiber.pendingWorkPriority = priorityLevel;
diff --git a/src/renderers/shared/fiber/ReactFiberBeginWork.js b/src/renderers/shared/fiber/ReactFiberBeginWork.js
index 3fa3cfda99..ad58d04461 100644
--- a/src/renderers/shared/fiber/ReactFiberBeginWork.js
+++ b/src/renderers/shared/fiber/ReactFiberBeginWork.js
@@ -12,12 +12,12 @@
'use strict';
-import type { ReactCoroutine } from 'ReactCoroutine';
-import type { Fiber } from 'ReactFiber';
-import type { HostContext } from 'ReactFiberHostContext';
-import type { FiberRoot } from 'ReactFiberRoot';
-import type { HostConfig } from 'ReactFiberReconciler';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {ReactCoroutine} from 'ReactCoroutine';
+import type {Fiber} from 'ReactFiber';
+import type {HostContext} from 'ReactFiberHostContext';
+import type {FiberRoot} from 'ReactFiberRoot';
+import type {HostConfig} from 'ReactFiberReconciler';
+import type {PriorityLevel} from 'ReactPriorityLevel';
var {
mountChildFibersInPlace,
@@ -73,13 +73,16 @@ if (__DEV__) {
}
module.exports = function<T, P, I, TI, PI, C, CX, PL>(
- config : HostConfig<T, P, I, TI, PI, C, CX, PL>,
- hostContext : HostContext<C, CX>,
- scheduleUpdate : (fiber : Fiber, priorityLevel : PriorityLevel) => void,
- getPriorityContext : () => PriorityLevel,
+ config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+ hostContext: HostContext<C, CX>,
+ scheduleUpdate: (fiber: Fiber, priorityLevel: PriorityLevel) => void,
+ getPriorityContext: () => PriorityLevel,
) {
-
- const { shouldSetTextContent, useSyncScheduling, shouldDeprioritizeSubtree } = config;
+ const {
+ shouldSetTextContent,
+ useSyncScheduling,
+ shouldDeprioritizeSubtree,
+ } = config;
const {
pushHostContext,
@@ -112,9 +115,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
function clearDeletions(workInProgress) {
- workInProgress.progressedFirstDeletion =
- workInProgress.progressedLastDeletion =
- null;
+ workInProgress.progressedFirstDeletion = (workInProgress.progressedLastDeletion = null);
}
function transferDeletions(workInProgress) {
@@ -125,10 +126,20 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
function reconcileChildren(current, workInProgress, nextChildren) {
const priorityLevel = workInProgress.pendingWorkPriority;
- reconcileChildrenAtPriority(current, workInProgress, nextChildren, priorityLevel);
+ reconcileChildrenAtPriority(
+ current,
+ workInProgress,
+ nextChildren,
+ priorityLevel,
+ );
}
- function reconcileChildrenAtPriority(current, workInProgress, nextChildren, priorityLevel) {
+ function reconcileChildrenAtPriority(
+ current,
+ workInProgress,
+ nextChildren,
+ priorityLevel,
+ ) {
// At this point any memoization is no longer valid since we'll have changed
// the children.
workInProgress.memoizedProps = null;
@@ -141,7 +152,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
workInProgress,
workInProgress.child,
nextChildren,
- priorityLevel
+ priorityLevel,
);
} else if (current.child === workInProgress.child) {
// If the current child is the same as the work in progress, it means that
@@ -156,7 +167,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
workInProgress,
workInProgress.child,
nextChildren,
- priorityLevel
+ priorityLevel,
);
transferDeletions(workInProgress);
@@ -168,7 +179,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
workInProgress,
workInProgress.child,
nextChildren,
- priorityLevel
+ priorityLevel,
);
transferDeletions(workInProgress);
@@ -184,7 +195,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
if (nextChildren === null) {
nextChildren = workInProgress.memoizedProps;
}
- } else if (nextChildren === null || workInProgress.memoizedProps === nextChildren) {
+ } else if (
+ nextChildren === null || workInProgress.memoizedProps === nextChildren
+ ) {
return bailoutOnAlreadyFinishedWork(current, workInProgress);
}
reconcileChildren(current, workInProgress, nextChildren);
@@ -192,7 +205,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
return workInProgress.child;
}
- function markRef(current : Fiber | null, workInProgress : Fiber) {
+ function markRef(current: Fiber | null, workInProgress: Fiber) {
const ref = workInProgress.ref;
if (ref !== null && (!current || current.ref !== ref)) {
// Schedule a Ref effect
@@ -217,8 +230,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
// TODO: Disable this before release, since it is not part of the public API
// I use this for testing to compare the relative overhead of classes.
- if (typeof fn.shouldComponentUpdate === 'function' &&
- !fn.shouldComponentUpdate(memoizedProps, nextProps)) {
+ if (
+ typeof fn.shouldComponentUpdate === 'function' &&
+ !fn.shouldComponentUpdate(memoizedProps, nextProps)
+ ) {
// Memoize props even if shouldComponentUpdate returns false
memoizeProps(workInProgress, nextProps);
return bailoutOnAlreadyFinishedWork(current, workInProgress);
@@ -243,7 +258,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
return workInProgress.child;
}
- function updateClassComponent(current : Fiber | null, workInProgress : Fiber, priorityLevel : PriorityLevel) {
+ function updateClassComponent(
+ current: Fiber | null,
+ workInProgress: Fiber,
+ priorityLevel: PriorityLevel,
+ ) {
// Push context providers early to prevent context stack mismatches.
// During mounting we don't know the child context yet as the instance doesn't exist.
// We will invalidate the child context in finishClassComponent() right after rendering.
@@ -261,16 +280,25 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
shouldUpdate = resumeMountClassInstance(workInProgress, priorityLevel);
}
} else {
- shouldUpdate = updateClassInstance(current, workInProgress, priorityLevel);
+ shouldUpdate = updateClassInstance(
+ current,
+ workInProgress,
+ priorityLevel,
+ );
}
- return finishClassComponent(current, workInProgress, shouldUpdate, hasContext);
+ return finishClassComponent(
+ current,
+ workInProgress,
+ shouldUpdate,
+ hasContext,
+ );
}
function finishClassComponent(
- current : Fiber | null,
- workInProgress : Fiber,
- shouldUpdate : boolean,
- hasContext : boolean,
+ current: Fiber | null,
+ workInProgress: Fiber,
+ shouldUpdate: boolean,
+ hasContext: boolean,
) {
// Refs should update even if shouldComponentUpdate returns false
markRef(current, workInProgress);
@@ -305,20 +333,16 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
function updateHostRoot(current, workInProgress, priorityLevel) {
- const root = (workInProgress.stateNode : FiberRoot);
+ const root = (workInProgress.stateNode: FiberRoot);
if (root.pendingContext) {
pushTopLevelContextObject(
workInProgress,
root.pendingContext,
- root.pendingContext !== root.context
+ root.pendingContext !== root.context,
);
} else if (root.context) {
// Should always be set
- pushTopLevelContextObject(
- workInProgress,
- root.context,
- false
- );
+ pushTopLevelContextObject(workInProgress, root.context, false);
}
pushHostContainer(workInProgress, root.containerInfo);
@@ -326,7 +350,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
const updateQueue = workInProgress.updateQueue;
if (updateQueue !== null) {
const prevState = workInProgress.memoizedState;
- const state = beginUpdateQueue(workInProgress, updateQueue, null, prevState, null, priorityLevel);
+ const state = beginUpdateQueue(
+ workInProgress,
+ updateQueue,
+ null,
+ prevState,
+ null,
+ priorityLevel,
+ );
if (prevState === state) {
// If the state is the same as before, that's a bailout because we had
// no work matching this priority.
@@ -355,13 +386,15 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
nextProps !== null,
'We should always have pending or current props. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
}
} else if (nextProps === null || memoizedProps === nextProps) {
- if (!useSyncScheduling &&
- shouldDeprioritizeSubtree(workInProgress.type, memoizedProps) &&
- workInProgress.pendingWorkPriority !== OffscreenPriority) {
+ if (
+ !useSyncScheduling &&
+ shouldDeprioritizeSubtree(workInProgress.type, memoizedProps) &&
+ workInProgress.pendingWorkPriority !== OffscreenPriority
+ ) {
// This subtree still has work, but it should be deprioritized so we need
// to bail out and not do any work yet.
// TODO: It would be better if this tree got its correct priority set
@@ -390,10 +423,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
// this in the host environment that also have access to this prop. That
// avoids allocating another HostText fiber and traversing it.
nextChildren = null;
- } else if (
- prevProps &&
- shouldSetTextContent(prevProps)
- ) {
+ } else if (prevProps && shouldSetTextContent(prevProps)) {
// If we're switching from a direct text child to a normal child, or to
// empty, we need to schedule the text content to be reset.
workInProgress.effectTag |= ContentReset;
@@ -401,9 +431,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
markRef(current, workInProgress);
- if (!useSyncScheduling &&
- shouldDeprioritizeSubtree(workInProgress.type, nextProps) &&
- workInProgress.pendingWorkPriority !== OffscreenPriority) {
+ if (
+ !useSyncScheduling &&
+ shouldDeprioritizeSubtree(workInProgress.type, nextProps) &&
+ workInProgress.pendingWorkPriority !== OffscreenPriority
+ ) {
// If this host component is hidden, we can bail out on the children.
// We'll rerender the children later at the lower priority.
@@ -419,7 +451,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
// Reconcile the children and stash them for later work.
- reconcileChildrenAtPriority(current, workInProgress, nextChildren, OffscreenPriority);
+ reconcileChildrenAtPriority(
+ current,
+ workInProgress,
+ nextChildren,
+ OffscreenPriority,
+ );
memoizeProps(workInProgress, nextProps);
workInProgress.child = current !== null ? current.child : null;
@@ -460,7 +497,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
current === null,
'An indeterminate component should never have mounted. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
var fn = workInProgress.type;
var props = workInProgress.pendingProps;
@@ -476,7 +513,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
value = fn(props, context);
}
- if (typeof value === 'object' && value !== null && typeof value.render === 'function') {
+ if (
+ typeof value === 'object' &&
+ value !== null &&
+ typeof value.render === 'function'
+ ) {
// Proceed under the assumption that this is a class instance
workInProgress.tag = ClassComponent;
@@ -497,7 +538,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
warning(
!Component.childContextTypes,
'%s(...): childContextTypes cannot be defined on a functional component.',
- Component.displayName || Component.name || 'Component'
+ Component.displayName || Component.name || 'Component',
);
}
if (workInProgress.ref !== null) {
@@ -517,9 +558,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
warning(
false,
'Stateless function components cannot be given refs. ' +
- 'Attempts to access this ref will fail.%s%s',
+ 'Attempts to access this ref will fail.%s%s',
info,
- ReactDebugCurrentFiber.getCurrentFiberStackAddendum()
+ ReactDebugCurrentFiber.getCurrentFiberStackAddendum(),
);
}
}
@@ -531,7 +572,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
function updateCoroutineComponent(current, workInProgress) {
- var nextCoroutine = (workInProgress.pendingProps : null | ReactCoroutine);
+ var nextCoroutine = (workInProgress.pendingProps: null | ReactCoroutine);
if (hasContextChanged()) {
// Normally we can bail out on props equality but if context has changed
// we don't do the bailout and we have to reuse existing props instead.
@@ -540,10 +581,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
nextCoroutine !== null,
'We should always have pending or current props. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
}
- } else if (nextCoroutine === null || workInProgress.memoizedProps === nextCoroutine) {
+ } else if (
+ nextCoroutine === null || workInProgress.memoizedProps === nextCoroutine
+ ) {
nextCoroutine = workInProgress.memoizedProps;
// TODO: When bailing out, we might need to return the stateNode instead
// of the child. To check it for work.
@@ -564,7 +607,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
workInProgress,
workInProgress.stateNode,
nextChildren,
- priorityLevel
+ priorityLevel,
);
} else if (current.child === workInProgress.child) {
clearDeletions(workInProgress);
@@ -573,7 +616,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
workInProgress,
workInProgress.stateNode,
nextChildren,
- priorityLevel
+ priorityLevel,
);
transferDeletions(workInProgress);
@@ -582,7 +625,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
workInProgress,
workInProgress.stateNode,
nextChildren,
- priorityLevel
+ priorityLevel,
);
transferDeletions(workInProgress);
@@ -606,10 +649,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
nextChildren != null,
'We should always have pending or current props. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
}
- } else if (nextChildren === null || workInProgress.memoizedProps === nextChildren) {
+ } else if (
+ nextChildren === null || workInProgress.memoizedProps === nextChildren
+ ) {
return bailoutOnAlreadyFinishedWork(current, workInProgress);
}
@@ -623,7 +668,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
workInProgress,
workInProgress.child,
nextChildren,
- priorityLevel
+ priorityLevel,
);
memoizeProps(workInProgress, nextChildren);
markChildAsProgressed(current, workInProgress, priorityLevel);
@@ -653,11 +698,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
*/
- function bailoutOnAlreadyFinishedWork(current, workInProgress : Fiber) : Fiber | null {
+ function bailoutOnAlreadyFinishedWork(
+ current,
+ workInProgress: Fiber,
+ ): Fiber | null {
if (__DEV__) {
cancelWorkTimer(workInProgress);
}
-
+
const priorityLevel = workInProgress.pendingWorkPriority;
// TODO: We should ideally be able to bail out early if the children have no
// more work to do. However, since we don't have a separation of this
@@ -696,7 +744,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
pushContextProvider(workInProgress);
break;
case HostPortal:
- pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+ pushHostContainer(
+ workInProgress,
+ workInProgress.stateNode.containerInfo,
+ );
break;
}
// TODO: What if this is currently in progress?
@@ -704,21 +755,27 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
return null;
}
- function memoizeProps(workInProgress : Fiber, nextProps : any) {
+ function memoizeProps(workInProgress: Fiber, nextProps: any) {
workInProgress.memoizedProps = nextProps;
// Reset the pending props
workInProgress.pendingProps = null;
}
- function memoizeState(workInProgress : Fiber, nextState : any) {
+ function memoizeState(workInProgress: Fiber, nextState: any) {
workInProgress.memoizedState = nextState;
// Don't reset the updateQueue, in case there are pending updates. Resetting
// is handled by beginUpdateQueue.
}
- function beginWork(current : Fiber | null, workInProgress : Fiber, priorityLevel : PriorityLevel) : Fiber | null {
- if (workInProgress.pendingWorkPriority === NoWork ||
- workInProgress.pendingWorkPriority > priorityLevel) {
+ function beginWork(
+ current: Fiber | null,
+ workInProgress: Fiber,
+ priorityLevel: PriorityLevel,
+ ): Fiber | null {
+ if (
+ workInProgress.pendingWorkPriority === NoWork ||
+ workInProgress.pendingWorkPriority > priorityLevel
+ ) {
return bailoutOnLowPriority(current, workInProgress);
}
@@ -739,7 +796,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
switch (workInProgress.tag) {
case IndeterminateComponent:
- return mountIndeterminateComponent(current, workInProgress, priorityLevel);
+ return mountIndeterminateComponent(
+ current,
+ workInProgress,
+ priorityLevel,
+ );
case FunctionalComponent:
return updateFunctionalComponent(current, workInProgress);
case ClassComponent:
@@ -753,7 +814,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
case CoroutineHandlerPhase:
// This is a restart. Reset the tag to the initial phase.
workInProgress.tag = CoroutineComponent;
- // Intentionally fall through since this is now the same.
+ // Intentionally fall through since this is now the same.
case CoroutineComponent:
return updateCoroutineComponent(current, workInProgress);
case YieldComponent:
@@ -768,24 +829,29 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
false,
'Unknown unit of work tag. This error is likely caused by a bug in ' +
- 'React. Please file an issue.'
+ 'React. Please file an issue.',
);
}
}
- function beginFailedWork(current : Fiber | null, workInProgress : Fiber, priorityLevel : PriorityLevel) {
+ function beginFailedWork(
+ current: Fiber | null,
+ workInProgress: Fiber,
+ priorityLevel: PriorityLevel,
+ ) {
invariant(
- workInProgress.tag === ClassComponent ||
- workInProgress.tag === HostRoot,
+ workInProgress.tag === ClassComponent || workInProgress.tag === HostRoot,
'Invalid type of work. This error is likely caused by a bug in React. ' +
- 'Please file an issue.'
+ 'Please file an issue.',
);
// Add an error effect so we can handle the error during the commit phase
workInProgress.effectTag |= Err;
- if (workInProgress.pendingWorkPriority === NoWork ||
- workInProgress.pendingWorkPriority > priorityLevel) {
+ if (
+ workInProgress.pendingWorkPriority === NoWork ||
+ workInProgress.pendingWorkPriority > priorityLevel
+ ) {
return bailoutOnLowPriority(current, workInProgress);
}
@@ -812,5 +878,4 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
beginWork,
beginFailedWork,
};
-
};
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index 2b0eb304b5..c417f2f42e 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -12,8 +12,8 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {Fiber} from 'ReactFiber';
+import type {PriorityLevel} from 'ReactPriorityLevel';
var {
Update,
@@ -30,8 +30,8 @@ var {
addForceUpdate,
beginUpdateQueue,
} = require('ReactFiberUpdateQueue');
-var { hasContextChanged } = require('ReactFiberContext');
-var { isMounted } = require('ReactFiberTreeReflection');
+var {hasContextChanged} = require('ReactFiberContext');
+var {isMounted} = require('ReactFiberTreeReflection');
var ReactInstanceMap = require('ReactInstanceMap');
var emptyObject = require('fbjs/lib/emptyObject');
var getComponentName = require('getComponentName');
@@ -46,24 +46,23 @@ if (__DEV__) {
stopPhaseTimer,
} = require('ReactDebugFiberPerf');
var warning = require('fbjs/lib/warning');
- var warnOnInvalidCallback = function(callback : mixed, callerName : string) {
+ var warnOnInvalidCallback = function(callback: mixed, callerName: string) {
warning(
callback === null || typeof callback === 'function',
'%s(...): Expected the last optional `callback` argument to be a ' +
- 'function. Instead received: %s.',
+ 'function. Instead received: %s.',
callerName,
- callback
+ callback,
);
};
}
module.exports = function(
- scheduleUpdate : (fiber : Fiber, priorityLevel : PriorityLevel) => void,
- getPriorityContext : () => PriorityLevel,
- memoizeProps: (workInProgress : Fiber, props : any) => void,
- memoizeState: (workInProgress : Fiber, state : any) => void,
+ scheduleUpdate: (fiber: Fiber, priorityLevel: PriorityLevel) => void,
+ getPriorityContext: () => PriorityLevel,
+ memoizeProps: (workInProgress: Fiber, props: any) => void,
+ memoizeState: (workInProgress: Fiber, state: any) => void,
) {
-
// Class component state updater
const updater = {
isMounted,
@@ -99,8 +98,19 @@ module.exports = function(
},
};
- function checkShouldComponentUpdate(workInProgress, oldProps, newProps, oldState, newState, newContext) {
- if (oldProps === null || (workInProgress.updateQueue !== null && workInProgress.updateQueue.hasForceUpdate)) {
+ function checkShouldComponentUpdate(
+ workInProgress,
+ oldProps,
+ newProps,
+ oldState,
+ newState,
+ newContext,
+ ) {
+ if (
+ oldProps === null ||
+ (workInProgress.updateQueue !== null &&
+ workInProgress.updateQueue.hasForceUpdate)
+ ) {
// If the workInProgress already has an Update effect, return true
return true;
}
@@ -110,7 +120,11 @@ module.exports = function(
if (__DEV__) {
startPhaseTimer(workInProgress, 'shouldComponentUpdate');
}
- const shouldUpdate = instance.shouldComponentUpdate(newProps, newState, newContext);
+ const shouldUpdate = instance.shouldComponentUpdate(
+ newProps,
+ newState,
+ newContext,
+ );
if (__DEV__) {
stopPhaseTimer();
}
@@ -119,8 +133,8 @@ module.exports = function(
warning(
shouldUpdate !== undefined,
'%s.shouldComponentUpdate(): Returned undefined instead of a ' +
- 'boolean value. Make sure to return true or false.',
- getComponentName(workInProgress) || 'Unknown'
+ 'boolean value. Make sure to return true or false.',
+ getComponentName(workInProgress) || 'Unknown',
);
}
@@ -129,10 +143,8 @@ module.exports = function(
const type = workInProgress.type;
if (type.prototype && type.prototype.isPureReactComponent) {
- return (
- !shallowEqual(oldProps, newProps) ||
- !shallowEqual(oldState, newState)
- );
+ return !shallowEqual(oldProps, newProps) ||
+ !shallowEqual(oldState, newState);
}
return true;
@@ -146,77 +158,76 @@ module.exports = function(
warning(
renderPresent,
'%s(...): No `render` method found on the returned component ' +
- 'instance: you may have forgotten to define `render`.',
- name
+ 'instance: you may have forgotten to define `render`.',
+ name,
);
- const noGetInitialStateOnES6 = (
- !instance.getInitialState ||
+ const noGetInitialStateOnES6 = !instance.getInitialState ||
instance.getInitialState.isReactClassApproved ||
- instance.state
- );
+ instance.state;
warning(
noGetInitialStateOnES6,
'getInitialState was defined on %s, a plain JavaScript class. ' +
- 'This is only supported for classes created using React.createClass. ' +
- 'Did you mean to define a state property instead?',
- name
- );
- const noGetDefaultPropsOnES6 = (
- !instance.getDefaultProps ||
- instance.getDefaultProps.isReactClassApproved
+ 'This is only supported for classes created using React.createClass. ' +
+ 'Did you mean to define a state property instead?',
+ name,
);
+ const noGetDefaultPropsOnES6 = !instance.getDefaultProps ||
+ instance.getDefaultProps.isReactClassApproved;
warning(
noGetDefaultPropsOnES6,
'getDefaultProps was defined on %s, a plain JavaScript class. ' +
- 'This is only supported for classes created using React.createClass. ' +
- 'Use a static property to define defaultProps instead.',
- name
+ 'This is only supported for classes created using React.createClass. ' +
+ 'Use a static property to define defaultProps instead.',
+ name,
);
const noInstancePropTypes = !instance.propTypes;
warning(
noInstancePropTypes,
'propTypes was defined as an instance property on %s. Use a static ' +
- 'property to define propTypes instead.',
+ 'property to define propTypes instead.',
name,
);
const noInstanceContextTypes = !instance.contextTypes;
warning(
noInstanceContextTypes,
'contextTypes was defined as an instance property on %s. Use a static ' +
- 'property to define contextTypes instead.',
+ 'property to define contextTypes instead.',
name,
);
- const noComponentShouldUpdate = typeof instance.componentShouldUpdate !== 'function';
+ const noComponentShouldUpdate = typeof instance.componentShouldUpdate !==
+ 'function';
warning(
noComponentShouldUpdate,
'%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.',
- name
+ 'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
+ 'The name is phrased as a question because the function is ' +
+ 'expected to return a value.',
+ name,
);
- const noComponentDidUnmount = typeof instance.componentDidUnmount !== 'function';
+ const noComponentDidUnmount = typeof instance.componentDidUnmount !==
+ 'function';
warning(
noComponentDidUnmount,
'%s has a method called ' +
- 'componentDidUnmount(). But there is no such lifecycle method. ' +
- 'Did you mean componentWillUnmount()?',
- name
+ 'componentDidUnmount(). But there is no such lifecycle method. ' +
+ 'Did you mean componentWillUnmount()?',
+ name,
);
- const noComponentWillRecieveProps = typeof instance.componentWillRecieveProps !== 'function';
+ const noComponentWillRecieveProps = typeof instance.componentWillRecieveProps !==
+ 'function';
warning(
noComponentWillRecieveProps,
'%s has a method called ' +
- 'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
- name
+ 'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
+ name,
);
const hasMutatedProps = instance.props !== workInProgress.pendingProps;
warning(
instance.props === undefined || !hasMutatedProps,
'%s(...): When calling super() in `%s`, make sure to pass ' +
- 'up the same props that your component\'s constructor was passed.',
+ "up the same props that your component's constructor was passed.",
+ name,
name,
- name
);
}
@@ -225,37 +236,39 @@ module.exports = function(
invariant(
false,
'%s.state: must be set to an object or null',
- getComponentName(workInProgress)
+ getComponentName(workInProgress),
);
}
if (typeof instance.getChildContext === 'function') {
invariant(
typeof workInProgress.type.childContextTypes === 'object',
'%s.getChildContext(): childContextTypes must be defined in order to ' +
- 'use getChildContext().',
- getComponentName(workInProgress)
+ 'use getChildContext().',
+ getComponentName(workInProgress),
);
}
}
- function resetInputPointers(workInProgress : Fiber, instance : any) {
+ function resetInputPointers(workInProgress: Fiber, instance: any) {
instance.props = workInProgress.memoizedProps;
instance.state = workInProgress.memoizedState;
}
- function adoptClassInstance(workInProgress : Fiber, instance : any) : void {
+ function adoptClassInstance(workInProgress: Fiber, instance: any): void {
instance.updater = updater;
workInProgress.stateNode = instance;
// The instance needs access to the fiber so that it can schedule updates
ReactInstanceMap.set(instance, workInProgress);
}
- function constructClassInstance(workInProgress : Fiber) : any {
+ function constructClassInstance(workInProgress: Fiber): any {
const ctor = workInProgress.type;
const props = workInProgress.pendingProps;
const unmaskedContext = getUnmaskedContext(workInProgress);
const needsContext = isContextConsumer(workInProgress);
- const context = needsContext ? getMaskedContext(workInProgress, unmaskedContext) : emptyObject;
+ const context = needsContext
+ ? getMaskedContext(workInProgress, unmaskedContext)
+ : emptyObject;
const instance = new ctor(props, context);
adoptClassInstance(workInProgress, instance);
checkClassInstance(workInProgress);
@@ -270,7 +283,10 @@ module.exports = function(
}
// Invokes the mount life-cycles on a previously never rendered instance.
- function mountClassInstance(workInProgress : Fiber, priorityLevel : PriorityLevel) : void {
+ function mountClassInstance(
+ workInProgress: Fiber,
+ priorityLevel: PriorityLevel,
+ ): void {
const instance = workInProgress.stateNode;
const state = instance.state || null;
@@ -278,7 +294,7 @@ module.exports = function(
invariant(
props,
'There must be pending props for an initial mount. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
const unmaskedContext = getUnmaskedContext(workInProgress);
@@ -306,7 +322,7 @@ module.exports = function(
instance,
state,
props,
- priorityLevel
+ priorityLevel,
);
}
}
@@ -317,7 +333,10 @@ module.exports = function(
// Called on a preexisting class instance. Returns false if a resumed render
// could be reused.
- function resumeMountClassInstance(workInProgress : Fiber, priorityLevel : PriorityLevel) : boolean {
+ function resumeMountClassInstance(
+ workInProgress: Fiber,
+ priorityLevel: PriorityLevel,
+ ): boolean {
const instance = workInProgress.stateNode;
resetInputPointers(workInProgress, instance);
@@ -330,7 +349,7 @@ module.exports = function(
invariant(
newProps != null,
'There should always be pending or memoized props. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
}
const newUnmaskedContext = getUnmaskedContext(workInProgress);
@@ -340,14 +359,16 @@ module.exports = function(
// componentWillMount and before this componentWillMount? Probably
// unsupported anyway.
- if (!checkShouldComponentUpdate(
- workInProgress,
- workInProgress.memoizedProps,
- newProps,
- workInProgress.memoizedState,
- newState,
- newContext
- )) {
+ if (
+ !checkShouldComponentUpdate(
+ workInProgress,
+ workInProgress.memoizedProps,
+ newProps,
+ workInProgress.memoizedState,
+ newState,
+ newContext,
+ )
+ ) {
// Update the existing instance's state, props, and context pointers even
// though we're bailing out.
instance.props = newProps;
@@ -360,7 +381,7 @@ module.exports = function(
// want to reuse one that failed to fully mount.
const newInstance = constructClassInstance(workInProgress);
newInstance.props = newProps;
- newInstance.state = newState = newInstance.state || null;
+ newInstance.state = (newState = newInstance.state || null);
newInstance.context = newContext;
if (typeof newInstance.componentWillMount === 'function') {
@@ -383,7 +404,7 @@ module.exports = function(
newInstance,
newState,
newProps,
- priorityLevel
+ priorityLevel,
);
}
if (typeof instance.componentDidMount === 'function') {
@@ -393,7 +414,11 @@ module.exports = function(
}
// Invokes the update life-cycles and returns false if it shouldn't rerender.
- function updateClassInstance(current : Fiber, workInProgress : Fiber, priorityLevel : PriorityLevel) : boolean {
+ function updateClassInstance(
+ current: Fiber,
+ workInProgress: Fiber,
+ priorityLevel: PriorityLevel,
+ ): boolean {
const instance = workInProgress.stateNode;
resetInputPointers(workInProgress, instance);
@@ -406,7 +431,7 @@ module.exports = function(
invariant(
newProps != null,
'There should always be pending or memoized props. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
}
const oldContext = instance.context;
@@ -432,9 +457,9 @@ module.exports = function(
warning(
false,
'%s.componentWillReceiveProps(): Assigning directly to ' +
- 'this.state is deprecated (except inside a component\'s ' +
- 'constructor). Use setState instead.',
- getComponentName(workInProgress)
+ "this.state is deprecated (except inside a component's " +
+ 'constructor). Use setState instead.',
+ getComponentName(workInProgress),
);
}
updater.enqueueReplaceState(instance, instance.state, null);
@@ -454,21 +479,25 @@ module.exports = function(
instance,
oldState,
newProps,
- priorityLevel
+ priorityLevel,
);
} else {
newState = oldState;
}
- if (oldProps === newProps &&
- oldState === newState &&
- !hasContextChanged() &&
- !(updateQueue !== null && updateQueue.hasForceUpdate)) {
+ if (
+ oldProps === newProps &&
+ oldState === newState &&
+ !hasContextChanged() &&
+ !(updateQueue !== null && updateQueue.hasForceUpdate)
+ ) {
// If an update was already in progress, we should schedule an Update
// effect even though we're bailing out, so that cWU/cDU are called.
if (typeof instance.componentDidUpdate === 'function') {
- if (oldProps !== current.memoizedProps ||
- oldState !== current.memoizedState) {
+ if (
+ oldProps !== current.memoizedProps ||
+ oldState !== current.memoizedState
+ ) {
workInProgress.effectTag |= Update;
}
}
@@ -481,7 +510,7 @@ module.exports = function(
newProps,
oldState,
newState,
- newContext
+ newContext,
);
if (shouldUpdate) {
@@ -501,8 +530,10 @@ module.exports = function(
// If an update was already in progress, we should schedule an Update
// effect even though we're bailing out, so that cWU/cDU are called.
if (typeof instance.componentDidUpdate === 'function') {
- if (oldProps !== current.memoizedProps ||
- oldState !== current.memoizedState) {
+ if (
+ oldProps !== current.memoizedProps ||
+ oldState !== current.memoizedState
+ ) {
workInProgress.effectTag |= Update;
}
}
@@ -529,5 +560,4 @@ module.exports = function(
resumeMountClassInstance,
updateClassInstance,
};
-
};
diff --git a/src/renderers/shared/fiber/ReactFiberCommitWork.js b/src/renderers/shared/fiber/ReactFiberCommitWork.js
index 30a2f4962c..17000dc690 100644
--- a/src/renderers/shared/fiber/ReactFiberCommitWork.js
+++ b/src/renderers/shared/fiber/ReactFiberCommitWork.js
@@ -12,8 +12,8 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
-import type { HostConfig } from 'ReactFiberReconciler';
+import type {Fiber} from 'ReactFiber';
+import type {HostConfig} from 'ReactFiberReconciler';
var ReactTypeOfWork = require('ReactTypeOfWork');
var {
@@ -24,9 +24,9 @@ var {
HostPortal,
CoroutineComponent,
} = ReactTypeOfWork;
-var { commitCallbacks } = require('ReactFiberUpdateQueue');
-var { onCommitUnmount } = require('ReactFiberDevToolsHook');
-var { invokeGuardedCallback } = require('ReactErrorUtils');
+var {commitCallbacks} = require('ReactFiberUpdateQueue');
+var {onCommitUnmount} = require('ReactFiberDevToolsHook');
+var {invokeGuardedCallback} = require('ReactErrorUtils');
var {
Placement,
@@ -45,10 +45,9 @@ if (__DEV__) {
}
module.exports = function<T, P, I, TI, PI, C, CX, PL>(
- config : HostConfig<T, P, I, TI, PI, C, CX, PL>,
- captureError : (failedFiber : Fiber, error: Error) => Fiber | null
+ config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+ captureError: (failedFiber: Fiber, error: Error) => Fiber | null,
) {
-
const {
commitMount,
commitUpdate,
@@ -90,7 +89,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function safelyDetachRef(current : Fiber) {
+ function safelyDetachRef(current: Fiber) {
const ref = current.ref;
if (ref !== null) {
if (__DEV__) {
@@ -108,7 +107,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function getHostParent(fiber : Fiber) : I | C {
+ function getHostParent(fiber: Fiber): I | C {
let parent = fiber.return;
while (parent !== null) {
switch (parent.tag) {
@@ -124,11 +123,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
false,
'Expected to find a host parent. This error is likely caused by a bug ' +
- 'in React. Please file an issue.'
+ 'in React. Please file an issue.',
);
}
- function getHostParentFiber(fiber : Fiber) : Fiber {
+ function getHostParentFiber(fiber: Fiber): Fiber {
let parent = fiber.return;
while (parent !== null) {
if (isHostParent(parent)) {
@@ -139,24 +138,22 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
false,
'Expected to find a host parent. This error is likely caused by a bug ' +
- 'in React. Please file an issue.'
+ 'in React. Please file an issue.',
);
}
- function isHostParent(fiber : Fiber) : boolean {
- return (
- fiber.tag === HostComponent ||
+ function isHostParent(fiber: Fiber): boolean {
+ return fiber.tag === HostComponent ||
fiber.tag === HostRoot ||
- fiber.tag === HostPortal
- );
+ fiber.tag === HostPortal;
}
- function getHostSibling(fiber : Fiber) : ?I {
+ function getHostSibling(fiber: Fiber): ?I {
// We're going to search forward into the tree until we find a sibling host
// node. Unfortunately, if multiple insertions are done in a row we have to
// search past them. This leads to exponential search for the next sibling.
// TODO: Find a more efficient way to do this.
- let node : Fiber = fiber;
+ let node: Fiber = fiber;
siblings: while (true) {
// If we didn't find anything, let's try the next sibling.
while (node.sibling === null) {
@@ -193,7 +190,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function commitPlacement(finishedWork : Fiber) : void {
+ function commitPlacement(finishedWork: Fiber): void {
// Recursively insert all host nodes into the parent.
const parentFiber = getHostParentFiber(finishedWork);
let parent;
@@ -211,7 +208,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
false,
'Invalid host parent fiber. This error is likely caused by a bug ' +
- 'in React. Please file an issue.'
+ 'in React. Please file an issue.',
);
}
if (parentFiber.effectTag & ContentReset) {
@@ -224,7 +221,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
const before = getHostSibling(finishedWork);
// We only have the top Fiber that was inserted but we need recurse down its
// children to find all the terminal nodes.
- let node : Fiber = finishedWork;
+ let node: Fiber = finishedWork;
while (true) {
if (node.tag === HostComponent || node.tag === HostText) {
if (before) {
@@ -255,13 +252,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function commitNestedUnmounts(root : Fiber): void {
+ function commitNestedUnmounts(root: Fiber): void {
// While we're inside a removed host node we don't want to call
// removeChild on the inner nodes because they're removed by the top
// call anyway. We also want to call componentWillUnmount on all
// composites before this host node is removed from the tree. Therefore
// we do an inner loop while we're still inside the host node.
- let node : Fiber = root;
+ let node: Fiber = root;
while (true) {
commitUnmount(node);
// Visit children because they may contain more composite or host nodes.
@@ -288,7 +285,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
function unmountHostComponents(parent, current): void {
// We only have the top Fiber that was inserted but we need recurse down its
// children to find all the terminal nodes.
- let node : Fiber = current;
+ let node: Fiber = current;
while (true) {
if (node.tag === HostComponent || node.tag === HostText) {
commitNestedUnmounts(node);
@@ -334,7 +331,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function commitDeletion(current : Fiber) : void {
+ function commitDeletion(current: Fiber): void {
// Recursively delete all host nodes from the parent.
const parent = getHostParent(current);
// Detach refs and call componentWillUnmount() on the whole subtree.
@@ -356,7 +353,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
// User-originating errors (lifecycles and refs) should not interrupt
// deletion, so don't let them throw. Host-originating errors should
// interrupt deletion, so it's okay
- function commitUnmount(current : Fiber) : void {
+ function commitUnmount(current: Fiber): void {
if (typeof onCommitUnmount === 'function') {
onCommitUnmount(current);
}
@@ -389,23 +386,30 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function commitWork(current : Fiber | null, finishedWork : Fiber) : void {
+ function commitWork(current: Fiber | null, finishedWork: Fiber): void {
switch (finishedWork.tag) {
case ClassComponent: {
return;
}
case HostComponent: {
- const instance : I = finishedWork.stateNode;
+ const instance: I = finishedWork.stateNode;
if (instance != null && current !== null) {
// Commit the work prepared earlier.
const newProps = finishedWork.memoizedProps;
const oldProps = current.memoizedProps;
const type = finishedWork.type;
// TODO: Type the updateQueue to be specific to host components.
- const updatePayload : null | PL = (finishedWork.updateQueue : any);
+ const updatePayload: null | PL = (finishedWork.updateQueue: any);
finishedWork.updateQueue = null;
if (updatePayload !== null) {
- commitUpdate(instance, updatePayload, type, oldProps, newProps, finishedWork);
+ commitUpdate(
+ instance,
+ updatePayload,
+ type,
+ oldProps,
+ newProps,
+ finishedWork,
+ );
}
}
return;
@@ -414,11 +418,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
finishedWork.stateNode !== null && current !== null,
'This should only be done during updates. This error is likely ' +
- 'caused by a bug in React. Please file an issue.'
+ 'caused by a bug in React. Please file an issue.',
);
- const textInstance : TI = finishedWork.stateNode;
- const newText : string = finishedWork.memoizedProps;
- const oldText : string = current.memoizedProps;
+ const textInstance: TI = finishedWork.stateNode;
+ const newText: string = finishedWork.memoizedProps;
+ const oldText: string = current.memoizedProps;
commitTextUpdate(textInstance, oldText, newText);
return;
}
@@ -432,13 +436,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
false,
'This unit of work tag should not have side-effects. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
}
}
}
- function commitLifeCycles(current : Fiber | null, finishedWork : Fiber) : void {
+ function commitLifeCycles(current: Fiber | null, finishedWork: Fiber): void {
switch (finishedWork.tag) {
case ClassComponent: {
const instance = finishedWork.stateNode;
@@ -463,7 +467,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
}
- if ((finishedWork.effectTag & Callback) && finishedWork.updateQueue !== null) {
+ if (
+ finishedWork.effectTag & Callback && finishedWork.updateQueue !== null
+ ) {
commitCallbacks(finishedWork, finishedWork.updateQueue, instance);
}
return;
@@ -477,16 +483,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
return;
}
case HostComponent: {
- const instance : I = finishedWork.stateNode;
+ const instance: I = finishedWork.stateNode;
// Renderers may schedule work to be done after host components are mounted
// (eg DOM renderer may schedule auto-focus for inputs and form controls).
// These effects should only be committed when components are first mounted,
// aka when there is no current/alternate.
- if (
- current === null &&
- finishedWork.effectTag & Update
- ) {
+ if (current === null && finishedWork.effectTag & Update) {
const type = finishedWork.type;
const props = finishedWork.memoizedProps;
commitMount(instance, type, props, finishedWork);
@@ -506,13 +509,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
false,
'This unit of work tag should not have side-effects. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
}
}
}
- function commitAttachRef(finishedWork : Fiber) {
+ function commitAttachRef(finishedWork: Fiber) {
const ref = finishedWork.ref;
if (ref !== null) {
const instance = getPublicInstance(finishedWork.stateNode);
@@ -520,7 +523,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function commitDetachRef(current : Fiber) {
+ function commitDetachRef(current: Fiber) {
const currentRef = current.ref;
if (currentRef !== null) {
currentRef(null);
@@ -535,5 +538,4 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
commitAttachRef,
commitDetachRef,
};
-
};
diff --git a/src/renderers/shared/fiber/ReactFiberCompleteWork.js b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
index aef565e1d2..a65b0d3d71 100644
--- a/src/renderers/shared/fiber/ReactFiberCompleteWork.js
+++ b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
@@ -12,13 +12,13 @@
'use strict';
-import type { ReactCoroutine } from 'ReactCoroutine';
-import type { Fiber } from 'ReactFiber';
-import type { HostContext } from 'ReactFiberHostContext';
-import type { FiberRoot } from 'ReactFiberRoot';
-import type { HostConfig } from 'ReactFiberReconciler';
+import type {ReactCoroutine} from 'ReactCoroutine';
+import type {Fiber} from 'ReactFiber';
+import type {HostContext} from 'ReactFiberHostContext';
+import type {FiberRoot} from 'ReactFiberRoot';
+import type {HostConfig} from 'ReactFiberReconciler';
-var { reconcileChildFibers } = require('ReactChildFiber');
+var {reconcileChildFibers} = require('ReactChildFiber');
var {
popContextProvider,
} = require('ReactFiberContext');
@@ -49,8 +49,8 @@ if (__DEV__) {
var invariant = require('fbjs/lib/invariant');
module.exports = function<T, P, I, TI, PI, C, CX, PL>(
- config : HostConfig<T, P, I, TI, PI, C, CX, PL>,
- hostContext : HostContext<C, CX>,
+ config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+ hostContext: HostContext<C, CX>,
) {
const {
createInstance,
@@ -79,28 +79,28 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function markUpdate(workInProgress : Fiber) {
+ function markUpdate(workInProgress: Fiber) {
// Tag the fiber with an update effect. This turns a Placement into
// an UpdateAndPlacement.
workInProgress.effectTag |= Update;
}
- function markRef(workInProgress : Fiber) {
+ function markRef(workInProgress: Fiber) {
workInProgress.effectTag |= Ref;
}
- function appendAllYields(yields : Array<mixed>, workInProgress : Fiber) {
+ function appendAllYields(yields: Array<mixed>, workInProgress: Fiber) {
let node = workInProgress.stateNode;
if (node) {
node.return = workInProgress;
}
while (node !== null) {
- if (node.tag === HostComponent || node.tag === HostText ||
- node.tag === HostPortal) {
- invariant(
- false,
- 'A coroutine cannot have host component children.'
- );
+ if (
+ node.tag === HostComponent ||
+ node.tag === HostText ||
+ node.tag === HostPortal
+ ) {
+ invariant(false, 'A coroutine cannot have host component children.');
} else if (node.tag === YieldComponent) {
yields.push(node.type);
} else if (node.child !== null) {
@@ -119,12 +119,15 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function moveCoroutineToHandlerPhase(current : Fiber | null, workInProgress : Fiber) {
- var coroutine = (workInProgress.memoizedProps : ?ReactCoroutine);
+ function moveCoroutineToHandlerPhase(
+ current: Fiber | null,
+ workInProgress: Fiber,
+ ) {
+ var coroutine = (workInProgress.memoizedProps: ?ReactCoroutine);
invariant(
coroutine,
'Should be resolved by now. This error is likely caused by a bug in ' +
- 'React. Please file an issue.',
+ 'React. Please file an issue.',
);
// First step of the coroutine has completed. Now we need to do the second.
@@ -138,7 +141,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
// Build up the yields.
// TODO: Compare this to a generator or opaque helpers like Children.
- var yields : Array<mixed> = [];
+ var yields: Array<mixed> = [];
appendAllYields(yields, workInProgress);
var fn = coroutine.handler;
var props = coroutine.props;
@@ -151,13 +154,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
workInProgress,
currentFirstChild,
nextChildren,
- priority
+ priority,
);
markChildAsProgressed(current, workInProgress, priority);
return workInProgress.child;
}
- function appendAllChildren(parent : I, workInProgress : Fiber) {
+ function appendAllChildren(parent: I, workInProgress: Fiber) {
// We only have the top Fiber that was created but we need recurse down its
// children to find all the terminal nodes.
let node = workInProgress.child;
@@ -185,7 +188,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
}
- function completeWork(current : Fiber | null, workInProgress : Fiber) : Fiber | null {
+ function completeWork(
+ current: Fiber | null,
+ workInProgress: Fiber,
+ ): Fiber | null {
if (__DEV__) {
ReactDebugCurrentFiber.current = workInProgress;
}
@@ -200,7 +206,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
case HostRoot: {
// TODO: Pop the host container after #8607 lands.
- const fiberRoot = (workInProgress.stateNode : FiberRoot);
+ const fiberRoot = (workInProgress.stateNode: FiberRoot);
if (fiberRoot.pendingContext) {
fiberRoot.context = fiberRoot.pendingContext;
fiberRoot.pendingContext = null;
@@ -220,7 +226,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
// have newProps so we'll have to reuse them.
// TODO: Split the update API as separate for the props vs. children.
// Even better would be if children weren't special cased at all tho.
- const instance : I = workInProgress.stateNode;
+ const instance: I = workInProgress.stateNode;
const currentHostContext = getHostContext();
const updatePayload = prepareUpdate(
instance,
@@ -228,11 +234,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
oldProps,
newProps,
rootContainerInstance,
- currentHostContext
+ currentHostContext,
);
// TODO: Type this specific to this type of component.
- workInProgress.updateQueue = (updatePayload : any);
+ workInProgress.updateQueue = (updatePayload: any);
// If the update payload indicates that there is a change or if there
// is a new ref we mark this as an update.
if (updatePayload) {
@@ -246,7 +252,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
workInProgress.stateNode !== null,
'We must have new props for new mounts. This error is likely ' +
- 'caused by a bug in React. Please file an issue.'
+ 'caused by a bug in React. Please file an issue.',
);
// This can happen when we abort work.
return null;
@@ -262,7 +268,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
newProps,
rootContainerInstance,
currentHostContext,
- workInProgress
+ workInProgress,
);
appendAllChildren(instance, workInProgress);
@@ -270,7 +276,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
// Certain renderers require commit-time effects for initial mount.
// (eg DOM renderer supports auto-focus for certain elements).
// Make sure such renderers get scheduled for later work.
- if (finalizeInitialChildren(instance, type, newProps, rootContainerInstance)) {
+ if (
+ finalizeInitialChildren(
+ instance,
+ type,
+ newProps,
+ rootContainerInstance,
+ )
+ ) {
markUpdate(workInProgress);
}
@@ -296,14 +309,19 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
workInProgress.stateNode !== null,
'We must have new props for new mounts. This error is likely ' +
- 'caused by a bug in React. Please file an issue.'
+ 'caused by a bug in React. Please file an issue.',
);
// This can happen when we abort work.
return null;
}
const rootContainerInstance = getRootHostContainer();
const currentHostContext = getHostContext();
- const textInstance = createTextInstance(newText, rootContainerInstance, currentHostContext, workInProgress);
+ const textInstance = createTextInstance(
+ newText,
+ rootContainerInstance,
+ currentHostContext,
+ workInProgress,
+ );
workInProgress.stateNode = textInstance;
}
return null;
@@ -330,15 +348,15 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
invariant(
false,
'An indeterminate component should have become determinate before ' +
- 'completing. This error is likely caused by a bug in React. Please ' +
- 'file an issue.'
+ 'completing. This error is likely caused by a bug in React. Please ' +
+ 'file an issue.',
);
- // eslint-disable-next-line no-fallthrough
+ // eslint-disable-next-line no-fallthrough
default:
invariant(
false,
'Unknown unit of work tag. This error is likely caused by a bug in ' +
- 'React. Please file an issue.'
+ 'React. Please file an issue.',
);
}
}
@@ -346,5 +364,4 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
return {
completeWork,
};
-
};
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
index 81410161d4..0f45d75323 100644
--- a/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -12,8 +12,8 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
-import type { StackCursor } from 'ReactFiberStack';
+import type {Fiber} from 'ReactFiber';
+import type {StackCursor} from 'ReactFiberStack';
var emptyObject = require('fbjs/lib/emptyObject');
var getComponentName = require('getComponentName');
@@ -44,15 +44,15 @@ if (__DEV__) {
}
// A cursor to the current merged context object on the stack.
-let contextStackCursor : StackCursor<Object> = createCursor(emptyObject);
+let contextStackCursor: StackCursor<Object> = createCursor(emptyObject);
// A cursor to a boolean indicating whether the context has changed.
-let didPerformWorkStackCursor : StackCursor<boolean> = createCursor(false);
+let didPerformWorkStackCursor: StackCursor<boolean> = createCursor(false);
// Keep track of the previous context object that was on the stack.
// We use this to get access to the parent context after we have already
// pushed the next context provider, and now need to merge their contexts.
-let previousContext : Object = emptyObject;
+let previousContext: Object = emptyObject;
-function getUnmaskedContext(workInProgress : Fiber) : Object {
+function getUnmaskedContext(workInProgress: Fiber): Object {
const hasOwnContext = isContextProvider(workInProgress);
if (hasOwnContext) {
// If the fiber is a context provider itself, when we read its context
@@ -65,14 +65,21 @@ function getUnmaskedContext(workInProgress : Fiber) : Object {
}
exports.getUnmaskedContext = getUnmaskedContext;
-function cacheContext(workInProgress : Fiber, unmaskedContext : Object, maskedContext : Object) {
+function cacheContext(
+ workInProgress: Fiber,
+ unmaskedContext: Object,
+ maskedContext: Object,
+) {
const instance = workInProgress.stateNode;
instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
}
exports.cacheContext = cacheContext;
-exports.getMaskedContext = function(workInProgress : Fiber, unmaskedContext : Object) {
+exports.getMaskedContext = function(
+ workInProgress: Fiber,
+ unmaskedContext: Object,
+) {
const type = workInProgress.type;
const contextTypes = type.contextTypes;
if (!contextTypes) {
@@ -111,27 +118,21 @@ exports.getMaskedContext = function(workInProgress : Fiber, unmaskedContext : Ob
return context;
};
-exports.hasContextChanged = function() : boolean {
+exports.hasContextChanged = function(): boolean {
return didPerformWorkStackCursor.current;
};
-function isContextConsumer(fiber : Fiber) : boolean {
- return (
- fiber.tag === ClassComponent &&
- fiber.type.contextTypes != null
- );
+function isContextConsumer(fiber: Fiber): boolean {
+ return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
}
exports.isContextConsumer = isContextConsumer;
-function isContextProvider(fiber : Fiber) : boolean {
- return (
- fiber.tag === ClassComponent &&
- fiber.type.childContextTypes != null
- );
+function isContextProvider(fiber: Fiber): boolean {
+ return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
}
exports.isContextProvider = isContextProvider;
-function popContextProvider(fiber : Fiber) : void {
+function popContextProvider(fiber: Fiber): void {
if (!isContextProvider(fiber)) {
return;
}
@@ -141,14 +142,25 @@ function popContextProvider(fiber : Fiber) : void {
}
exports.popContextProvider = popContextProvider;
-exports.pushTopLevelContextObject = function(fiber : Fiber, context : Object, didChange : boolean) : void {
- invariant(contextStackCursor.cursor == null, 'Unexpected context found on stack');
+exports.pushTopLevelContextObject = function(
+ fiber: Fiber,
+ context: Object,
+ didChange: boolean,
+): void {
+ invariant(
+ contextStackCursor.cursor == null,
+ 'Unexpected context found on stack',
+ );
push(contextStackCursor, context, fiber);
push(didPerformWorkStackCursor, didChange, fiber);
};
-function processChildContext(fiber : Fiber, parentContext : Object, isReconciling : boolean): Object {
+function processChildContext(
+ fiber: Fiber,
+ parentContext: Object,
+ isReconciling: boolean,
+): Object {
const instance = fiber.stateNode;
const childContextTypes = fiber.type.childContextTypes;
@@ -163,8 +175,8 @@ function processChildContext(fiber : Fiber, parentContext : Object, isReconcilin
warning(
false,
'%s.childContextTypes is specified but there is no getChildContext() method ' +
- 'on the instance. You can either define getChildContext() on %s or remove ' +
- 'childContextTypes from it.',
+ 'on the instance. You can either define getChildContext() on %s or remove ' +
+ 'childContextTypes from it.',
componentName,
componentName,
);
@@ -188,7 +200,7 @@ function processChildContext(fiber : Fiber, parentContext : Object, isReconcilin
contextKey in childContextTypes,
'%s.getChildContext(): key "%s" is not defined in childContextTypes.',
getComponentName(fiber) || 'Unknown',
- contextKey
+ contextKey,
);
}
if (__DEV__) {
@@ -208,7 +220,7 @@ function processChildContext(fiber : Fiber, parentContext : Object, isReconcilin
}
exports.processChildContext = processChildContext;
-exports.pushContextProvider = function(workInProgress : Fiber) : boolean {
+exports.pushContextProvider = function(workInProgress: Fiber): boolean {
if (!isContextProvider(workInProgress)) {
return false;
}
@@ -217,10 +229,9 @@ exports.pushContextProvider = function(workInProgress : Fiber) : boolean {
// We push the context as early as possible to ensure stack integrity.
// If the instance does not exist yet, we will push null at first,
// and replace it on the stack later when invalidating the context.
- const memoizedMergedChildContext = (
- instance &&
- instance.__reactInternalMemoizedMergedChildContext
- ) || emptyObject;
+ const memoizedMergedChildContext = (instance &&
+ instance.__reactInternalMemoizedMergedChildContext) ||
+ emptyObject;
// Remember the parent context so we can merge with it later.
previousContext = contextStackCursor.current;
@@ -230,12 +241,16 @@ exports.pushContextProvider = function(workInProgress : Fiber) : boolean {
return true;
};
-exports.invalidateContextProvider = function(workInProgress : Fiber) : void {
+exports.invalidateContextProvider = function(workInProgress: Fiber): void {
const instance = workInProgress.stateNode;
invariant(instance, 'Expected to have an instance by this point.');
// Merge parent and own context.
- const mergedContext = processChildContext(workInProgress, previousContext, true);
+ const mergedContext = processChildContext(
+ workInProgress,
+ previousContext,
+ true,
+ );
instance.__reactInternalMemoizedMergedChildContext = mergedContext;
// Replace the old (or empty) context with the new one.
@@ -247,21 +262,21 @@ exports.invalidateContextProvider = function(workInProgress : Fiber) : void {
push(didPerformWorkStackCursor, true, workInProgress);
};
-exports.resetContext = function() : void {
+exports.resetContext = function(): void {
previousContext = emptyObject;
contextStackCursor.current = emptyObject;
didPerformWorkStackCursor.current = false;
};
-exports.findCurrentUnmaskedContext = function(fiber: Fiber) : Object {
+exports.findCurrentUnmaskedContext = function(fiber: Fiber): Object {
// Currently this is only used with renderSubtreeIntoContainer; not sure if it
// makes sense elsewhere
invariant(
isFiberMounted(fiber) && fiber.tag === ClassComponent,
- 'Expected subtree parent to be a mounted class component'
+ 'Expected subtree parent to be a mounted class component',
);
- let node : Fiber = fiber;
+ let node: Fiber = fiber;
while (node.tag !== HostRoot) {
if (isContextProvider(node)) {
return node.stateNode.__reactInternalMemoizedMergedChildContext;
diff --git a/src/renderers/shared/fiber/ReactFiberDevToolsHook.js b/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
index 6fc5666845..dbf88b8349 100644
--- a/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
+++ b/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
@@ -14,10 +14,10 @@
var warning = require('fbjs/lib/warning');
-import type { Fiber } from 'ReactFiber';
-import type { FiberRoot } from 'ReactFiberRoot';
+import type {Fiber} from 'ReactFiber';
+import type {FiberRoot} from 'ReactFiberRoot';
-declare var __REACT_DEVTOOLS_GLOBAL_HOOK__ : Object | void;
+declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: Object | void;
let rendererID = null;
let injectInternals = null;
@@ -33,12 +33,12 @@ if (
onCommitFiberUnmount,
} = __REACT_DEVTOOLS_GLOBAL_HOOK__;
- injectInternals = function(internals : Object) {
+ injectInternals = function(internals: Object) {
warning(rendererID == null, 'Cannot inject into DevTools twice.');
rendererID = inject(internals);
};
- onCommitRoot = function(root : FiberRoot) {
+ onCommitRoot = function(root: FiberRoot) {
if (rendererID == null) {
return;
}
@@ -52,7 +52,7 @@ if (
}
};
- onCommitUnmount = function(fiber : Fiber) {
+ onCommitUnmount = function(fiber: Fiber) {
if (rendererID == null) {
return;
}
diff --git a/src/renderers/shared/fiber/ReactFiberErrorLogger.js b/src/renderers/shared/fiber/ReactFiberErrorLogger.js
index 72b4c3cc10..97b162257b 100644
--- a/src/renderers/shared/fiber/ReactFiberErrorLogger.js
+++ b/src/renderers/shared/fiber/ReactFiberErrorLogger.js
@@ -15,11 +15,11 @@
const emptyFunction = require('fbjs/lib/emptyFunction');
const invariant = require('fbjs/lib/invariant');
-import type { CapturedError } from 'ReactFiberScheduler';
+import type {CapturedError} from 'ReactFiberScheduler';
let showDialog = emptyFunction;
-function logCapturedError(capturedError : CapturedError) : void {
+function logCapturedError(capturedError: CapturedError): void {
if (__DEV__) {
const {
componentName,
@@ -36,9 +36,7 @@ function logCapturedError(capturedError : CapturedError) : void {
stack,
} = error;
- const errorSummary = message
- ? `${name}: ${message}`
- : name;
+ const errorSummary = message ? `${name}: ${message}` : name;
const componentNameMessage = componentName
? `React caught an error thrown by ${componentName}.`
@@ -48,45 +46,43 @@ function logCapturedError(capturedError : CapturedError) : void {
// Chrome prepends the Error name and type.
// Firefox, Safari, and IE don't indent the stack lines.
// Format it in a consistent way for error logging.
- let formattedCallStack = stack.slice(0, errorSummary.length) === errorSummary
+ let formattedCallStack = stack.slice(0, errorSummary.length) ===
+ errorSummary
? stack.slice(errorSummary.length)
: stack;
formattedCallStack = formattedCallStack
.trim()
.split('\n')
- .map((line) => `\n ${line.trim()}`)
+ .map(line => `\n ${line.trim()}`)
.join();
let errorBoundaryMessage;
// errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
if (errorBoundaryFound && errorBoundaryName) {
if (willRetry) {
- errorBoundaryMessage =
- `React will try to recreate this component tree from scratch ` +
+ errorBoundaryMessage = `React will try to recreate this component tree from scratch ` +
`using the error boundary you provided, ${errorBoundaryName}.`;
} else {
- errorBoundaryMessage =
- `This error was initially handled by the error boundary ${errorBoundaryName}. ` +
+ errorBoundaryMessage = `This error was initially handled by the error boundary ${errorBoundaryName}. ` +
`Recreating the tree from scratch failed so React will unmount the tree.`;
}
} else {
// TODO Link to unstable_handleError() documentation once it exists.
- errorBoundaryMessage =
- 'Consider adding an error boundary to your tree to customize error handling behavior.';
+ errorBoundaryMessage = 'Consider adding an error boundary to your tree to customize error handling behavior.';
}
console.error(
`${componentNameMessage} You should fix this error in your code. ${errorBoundaryMessage}\n\n` +
- `${errorSummary}\n\n` +
- `The error is located at: ${componentStack}\n\n` +
- `The error was thrown at: ${formattedCallStack}`
+ `${errorSummary}\n\n` +
+ `The error is located at: ${componentStack}\n\n` +
+ `The error was thrown at: ${formattedCallStack}`,
);
}
if (!__DEV__) {
- const { error } = capturedError;
+ const {error} = capturedError;
console.error(
- `React caught an error thrown by one of your components.\n\n${error.stack}`
+ `React caught an error thrown by one of your components.\n\n${error.stack}`,
);
}
@@ -97,11 +93,10 @@ exports.injection = {
injectDialog(fn) {
invariant(
typeof fn === 'function',
- 'Injected showDialog() must be a function.'
+ 'Injected showDialog() must be a function.',
);
showDialog = fn;
},
};
exports.logCapturedError = logCapturedError;
-
diff --git a/src/renderers/shared/fiber/ReactFiberHostContext.js b/src/renderers/shared/fiber/ReactFiberHostContext.js
index 8962a482ac..b6252bbc0f 100644
--- a/src/renderers/shared/fiber/ReactFiberHostContext.js
+++ b/src/renderers/shared/fiber/ReactFiberHostContext.js
@@ -12,9 +12,9 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
-import type { HostConfig } from 'ReactFiberReconciler';
-import type { StackCursor } from 'ReactFiberStack';
+import type {Fiber} from 'ReactFiber';
+import type {HostConfig} from 'ReactFiberReconciler';
+import type {StackCursor} from 'ReactFiberStack';
const emptyObject = require('fbjs/lib/emptyObject');
@@ -27,38 +27,40 @@ const {
const invariant = require('fbjs/lib/invariant');
export type HostContext<C, CX> = {
- getHostContext() : CX,
- getRootHostContainer() : C,
- popHostContainer(fiber : Fiber) : void,
- popHostContext(fiber : Fiber) : void,
- pushHostContainer(fiber : Fiber, container : C) : void,
- pushHostContext(fiber : Fiber) : void,
- resetHostContainer() : void,
+ getHostContext(): CX,
+ getRootHostContainer(): C,
+ popHostContainer(fiber: Fiber): void,
+ popHostContext(fiber: Fiber): void,
+ pushHostContainer(fiber: Fiber, container: C): void,
+ pushHostContext(fiber: Fiber): void,
+ resetHostContainer(): void,
};
module.exports = function<T, P, I, TI, PI, C, CX, PL>(
- config : HostConfig<T, P, I, TI, PI, C, CX, PL>
-) : HostContext<C, CX> {
+ config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+): HostContext<C, CX> {
const {
getChildHostContext,
getRootHostContext,
} = config;
- let contextStackCursor : StackCursor<CX | null> = createCursor((null: ?CX));
- let contextFiberStackCursor : StackCursor<Fiber | null> = createCursor((null: Fiber | null));
- let rootInstanceStackCursor : StackCursor<C | null> = createCursor((null: ?C));
+ let contextStackCursor: StackCursor<CX | null> = createCursor((null: ?CX));
+ let contextFiberStackCursor: StackCursor<Fiber | null> = createCursor(
+ (null: Fiber | null),
+ );
+ let rootInstanceStackCursor: StackCursor<C | null> = createCursor((null: ?C));
- function getRootHostContainer() : C {
+ function getRootHostContainer(): C {
const rootInstance = rootInstanceStackCursor.current;
invariant(
rootInstance !== null,
'Expected root container to exist. This error is likely caused by a ' +
- 'bug in React. Please file an issue.'
+ 'bug in React. Please file an issue.',
);
return rootInstance;
}
- function pushHostContainer(fiber : Fiber, nextRootInstance : C) {
+ function pushHostContainer(fiber: Fiber, nextRootInstance: C) {
// Push current root instance onto the stack;
// This allows us to reset root when portals are popped.
push(rootInstanceStackCursor, nextRootInstance, fiber);
@@ -71,33 +73,33 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
push(contextStackCursor, nextRootContext, fiber);
}
- function popHostContainer(fiber : Fiber) {
+ function popHostContainer(fiber: Fiber) {
pop(contextStackCursor, fiber);
pop(contextFiberStackCursor, fiber);
pop(rootInstanceStackCursor, fiber);
}
- function getHostContext() : CX {
+ function getHostContext(): CX {
const context = contextStackCursor.current;
invariant(
context != null,
'Expected host context to exist. This error is likely caused by a bug ' +
- 'in React. Please file an issue.'
+ 'in React. Please file an issue.',
);
return context;
}
- function pushHostContext(fiber : Fiber) : void {
+ function pushHostContext(fiber: Fiber): void {
const rootInstance = rootInstanceStackCursor.current;
invariant(
rootInstance != null,
'Expected root host context to exist. This error is likely caused by ' +
- 'a bug in React. Please file an issue.'
+ 'a bug in React. Please file an issue.',
);
- const context = contextStackCursor.current !== null ?
- contextStackCursor.current :
- emptyObject;
+ const context = contextStackCursor.current !== null
+ ? contextStackCursor.current
+ : emptyObject;
const nextContext = getChildHostContext(context, fiber.type, rootInstance);
// Don't push this Fiber's context unless it's unique.
@@ -111,7 +113,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
push(contextStackCursor, nextContext, fiber);
}
- function popHostContext(fiber : Fiber) : void {
+ function popHostContext(fiber: Fiber): void {
// Do not pop unless this Fiber provided the current context.
// pushHostContext() only pushes Fibers that provide unique contexts.
if (contextFiberStackCursor.current !== fiber) {
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index f1ae92f1a3..75e96aa274 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -12,10 +12,10 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
-import type { FiberRoot } from 'ReactFiberRoot';
-import type { PriorityLevel } from 'ReactPriorityLevel';
-import type { ReactNodeList } from 'ReactTypes';
+import type {Fiber} from 'ReactFiber';
+import type {FiberRoot} from 'ReactFiberRoot';
+import type {PriorityLevel} from 'ReactPriorityLevel';
+import type {ReactNodeList} from 'ReactTypes';
var {
addTopLevelUpdate,
@@ -26,7 +26,7 @@ var {
isContextProvider,
processChildContext,
} = require('ReactFiberContext');
-var { createFiberRoot } = require('ReactFiberRoot');
+var {createFiberRoot} = require('ReactFiberRoot');
var ReactFiberScheduler = require('ReactFiberScheduler');
if (__DEV__) {
@@ -36,106 +36,121 @@ if (__DEV__) {
var getComponentName = require('getComponentName');
}
-var { findCurrentHostFiber } = require('ReactFiberTreeReflection');
+var {findCurrentHostFiber} = require('ReactFiberTreeReflection');
var getContextForSubtree = require('getContextForSubtree');
export type Deadline = {
- timeRemaining : () => number
+ timeRemaining: () => number,
};
type OpaqueHandle = Fiber;
type OpaqueRoot = FiberRoot;
export type HostConfig<T, P, I, TI, PI, C, CX, PL> = {
-
- getRootHostContext(rootContainerInstance : C) : CX,
- getChildHostContext(parentHostContext : CX, type : T) : CX,
- getPublicInstance(instance : I | TI) : PI,
+ getRootHostContext(rootContainerInstance: C): CX,
+ getChildHostContext(parentHostContext: CX, type: T): CX,
+ getPublicInstance(instance: I | TI): PI,
createInstance(
- type : T,
- props : P,
- rootContainerInstance : C,
- hostContext : CX,
- internalInstanceHandle : OpaqueHandle
- ) : I,
- appendInitialChild(parentInstance : I, child : I | TI) : void,
- finalizeInitialChildren(parentInstance : I, type : T, props : P, rootContainerInstance : C) : boolean,
+ type: T,
+ props: P,
+ rootContainerInstance: C,
+ hostContext: CX,
+ internalInstanceHandle: OpaqueHandle,
+ ): I,
+ appendInitialChild(parentInstance: I, child: I | TI): void,
+ finalizeInitialChildren(
+ parentInstance: I,
+ type: T,
+ props: P,
+ rootContainerInstance: C,
+ ): boolean,
prepareUpdate(
- instance : I,
- type : T,
- oldProps : P,
- newProps : P,
- rootContainerInstance : C,
- hostContext : CX
- ) : null | PL,
+ instance: I,
+ type: T,
+ oldProps: P,
+ newProps: P,
+ rootContainerInstance: C,
+ hostContext: CX,
+ ): null | PL,
commitUpdate(
- instance : I,
- updatePayload : PL,
- type : T,
- oldProps : P,
- newProps : P,
- internalInstanceHandle : OpaqueHandle
- ) : void,
- commitMount(instance : I, type : T, newProps : P, internalInstanceHandle : OpaqueHandle) : void,
+ instance: I,
+ updatePayload: PL,
+ type: T,
+ oldProps: P,
+ newProps: P,
+ internalInstanceHandle: OpaqueHandle,
+ ): void,
+ commitMount(
+ instance: I,
+ type: T,
+ newProps: P,
+ internalInstanceHandle: OpaqueHandle,
+ ): void,
- shouldSetTextContent(props : P) : boolean,
- resetTextContent(instance : I) : void,
- shouldDeprioritizeSubtree(type : T, props : P) : boolean,
+ shouldSetTextContent(props: P): boolean,
+ resetTextContent(instance: I): void,
+ shouldDeprioritizeSubtree(type: T, props: P): boolean,
createTextInstance(
- text : string,
- rootContainerInstance : C,
- hostContext : CX,
- internalInstanceHandle : OpaqueHandle
- ) : TI,
- commitTextUpdate(textInstance : TI, oldText : string, newText : string) : void,
+ text: string,
+ rootContainerInstance: C,
+ hostContext: CX,
+ internalInstanceHandle: OpaqueHandle,
+ ): TI,
+ commitTextUpdate(textInstance: TI, oldText: string, newText: string): void,
- appendChild(parentInstance : I | C, child : I | TI) : void,
- insertBefore(parentInstance : I | C, child : I | TI, beforeChild : I | TI) : void,
- removeChild(parentInstance : I | C, child : I | TI) : void,
+ appendChild(parentInstance: I | C, child: I | TI): void,
+ insertBefore(parentInstance: I | C, child: I | TI, beforeChild: I | TI): void,
+ removeChild(parentInstance: I | C, child: I | TI): void,
- scheduleAnimationCallback(callback : () => void) : number | void,
- scheduleDeferredCallback(callback : (deadline : Deadline) => void) : number | void,
+ scheduleAnimationCallback(callback: () => void): number | void,
+ scheduleDeferredCallback(callback: (deadline: Deadline) => void):
+ | number
+ | void,
- prepareForCommit() : void,
- resetAfterCommit() : void,
+ prepareForCommit(): void,
+ resetAfterCommit(): void,
- useSyncScheduling ?: boolean,
+ useSyncScheduling?: boolean,
};
export type Reconciler<C, I, TI> = {
- createContainer(containerInfo : C) : OpaqueRoot,
+ createContainer(containerInfo: C): OpaqueRoot,
updateContainer(
- element : ReactNodeList,
- container : OpaqueRoot,
- parentComponent : ?ReactComponent<any, any, any>
- ) : void,
- performWithPriority(priorityLevel : PriorityLevel, fn : Function) : void,
- batchedUpdates<A>(fn : () => A) : A,
- unbatchedUpdates<A>(fn : () => A) : A,
- syncUpdates<A>(fn : () => A) : A,
- deferredUpdates<A>(fn : () => A) : A,
+ element: ReactNodeList,
+ container: OpaqueRoot,
+ parentComponent: ?ReactComponent<any, any, any>,
+ ): void,
+ performWithPriority(priorityLevel: PriorityLevel, fn: Function): void,
+ batchedUpdates<A>(fn: () => A): A,
+ unbatchedUpdates<A>(fn: () => A): A,
+ syncUpdates<A>(fn: () => A): A,
+ deferredUpdates<A>(fn: () => A): A,
// Used to extract the return value from the initial render. Legacy API.
- getPublicRootInstance(container : OpaqueRoot) : (ReactComponent<any, any, any> | TI | I | null),
+ getPublicRootInstance(container: OpaqueRoot):
+ | ReactComponent<any, any, any>
+ | TI
+ | I
+ | null,
// Use for findDOMNode/findHostNode. Legacy API.
- findHostInstance(component : Fiber) : I | TI | null,
+ findHostInstance(component: Fiber): I | TI | null,
};
-getContextForSubtree._injectFiber(function(fiber : Fiber) {
+getContextForSubtree._injectFiber(function(fiber: Fiber) {
const parentContext = findCurrentUnmaskedContext(fiber);
- return isContextProvider(fiber) ?
- processChildContext(fiber, parentContext, false) :
- parentContext;
+ return isContextProvider(fiber)
+ ? processChildContext(fiber, parentContext, false)
+ : parentContext;
});
module.exports = function<T, P, I, TI, PI, C, CX, PL>(
- config : HostConfig<T, P, I, TI, PI, C, CX, PL>
-) : Reconciler<C, I, TI> {
+ config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+): Reconciler<C, I, TI> {
var {
scheduleUpdate,
getPriorityContext,
@@ -146,7 +161,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
deferredUpdates,
} = ReactFiberScheduler(config);
- function scheduleTopLevelUpdate(current : Fiber, element : ReactNodeList, callback : ?Function) {
+ function scheduleTopLevelUpdate(
+ current: Fiber,
+ element: ReactNodeList,
+ callback: ?Function,
+ ) {
if (__DEV__) {
if (
ReactDebugCurrentFiber.phase === 'render' &&
@@ -155,23 +174,23 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
warning(
false,
'Render methods should be a pure function of props and state; ' +
- 'triggering nested component updates from render is not allowed. ' +
- 'If necessary, trigger nested updates in componentDidUpdate.\n\n' +
- 'Check the render method of %s.',
- getComponentName(ReactDebugCurrentFiber.current) || 'Unknown'
+ 'triggering nested component updates from render is not allowed. ' +
+ 'If necessary, trigger nested updates in componentDidUpdate.\n\n' +
+ 'Check the render method of %s.',
+ getComponentName(ReactDebugCurrentFiber.current) || 'Unknown',
);
}
}
const priorityLevel = getPriorityContext();
- const nextState = { element };
+ const nextState = {element};
callback = callback === undefined ? null : callback;
if (__DEV__) {
warning(
callback === null || typeof callback === 'function',
'render(...): Expected the last optional `callback` argument to be a ' +
- 'function. Instead received: %s.',
- callback
+ 'function. Instead received: %s.',
+ callback,
);
}
addTopLevelUpdate(current, nextState, callback, priorityLevel);
@@ -179,17 +198,16 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
}
return {
-
- createContainer(containerInfo : C) : OpaqueRoot {
+ createContainer(containerInfo: C): OpaqueRoot {
return createFiberRoot(containerInfo);
},
updateContainer(
- element : ReactNodeList,
- container : OpaqueRoot,
- parentComponent : ?ReactComponent<any, any, any>,
- callback: ?Function
- ) : void {
+ element: ReactNodeList,
+ container: OpaqueRoot,
+ parentComponent: ?ReactComponent<any, any, any>,
+ callback: ?Function,
+ ): void {
// TODO: If this is a nested container, this won't be the root.
const current = container.current;
@@ -225,7 +243,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
deferredUpdates,
- getPublicRootInstance(container : OpaqueRoot) : (ReactComponent<any, any, any> | I | TI | null) {
+ getPublicRootInstance(
+ container: OpaqueRoot,
+ ): ReactComponent<any, any, any> | I | TI | null {
const containerFiber = container.current;
if (!containerFiber.child) {
return null;
@@ -233,14 +253,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
return containerFiber.child.stateNode;
},
- findHostInstance(fiber : Fiber) : I | TI | null {
+ findHostInstance(fiber: Fiber): I | TI | null {
const hostFiber = findCurrentHostFiber(fiber);
if (hostFiber === null) {
return null;
}
return hostFiber.stateNode;
},
-
};
-
};
diff --git a/src/renderers/shared/fiber/ReactFiberRoot.js b/src/renderers/shared/fiber/ReactFiberRoot.js
index f93dff9ba3..409b706554 100644
--- a/src/renderers/shared/fiber/ReactFiberRoot.js
+++ b/src/renderers/shared/fiber/ReactFiberRoot.js
@@ -12,9 +12,9 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
-const { createHostRootFiber } = require('ReactFiber');
+const {createHostRootFiber} = require('ReactFiber');
export type FiberRoot = {
// Any additional information from the host associated with this root.
@@ -30,7 +30,7 @@ export type FiberRoot = {
pendingContext: Object | null,
};
-exports.createFiberRoot = function(containerInfo : any) : FiberRoot {
+exports.createFiberRoot = function(containerInfo: any): FiberRoot {
// Cyclic construction. This cheats the type system right now because
// stateNode is any.
const uninitializedFiber = createHostRootFiber();
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 3f1698d4c8..290efb7cab 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -12,34 +12,34 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
-import type { FiberRoot } from 'ReactFiberRoot';
-import type { HostConfig, Deadline } from 'ReactFiberReconciler';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {Fiber} from 'ReactFiber';
+import type {FiberRoot} from 'ReactFiberRoot';
+import type {HostConfig, Deadline} from 'ReactFiberReconciler';
+import type {PriorityLevel} from 'ReactPriorityLevel';
export type CapturedError = {
- componentName : ?string,
- componentStack : string,
- error : Error,
- errorBoundary : ?Object,
- errorBoundaryFound : boolean,
- errorBoundaryName : string | null,
- willRetry : boolean,
+ componentName: ?string,
+ componentStack: string,
+ error: Error,
+ errorBoundary: ?Object,
+ errorBoundaryFound: boolean,
+ errorBoundaryName: string | null,
+ willRetry: boolean,
};
export type HandleErrorInfo = {
- componentStack : string,
+ componentStack: string,
};
var {
popContextProvider,
} = require('ReactFiberContext');
-const { reset } = require('ReactFiberStack');
+const {reset} = require('ReactFiberStack');
var {
getStackAddendumByWorkInProgressFiber,
} = require('ReactFiberComponentTreeHook');
-var { logCapturedError } = require('ReactFiberErrorLogger');
-var { invokeGuardedCallback } = require('ReactErrorUtils');
+var {logCapturedError} = require('ReactFiberErrorLogger');
+var {invokeGuardedCallback} = require('ReactErrorUtils');
var ReactFiberBeginWork = require('ReactFiberBeginWork');
var ReactFiberCompleteWork = require('ReactFiberCompleteWork');
@@ -49,8 +49,8 @@ var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactFeatureFlags = require('ReactFeatureFlags');
var getComponentName = require('getComponentName');
-var { cloneFiber } = require('ReactFiber');
-var { onCommitRoot } = require('ReactFiberDevToolsHook');
+var {cloneFiber} = require('ReactFiber');
+var {onCommitRoot} = require('ReactFiberDevToolsHook');
var {
NoWork,
@@ -110,19 +110,19 @@ if (__DEV__) {
stopCommitLifeCyclesTimer,
} = require('ReactDebugFiberPerf');
- var warnAboutUpdateOnUnmounted = function(instance : ReactClass<any>) {
+ var warnAboutUpdateOnUnmounted = function(instance: ReactClass<any>) {
const ctor = instance.constructor;
warning(
false,
'Can only update a mounted or mounting component. This usually means ' +
- 'you called setState, replaceState, or forceUpdate on an unmounted ' +
- 'component. This is a no-op.\n\nPlease check the code for the ' +
- '%s component.',
- ctor && (ctor.displayName || ctor.name) || 'ReactClass'
+ 'you called setState, replaceState, or forceUpdate on an unmounted ' +
+ 'component. This is a no-op.\n\nPlease check the code for the ' +
+ '%s component.',
+ (ctor && (ctor.displayName || ctor.name)) || 'ReactClass',
);
};
- var warnAboutInvalidUpdates = function(instance : ReactClass<any>) {
+ var warnAboutInvalidUpdates = function(instance: ReactClass<any>) {
switch (ReactDebugCurrentFiber.phase) {
case 'getChildContext':
warning(
@@ -134,9 +134,9 @@ if (__DEV__) {
warning(
false,
'Cannot update during an existing state transition (such as within ' +
- '`render` or another component\'s constructor). Render methods should ' +
- 'be a pure function of props and state; constructor side-effects are ' +
- 'an anti-pattern, but can be moved to `componentWillMount`.'
+ "`render` or another component's constructor). Render methods should " +
+ 'be a pure function of props and state; constructor side-effects are ' +
+ 'an anti-pattern, but can be moved to `componentWillMount`.',
);
break;
}
@@ -145,16 +145,18 @@ if (__DEV__) {
var timeHeuristicForUnitOfWork = 1;
-module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P, I, TI, PI, C, CX, PL>) {
+module.exports = function<T, P, I, TI, PI, C, CX, PL>(
+ config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+) {
const hostContext = ReactFiberHostContext(config);
- const { popHostContainer, popHostContext, resetHostContainer } = hostContext;
- const { beginWork, beginFailedWork } = ReactFiberBeginWork(
+ const {popHostContainer, popHostContext, resetHostContainer} = hostContext;
+ const {beginWork, beginFailedWork} = ReactFiberBeginWork(
config,
hostContext,
scheduleUpdate,
getPriorityContext,
);
- const { completeWork } = ReactFiberCompleteWork(config, hostContext);
+ const {completeWork} = ReactFiberCompleteWork(config, hostContext);
const {
commitPlacement,
commitDeletion,
@@ -173,55 +175,55 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
// The priority level to use when scheduling an update.
// TODO: Should we change this to an array? Might be less confusing.
- let priorityContext : PriorityLevel = useSyncScheduling ?
- SynchronousPriority :
- LowPriority;
+ let priorityContext: PriorityLevel = useSyncScheduling
+ ? SynchronousPriority
+ : LowPriority;
// Keep track of this so we can reset the priority context if an error
// is thrown during reconciliation.
- let priorityContextBeforeReconciliation : PriorityLevel = NoWork;
+ let priorityContextBeforeReconciliation: PriorityLevel = NoWork;
// Keeps track of whether we're currently in a work loop.
- let isPerformingWork : boolean = false;
+ let isPerformingWork: boolean = false;
// Keeps track of whether the current deadline has expired.
- let deadlineHasExpired : boolean = false;
+ let deadlineHasExpired: boolean = false;
// Keeps track of whether we should should batch sync updates.
- let isBatchingUpdates : boolean = false;
+ let isBatchingUpdates: boolean = false;
// The next work in progress fiber that we're currently working on.
- let nextUnitOfWork : Fiber | null = null;
- let nextPriorityLevel : PriorityLevel = NoWork;
+ let nextUnitOfWork: Fiber | null = null;
+ let nextPriorityLevel: PriorityLevel = NoWork;
// The next fiber with an effect that we're currently committing.
- let nextEffect : Fiber | null = null;
+ let nextEffect: Fiber | null = null;
- let pendingCommit : Fiber | null = null;
+ let pendingCommit: Fiber | null = null;
// Linked list of roots with scheduled work on them.
- let nextScheduledRoot : FiberRoot | null = null;
- let lastScheduledRoot : FiberRoot | null = null;
+ let nextScheduledRoot: FiberRoot | null = null;
+ let lastScheduledRoot: FiberRoot | null = null;
// Keep track of which host environment callbacks are scheduled.
- let isAnimationCallbackScheduled : boolean = false;
- let isDeferredCallbackScheduled : boolean = false;
+ let isAnimationCallbackScheduled: boolean = false;
+ let isDeferredCallbackScheduled: boolean = false;
// Keep track of which fibers have captured an error that need to be handled.
// Work is removed from this collection after unstable_handleError is called.
- let capturedErrors : Map<Fiber, CapturedError> | null = null;
+ let capturedErrors: Map<Fiber, CapturedError> | null = null;
// Keep track of which fibers have failed during the current batch of work.
// This is a different set than capturedErrors, because it is not reset until
// the end of the batch. This is needed to propagate errors correctly if a
// subtree fails more than once.
- let failedBoundaries : Set<Fiber> | null = null;
+ let failedBoundaries: Set<Fiber> | null = null;
// Error boundaries that captured an error during the current commit.
- let commitPhaseBoundaries : Set<Fiber> | null = null;
- let firstUncaughtError : Error | null = null;
- let fatalError : Error | null = null;
+ let commitPhaseBoundaries: Set<Fiber> | null = null;
+ let firstUncaughtError: Error | null = null;
+ let fatalError: Error | null = null;
- let isCommitting : boolean = false;
- let isUnmounting : boolean = false;
+ let isCommitting: boolean = false;
+ let isUnmounting: boolean = false;
function scheduleAnimationCallback(callback) {
if (!isAnimationCallbackScheduled) {
@@ -250,7 +252,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
// the work loop.
function findNextUnitOfWork() {
// Clear out roots with no more work on them, or if they have uncaught errors
- while (nextScheduledRoot !== null && nextScheduledRoot.current.pendingWorkPriority === NoWork) {
+ while (
+ nextScheduledRoot !== null &&
+ nextScheduledRoot.current.pendingWorkPriority === NoWork
+ ) {
// Unschedule this root.
nextScheduledRoot.isScheduled = false;
// Read the next pointer now.
@@ -273,9 +278,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
let highestPriorityRoot = null;
let highestPriorityLevel = NoWork;
while (root !== null) {
- if (root.current.pendingWorkPriority !== NoWork && (
- highestPriorityLevel === NoWork ||
- highestPriorityLevel > root.current.pendingWorkPriority)) {
+ if (
+ root.current.pendingWorkPriority !== NoWork &&
+ (highestPriorityLevel === NoWork ||
+ highestPriorityLevel > root.current.pendingWorkPriority)
+ ) {
highestPriorityLevel = root.current.pendingWorkPriority;
highestPriorityRoot = root;
}
@@ -293,10 +300,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
// unfortunately this is it.
resetContextStack();
- return cloneFiber(
- highestPriorityRoot.current,
- highestPriorityLevel
- );
+ return cloneFiber(highestPriorityRoot.current, highestPriorityLevel);
}
nextPriorityLevel = NoWork;
@@ -409,7 +413,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function commitAllWork(finishedWork : Fiber) {
+ function commitAllWork(finishedWork: Fiber) {
// We keep track of this so that captureError can collect any boundaries
// that capture an error during the commit phase. The reason these aren't
// local to this function is because errors that occur during cWU are
@@ -420,12 +424,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
pendingCommit = null;
- const root : FiberRoot = (finishedWork.stateNode : any);
+ const root: FiberRoot = (finishedWork.stateNode: any);
invariant(
root.current !== finishedWork,
'Cannot commit the same tree as before. This is probably a bug ' +
- 'related to the return field. This error is likely caused by a bug ' +
- 'in React. Please file an issue.'
+ 'related to the return field. This error is likely caused by a bug ' +
+ 'in React. Please file an issue.',
);
// Reset this to null before calling lifecycles
@@ -464,7 +468,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
while (nextEffect !== null) {
let error = null;
if (__DEV__) {
- error = invokeGuardedCallback(null, commitAllHostEffects, null, finishedWork);
+ error = invokeGuardedCallback(
+ null,
+ commitAllHostEffects,
+ null,
+ finishedWork,
+ );
} else {
try {
commitAllHostEffects(finishedWork);
@@ -476,7 +485,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
invariant(
nextEffect !== null,
'Should have next effect. This error is likely caused by a bug ' +
- 'in React. Please file an issue.'
+ 'in React. Please file an issue.',
);
captureError(nextEffect, error);
// Clean-up
@@ -508,7 +517,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
while (nextEffect !== null) {
let error = null;
if (__DEV__) {
- error = invokeGuardedCallback(null, commitAllLifeCycles, null, finishedWork);
+ error = invokeGuardedCallback(
+ null,
+ commitAllLifeCycles,
+ null,
+ finishedWork,
+ );
} else {
try {
commitAllLifeCycles(finishedWork);
@@ -520,7 +534,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
invariant(
nextEffect !== null,
'Should have next effect. This error is likely caused by a bug ' +
- 'in React. Please file an issue.'
+ 'in React. Please file an issue.',
);
captureError(nextEffect, error);
if (nextEffect !== null) {
@@ -551,7 +565,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
priorityContext = previousPriorityContext;
}
- function resetWorkPriority(workInProgress : Fiber) {
+ function resetWorkPriority(workInProgress: Fiber) {
let newPriority = NoWork;
// Check for pending update priority. This is usually null so it shouldn't
@@ -569,9 +583,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
let child = workInProgress.progressedChild;
while (child !== null) {
// Ensure that remaining work priority bubbles up.
- if (child.pendingWorkPriority !== NoWork &&
- (newPriority === NoWork ||
- newPriority > child.pendingWorkPriority)) {
+ if (
+ child.pendingWorkPriority !== NoWork &&
+ (newPriority === NoWork || newPriority > child.pendingWorkPriority)
+ ) {
newPriority = child.pendingWorkPriority;
}
child = child.sibling;
@@ -579,7 +594,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
workInProgress.pendingWorkPriority = newPriority;
}
- function completeUnitOfWork(workInProgress : Fiber) : Fiber | null {
+ function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
while (true) {
// The current, flushed, state of this fiber is the alternate.
// Ideally nothing should rely on this, but relying on it here
@@ -665,7 +680,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function performUnitOfWork(workInProgress : Fiber) : Fiber | null {
+ function performUnitOfWork(workInProgress: Fiber): Fiber | null {
// The current, flushed, state of this fiber is the alternate.
// Ideally nothing should rely on this, but relying on it here
// means that we don't need an additional field on the work in
@@ -694,8 +709,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
return next;
}
- function performFailedUnitOfWork(workInProgress : Fiber) : Fiber | null {
-
+ function performFailedUnitOfWork(workInProgress: Fiber): Fiber | null {
// The current, flushed, state of this fiber is the alternate.
// Ideally nothing should rely on this, but relying on it here
// means that we don't need an additional field on the work in
@@ -741,10 +755,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
nextUnitOfWork = findNextUnitOfWork();
}
// Keep performing work until there are no more errors
- while (capturedErrors !== null && capturedErrors.size &&
- nextUnitOfWork !== null &&
- nextPriorityLevel !== NoWork &&
- nextPriorityLevel <= TaskPriority) {
+ while (
+ capturedErrors !== null &&
+ capturedErrors.size &&
+ nextUnitOfWork !== null &&
+ nextPriorityLevel !== NoWork &&
+ nextPriorityLevel <= TaskPriority
+ ) {
if (hasCapturedError(nextUnitOfWork)) {
// Use a forked version of performUnitOfWork
nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
@@ -761,7 +778,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function workLoop(priorityLevel, deadline : Deadline | null) {
+ function workLoop(priorityLevel, deadline: Deadline | null) {
// Clear any errors.
clearErrors();
@@ -813,9 +830,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
// If there's no deadline, or if we're performing Task work, use this loop
// that doesn't check how much time is remaining. It will keep running
// until we run out of work at this priority level.
- while (nextUnitOfWork !== null &&
- nextPriorityLevel !== NoWork &&
- nextPriorityLevel <= priorityLevel) {
+ while (
+ nextUnitOfWork !== null &&
+ nextPriorityLevel !== NoWork &&
+ nextPriorityLevel <= priorityLevel
+ ) {
nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
if (nextUnitOfWork === null) {
nextUnitOfWork = findNextUnitOfWork();
@@ -831,7 +850,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function performWork(priorityLevel : PriorityLevel, deadline : Deadline | null) {
+ function performWork(
+ priorityLevel: PriorityLevel,
+ deadline: Deadline | null,
+ ) {
if (__DEV__) {
startWorkLoopTimer();
}
@@ -839,7 +861,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
invariant(
!isPerformingWork,
'performWork was called recursively. This error is likely caused ' +
- 'by a bug in React. Please file an issue.'
+ 'by a bug in React. Please file an issue.',
);
isPerformingWork = true;
const isPerformingDeferredWork = !!deadline;
@@ -849,9 +871,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
// deferred batch.
while (priorityLevel !== NoWork && !fatalError) {
invariant(
- deadline !== null || (priorityLevel < HighPriority),
+ deadline !== null || priorityLevel < HighPriority,
'Cannot perform deferred work without a deadline. This error is ' +
- 'likely caused by a bug in React. Please file an issue.'
+ 'likely caused by a bug in React. Please file an issue.',
);
// Before starting any work, check to see if there are any pending
@@ -866,7 +888,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
priorityContextBeforeReconciliation = priorityContext;
let error = null;
if (__DEV__) {
- error = invokeGuardedCallback(null, workLoop, null, priorityLevel, deadline);
+ error = invokeGuardedCallback(
+ null,
+ workLoop,
+ null,
+ priorityLevel,
+ deadline,
+ );
} else {
try {
workLoop(priorityLevel, deadline);
@@ -919,7 +947,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
// If have we more work, and we're in a deferred batch, check to see
// if the deadline has expired.
- if (nextPriorityLevel !== NoWork && isPerformingDeferredWork && !deadlineHasExpired) {
+ if (
+ nextPriorityLevel !== NoWork &&
+ isPerformingDeferredWork &&
+ !deadlineHasExpired
+ ) {
// We have more time to do work.
priorityLevel = nextPriorityLevel;
continue;
@@ -970,7 +1002,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
// Returns the boundary that captured the error, or null if the error is ignored
- function captureError(failedWork : Fiber, error : Error) : Fiber | null {
+ function captureError(failedWork: Fiber, error: Error): Fiber | null {
// It is no longer valid because we exited the user code.
ReactCurrentOwner.current = null;
if (__DEV__) {
@@ -981,12 +1013,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
nextUnitOfWork = null;
// Search for the nearest error boundary.
- let boundary : Fiber | null = null;
+ let boundary: Fiber | null = null;
// Passed to logCapturedError()
- let errorBoundaryFound : boolean = false;
- let willRetry : boolean = false;
- let errorBoundaryName : string | null = null;
+ let errorBoundaryFound: boolean = false;
+ let willRetry: boolean = false;
+ let errorBoundaryName: string | null = null;
// Host containers are a special case. If the failed work itself is a host
// container, then it acts as its own boundary. In all other cases, we
@@ -1032,10 +1064,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
// this boundary already captured an error during this commit.
// This case exists because multiple errors can be thrown during
// a single commit without interruption.
- if (commitPhaseBoundaries !== null && (
- commitPhaseBoundaries.has(node) ||
- (node.alternate !== null && commitPhaseBoundaries.has(node.alternate))
- )) {
+ if (
+ commitPhaseBoundaries !== null &&
+ (commitPhaseBoundaries.has(node) ||
+ (node.alternate !== null &&
+ commitPhaseBoundaries.has(node.alternate)))
+ ) {
// If so, we should ignore this error.
return null;
}
@@ -1100,25 +1134,23 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
return null;
}
- function hasCapturedError(fiber : Fiber) : boolean {
+ function hasCapturedError(fiber: Fiber): boolean {
// TODO: capturedErrors should store the boundary instance, to avoid needing
// to check the alternate.
- return (
- capturedErrors !== null &&
- (capturedErrors.has(fiber) || (fiber.alternate !== null && capturedErrors.has(fiber.alternate)))
- );
+ return capturedErrors !== null &&
+ (capturedErrors.has(fiber) ||
+ (fiber.alternate !== null && capturedErrors.has(fiber.alternate)));
}
- function isFailedBoundary(fiber : Fiber) : boolean {
+ function isFailedBoundary(fiber: Fiber): boolean {
// TODO: failedBoundaries should store the boundary instance, to avoid
// needing to check the alternate.
- return (
- failedBoundaries !== null &&
- (failedBoundaries.has(fiber) || (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)))
- );
+ return failedBoundaries !== null &&
+ (failedBoundaries.has(fiber) ||
+ (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)));
}
- function commitErrorHandling(effectfulFiber : Fiber) {
+ function commitErrorHandling(effectfulFiber: Fiber) {
let capturedError;
if (capturedErrors !== null) {
capturedError = capturedErrors.get(effectfulFiber);
@@ -1135,7 +1167,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
invariant(
capturedError != null,
'No error for given unit of work. This error is likely caused by a ' +
- 'bug in React. Please file an issue.'
+ 'bug in React. Please file an issue.',
);
const error = capturedError.error;
@@ -1151,7 +1183,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
case ClassComponent:
const instance = effectfulFiber.stateNode;
- const info : HandleErrorInfo = {
+ const info: HandleErrorInfo = {
componentStack: capturedError.componentStack,
};
@@ -1171,14 +1203,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
invariant(
false,
'Invalid type of work. This error is likely caused by a bug in ' +
- 'React. Please file an issue.'
+ 'React. Please file an issue.',
);
}
}
- function unwindContexts(from : Fiber, to: Fiber) {
+ function unwindContexts(from: Fiber, to: Fiber) {
let node = from;
- while (node !== null && (node !== to) && (node.alternate !== to)) {
+ while (node !== null && node !== to && node.alternate !== to) {
switch (node.tag) {
case ClassComponent:
popContextProvider(node);
@@ -1200,7 +1232,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function scheduleRoot(root : FiberRoot, priorityLevel : PriorityLevel) {
+ function scheduleRoot(root: FiberRoot, priorityLevel: PriorityLevel) {
if (priorityLevel === NoWork) {
return;
}
@@ -1219,7 +1251,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function scheduleUpdate(fiber : Fiber, priorityLevel : PriorityLevel) {
+ function scheduleUpdate(fiber: Fiber, priorityLevel: PriorityLevel) {
if (__DEV__) {
recordScheduleUpdate();
}
@@ -1245,15 +1277,19 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
// we reach a node whose priority matches (and whose alternate's priority
// matches) we can exit safely knowing that the rest of the path is correct.
shouldContinue = false;
- if (node.pendingWorkPriority === NoWork ||
- node.pendingWorkPriority > priorityLevel) {
+ if (
+ node.pendingWorkPriority === NoWork ||
+ node.pendingWorkPriority > priorityLevel
+ ) {
// Priority did not match. Update and keep going.
shouldContinue = true;
node.pendingWorkPriority = priorityLevel;
}
if (node.alternate !== null) {
- if (node.alternate.pendingWorkPriority === NoWork ||
- node.alternate.pendingWorkPriority > priorityLevel) {
+ if (
+ node.alternate.pendingWorkPriority === NoWork ||
+ node.alternate.pendingWorkPriority > priorityLevel
+ ) {
// Priority did not match. Update and keep going.
shouldContinue = true;
node.alternate.pendingWorkPriority = priorityLevel;
@@ -1261,7 +1297,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
if (node.return === null) {
if (node.tag === HostRoot) {
- const root : FiberRoot = (node.stateNode : any);
+ const root: FiberRoot = (node.stateNode: any);
scheduleRoot(root, priorityLevel);
// Depending on the priority level, either perform work now or
// schedule a callback to perform work later.
@@ -1295,20 +1331,23 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function getPriorityContext() : PriorityLevel {
+ function getPriorityContext(): PriorityLevel {
// If we're in a batch, or if we're already performing work, downgrade sync
// priority to task priority
- if (priorityContext === SynchronousPriority && (isPerformingWork || isBatchingUpdates)) {
+ if (
+ priorityContext === SynchronousPriority &&
+ (isPerformingWork || isBatchingUpdates)
+ ) {
return TaskPriority;
}
return priorityContext;
}
- function scheduleErrorRecovery(fiber : Fiber) {
+ function scheduleErrorRecovery(fiber: Fiber) {
scheduleUpdate(fiber, TaskPriority);
}
- function performWithPriority(priorityLevel : PriorityLevel, fn : Function) {
+ function performWithPriority(priorityLevel: PriorityLevel, fn: Function) {
const previousPriorityContext = priorityContext;
priorityContext = priorityLevel;
try {
@@ -1318,7 +1357,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function batchedUpdates<A, R>(fn : (a: A) => R, a : A) : R {
+ function batchedUpdates<A, R>(fn: (a: A) => R, a: A): R {
const previousIsBatchingUpdates = isBatchingUpdates;
isBatchingUpdates = true;
try {
@@ -1333,7 +1372,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function unbatchedUpdates<A>(fn : () => A) : A {
+ function unbatchedUpdates<A>(fn: () => A): A {
const previousIsBatchingUpdates = isBatchingUpdates;
isBatchingUpdates = false;
try {
@@ -1343,7 +1382,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function syncUpdates<A>(fn : () => A) : A {
+ function syncUpdates<A>(fn: () => A): A {
const previousPriorityContext = priorityContext;
priorityContext = SynchronousPriority;
try {
@@ -1353,7 +1392,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
}
}
- function deferredUpdates<A>(fn : () => A) : A {
+ function deferredUpdates<A>(fn: () => A): A {
const previousPriorityContext = priorityContext;
priorityContext = LowPriority;
try {
diff --git a/src/renderers/shared/fiber/ReactFiberStack.js b/src/renderers/shared/fiber/ReactFiberStack.js
index 9ba1734274..697271eaee 100644
--- a/src/renderers/shared/fiber/ReactFiberStack.js
+++ b/src/renderers/shared/fiber/ReactFiberStack.js
@@ -12,36 +12,33 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
export type StackCursor<T> = {
- current: T
+ current: T,
};
const warning = require('fbjs/lib/warning');
-const valueStack : Array<any> = [];
+const valueStack: Array<any> = [];
if (__DEV__) {
- var fiberStack : Array<Fiber | null> = [];
+ var fiberStack: Array<Fiber | null> = [];
}
let index = -1;
-exports.createCursor = function<T>(defaultValue : T) : StackCursor<T> {
+exports.createCursor = function<T>(defaultValue: T): StackCursor<T> {
return {
current: defaultValue,
};
};
-exports.isEmpty = function() : boolean {
+exports.isEmpty = function(): boolean {
return index === -1;
};
-exports.pop = function<T>(
- cursor : StackCursor<T>,
- fiber: Fiber,
-) : void {
+exports.pop = function<T>(cursor: StackCursor<T>, fiber: Fiber): void {
if (index < 0) {
if (__DEV__) {
warning(false, 'Unexpected pop.');
@@ -67,10 +64,10 @@ exports.pop = function<T>(
};
exports.push = function<T>(
- cursor : StackCursor<T>,
- value : T,
+ cursor: StackCursor<T>,
+ value: T,
fiber: Fiber,
-) : void {
+): void {
index++;
valueStack[index] = cursor.current;
@@ -82,7 +79,7 @@ exports.push = function<T>(
cursor.current = value;
};
-exports.reset = function() : void {
+exports.reset = function(): void {
while (index > -1) {
valueStack[index] = null;
diff --git a/src/renderers/shared/fiber/ReactFiberTreeReflection.js b/src/renderers/shared/fiber/ReactFiberTreeReflection.js
index 3dd34069df..1cd0dea6ed 100644
--- a/src/renderers/shared/fiber/ReactFiberTreeReflection.js
+++ b/src/renderers/shared/fiber/ReactFiberTreeReflection.js
@@ -12,7 +12,7 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
var ReactInstanceMap = require('ReactInstanceMap');
var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
@@ -40,7 +40,7 @@ var MOUNTING = 1;
var MOUNTED = 2;
var UNMOUNTED = 3;
-function isFiberMountedImpl(fiber : Fiber) : number {
+function isFiberMountedImpl(fiber: Fiber): number {
let node = fiber;
if (!fiber.alternate) {
// If there is no alternate, this might be a new tree that isn't inserted
@@ -68,30 +68,32 @@ function isFiberMountedImpl(fiber : Fiber) : number {
// that has been unmounted.
return UNMOUNTED;
}
-exports.isFiberMounted = function(fiber : Fiber) : boolean {
+exports.isFiberMounted = function(fiber: Fiber): boolean {
return isFiberMountedImpl(fiber) === MOUNTED;
};
-exports.isMounted = function(component : ReactComponent<any, any, any>) : boolean {
+exports.isMounted = function(
+ component: ReactComponent<any, any, any>,
+): boolean {
if (__DEV__) {
- const owner = (ReactCurrentOwner.current : any);
+ const owner = (ReactCurrentOwner.current: any);
if (owner !== null && owner.tag === ClassComponent) {
- const ownerFiber : Fiber = owner;
+ const ownerFiber: Fiber = owner;
const instance = ownerFiber.stateNode;
warning(
instance._warnedAboutRefsInRender,
'%s is accessing isMounted inside its render() function. ' +
- 'render() should be a pure function of props and state. It should ' +
- 'never access something that requires stale data from the previous ' +
- 'render, such as refs. Move this logic to componentDidMount and ' +
- 'componentDidUpdate instead.',
- getComponentName(ownerFiber) || 'A component'
+ 'render() should be a pure function of props and state. It should ' +
+ 'never access something that requires stale data from the previous ' +
+ 'render, such as refs. Move this logic to componentDidMount and ' +
+ 'componentDidUpdate instead.',
+ getComponentName(ownerFiber) || 'A component',
);
instance._warnedAboutRefsInRender = true;
}
}
- var fiber : ?Fiber = ReactInstanceMap.get(component);
+ var fiber: ?Fiber = ReactInstanceMap.get(component);
if (!fiber) {
return false;
}
@@ -101,18 +103,18 @@ exports.isMounted = function(component : ReactComponent<any, any, any>) : boolea
function assertIsMounted(fiber) {
invariant(
isFiberMountedImpl(fiber) === MOUNTED,
- 'Unable to find node on an unmounted component.'
+ 'Unable to find node on an unmounted component.',
);
}
-function findCurrentFiberUsingSlowPath(fiber : Fiber) : Fiber | null {
+function findCurrentFiberUsingSlowPath(fiber: Fiber): Fiber | null {
let alternate = fiber.alternate;
if (!alternate) {
// If there is no alternate, then we only need to check if it is mounted.
const state = isFiberMountedImpl(fiber);
invariant(
state !== UNMOUNTED,
- 'Unable to find node on an unmounted component.'
+ 'Unable to find node on an unmounted component.',
);
if (state === MOUNTING) {
return null;
@@ -152,10 +154,7 @@ function findCurrentFiberUsingSlowPath(fiber : Fiber) : Fiber | null {
}
// We should never have an alternate for any mounting node. So the only
// way this could possibly happen is if this was unmounted, if at all.
- invariant(
- false,
- 'Unable to find node on an unmounted component.'
- );
+ invariant(false, 'Unable to find node on an unmounted component.');
}
if (a.return !== b.return) {
@@ -209,21 +208,21 @@ function findCurrentFiberUsingSlowPath(fiber : Fiber) : Fiber | null {
invariant(
didFindChild,
'Child was not found in either parent set. This indicates a bug ' +
- 'related to the return pointer.'
+ 'related to the return pointer.',
);
}
}
invariant(
a.alternate === b,
- 'Return fibers should always be each others\' alternates.'
+ "Return fibers should always be each others' alternates.",
);
}
// If the root is not a host container, we're in a disconnected tree. I.e.
// unmounted.
invariant(
a.tag === HostRoot,
- 'Unable to find node on an unmounted component.'
+ 'Unable to find node on an unmounted component.',
);
if (a.stateNode.current === a) {
// We've determined that A is the current branch.
@@ -234,14 +233,14 @@ function findCurrentFiberUsingSlowPath(fiber : Fiber) : Fiber | null {
}
exports.findCurrentFiberUsingSlowPath = findCurrentFiberUsingSlowPath;
-exports.findCurrentHostFiber = function(parent : Fiber) : Fiber | null {
+exports.findCurrentHostFiber = function(parent: Fiber): Fiber | null {
const currentParent = findCurrentFiberUsingSlowPath(parent);
if (!currentParent) {
return null;
}
// Next we'll drill down this component to find the first HostComponent/Text.
- let node : Fiber = currentParent;
+ let node: Fiber = currentParent;
while (true) {
if (node.tag === HostComponent || node.tag === HostText) {
return node;
diff --git a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
index 4bef63513f..a246436fff 100644
--- a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
+++ b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
@@ -12,8 +12,8 @@
'use strict';
-import type { Fiber } from 'ReactFiber';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {Fiber} from 'ReactFiber';
+import type {PriorityLevel} from 'ReactPriorityLevel';
const {
Callback: CallbackEffect,
@@ -31,8 +31,8 @@ if (__DEV__) {
}
type PartialState<State, Props> =
- $Subtype<State> |
- (prevState: State, props: Props) => $Subtype<State>;
+ | $Subtype<State>
+ | ((prevState: State, props: Props) => $Subtype<State>);
// Callbacks are not validated until invocation
type Callback = mixed;
@@ -68,12 +68,14 @@ export type UpdateQueue = {
isProcessing?: boolean,
};
-function comparePriority(a : PriorityLevel, b : PriorityLevel) : number {
+function comparePriority(a: PriorityLevel, b: PriorityLevel): number {
// When comparing update priorities, treat sync and Task work as equal.
// TODO: Could we avoid the need for this by always coercing sync priority
// to Task when scheduling an update?
- if ((a === TaskPriority || a === SynchronousPriority) &&
- (b === TaskPriority || b === SynchronousPriority)) {
+ if (
+ (a === TaskPriority || a === SynchronousPriority) &&
+ (b === TaskPriority || b === SynchronousPriority)
+ ) {
return 0;
}
if (a === NoWork && b !== NoWork) {
@@ -87,7 +89,7 @@ function comparePriority(a : PriorityLevel, b : PriorityLevel) : number {
// Ensures that a fiber has an update queue, creating a new one if needed.
// Returns the new or existing queue.
-function ensureUpdateQueue(fiber : Fiber) : UpdateQueue {
+function ensureUpdateQueue(fiber: Fiber): UpdateQueue {
if (fiber.updateQueue) {
// We already have an update queue.
return fiber.updateQueue;
@@ -116,7 +118,10 @@ function ensureUpdateQueue(fiber : Fiber) : UpdateQueue {
}
// Clones an update queue from a source fiber onto its alternate.
-function cloneUpdateQueue(current : Fiber, workInProgress : Fiber) : UpdateQueue | null {
+function cloneUpdateQueue(
+ current: Fiber,
+ workInProgress: Fiber,
+): UpdateQueue | null {
const currentQueue = current.updateQueue;
if (!currentQueue) {
// The source fiber does not have an update queue.
@@ -139,7 +144,7 @@ function cloneUpdateQueue(current : Fiber, workInProgress : Fiber) : UpdateQueue
}
exports.cloneUpdateQueue = cloneUpdateQueue;
-function cloneUpdate(update : Update) : Update {
+function cloneUpdate(update: Update): Update {
return {
priorityLevel: update.priorityLevel,
partialState: update.partialState,
@@ -170,17 +175,22 @@ function insertUpdateIntoQueue(queue, update, insertAfter, insertBefore) {
// Returns the update after which the incoming update should be inserted into
// the queue, or null if it should be inserted at beginning.
-function findInsertionPosition(queue, update) : Update | null {
+function findInsertionPosition(queue, update): Update | null {
const priorityLevel = update.priorityLevel;
let insertAfter = null;
let insertBefore = null;
- if (queue.last && comparePriority(queue.last.priorityLevel, priorityLevel) <= 0) {
+ if (
+ queue.last && comparePriority(queue.last.priorityLevel, priorityLevel) <= 0
+ ) {
// Fast path for the common case where the update should be inserted at
// the end of the queue.
insertAfter = queue.last;
} else {
insertBefore = queue.first;
- while (insertBefore && comparePriority(insertBefore.priorityLevel, priorityLevel) <= 0) {
+ while (
+ insertBefore &&
+ comparePriority(insertBefore.priorityLevel, priorityLevel) <= 0
+ ) {
insertAfter = insertBefore;
insertBefore = insertBefore.next;
}
@@ -217,7 +227,7 @@ function findInsertionPosition(queue, update) : Update | null {
// we shouldn't make a copy.
//
// If the update is cloned, it returns the cloned update.
-function insertUpdate(fiber : Fiber, update : Update) : Update | null {
+function insertUpdate(fiber: Fiber, update: Update): Update | null {
const queue1 = ensureUpdateQueue(fiber);
const queue2 = fiber.alternate ? ensureUpdateQueue(fiber.alternate) : null;
@@ -227,9 +237,9 @@ function insertUpdate(fiber : Fiber, update : Update) : Update | null {
warning(
false,
'An update (setState, replaceState, or forceUpdate) was scheduled ' +
- 'from inside an update function. Update functions should be pure, ' +
- 'with zero side-effects. Consider using componentDidUpdate or a ' +
- 'callback.'
+ 'from inside an update function. Update functions should be pure, ' +
+ 'with zero side-effects. Consider using componentDidUpdate or a ' +
+ 'callback.',
);
}
}
@@ -275,11 +285,11 @@ function insertUpdate(fiber : Fiber, update : Update) : Update | null {
}
function addUpdate(
- fiber : Fiber,
- partialState : PartialState<any, any> | null,
- callback : mixed,
- priorityLevel : PriorityLevel
-) : void {
+ fiber: Fiber,
+ partialState: PartialState<any, any> | null,
+ callback: mixed,
+ priorityLevel: PriorityLevel,
+): void {
const update = {
priorityLevel,
partialState,
@@ -294,11 +304,11 @@ function addUpdate(
exports.addUpdate = addUpdate;
function addReplaceUpdate(
- fiber : Fiber,
- state : any | null,
- callback : Callback | null,
- priorityLevel : PriorityLevel
-) : void {
+ fiber: Fiber,
+ state: any | null,
+ callback: Callback | null,
+ priorityLevel: PriorityLevel,
+): void {
const update = {
priorityLevel,
partialState: state,
@@ -313,10 +323,10 @@ function addReplaceUpdate(
exports.addReplaceUpdate = addReplaceUpdate;
function addForceUpdate(
- fiber : Fiber,
- callback : Callback | null,
- priorityLevel : PriorityLevel
-) : void {
+ fiber: Fiber,
+ callback: Callback | null,
+ priorityLevel: PriorityLevel,
+): void {
const update = {
priorityLevel,
partialState: null,
@@ -330,21 +340,18 @@ function addForceUpdate(
}
exports.addForceUpdate = addForceUpdate;
-function getPendingPriority(queue : UpdateQueue) : PriorityLevel {
+function getPendingPriority(queue: UpdateQueue): PriorityLevel {
return queue.first ? queue.first.priorityLevel : NoWork;
}
exports.getPendingPriority = getPendingPriority;
function addTopLevelUpdate(
- fiber : Fiber,
- partialState : PartialState<any, any>,
- callback : Callback | null,
- priorityLevel : PriorityLevel
-) : void {
- const isTopLevelUnmount = !!(
- partialState &&
- partialState.element === null
- );
+ fiber: Fiber,
+ partialState: PartialState<any, any>,
+ callback: Callback | null,
+ priorityLevel: PriorityLevel,
+): void {
+ const isTopLevelUnmount = !!(partialState && partialState.element === null);
const update = {
priorityLevel,
@@ -386,13 +393,13 @@ function getStateFromUpdate(update, instance, prevState, props) {
}
function beginUpdateQueue(
- workInProgress : Fiber,
- queue : UpdateQueue,
- instance : any,
- prevState : any,
- props : any,
- priorityLevel : PriorityLevel
-) : any {
+ workInProgress: Fiber,
+ queue: UpdateQueue,
+ instance: any,
+ prevState: any,
+ props: any,
+ priorityLevel: PriorityLevel,
+): any {
if (__DEV__) {
// Set this flag so we can warn if setState is called inside the update
// function of another setState.
@@ -436,7 +443,10 @@ function beginUpdateQueue(
}
// Second condition ignores top-level unmount callbacks if they are not the
// last update in the queue, since a subsequent update will cause a remount.
- if (update.callback !== null && !(update.isTopLevelUnmount && update.next !== null)) {
+ if (
+ update.callback !== null &&
+ !(update.isTopLevelUnmount && update.next !== null)
+ ) {
callbackList = callbackList || [];
callbackList.push(update.callback);
workInProgress.effectTag |= CallbackEffect;
@@ -459,7 +469,11 @@ function beginUpdateQueue(
}
exports.beginUpdateQueue = beginUpdateQueue;
-function commitCallbacks(finishedWork : Fiber, queue : UpdateQueue, context : mixed) {
+function commitCallbacks(
+ finishedWork: Fiber,
+ queue: UpdateQueue,
+ context: mixed,
+) {
const callbackList = queue.callbackList;
if (!callbackList) {
return;
@@ -469,8 +483,8 @@ function commitCallbacks(finishedWork : Fiber, queue : UpdateQueue, context : mi
invariant(
typeof callback === 'function',
'Invalid argument passed as callback. Expected a function. Instead ' +
- 'received: %s',
- callback
+ 'received: %s',
+ callback,
);
callback.call(context);
}
diff --git a/src/renderers/shared/fiber/ReactTypeOfSideEffect.js b/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
index 4420f39e0b..087cf7394d 100644
--- a/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
+++ b/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
@@ -15,13 +15,13 @@
export type TypeOfSideEffect = 0 | 1 | 2 | 3 | 4 | 8 | 16 | 32 | 64;
module.exports = {
- NoEffect: 0, // 0b0000000
- Placement: 1, // 0b0000001
- Update: 2, // 0b0000010
- PlacementAndUpdate: 3, // 0b0000011
- Deletion: 4, // 0b0000100
- ContentReset: 8, // 0b0001000
- Callback: 16, // 0b0010000
- Err: 32, // 0b0100000
- Ref: 64, // 0b1000000
+ NoEffect: 0, // 0b0000000
+ Placement: 1, // 0b0000001
+ Update: 2, // 0b0000010
+ PlacementAndUpdate: 3, // 0b0000011
+ Deletion: 4, // 0b0000100
+ ContentReset: 8, // 0b0001000
+ Callback: 16, // 0b0010000
+ Err: 32, // 0b0100000
+ Ref: 64, // 0b1000000
};
diff --git a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
index f75e4cdd86..88d35fff2f 100644
--- a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
@@ -27,25 +27,25 @@ describe('ReactCoroutine', () => {
});
function div(...children) {
- children = children.map(c => typeof c === 'string' ? { text: c } : c);
- return { type: 'div', children, prop: undefined };
+ children = children.map(c => typeof c === 'string' ? {text: c} : c);
+ return {type: 'div', children, prop: undefined};
}
function span(prop) {
- return { type: 'span', children: [], prop };
+ return {type: 'span', children: [], prop};
}
it('should render a coroutine', () => {
var ops = [];
- function Continuation({ isSame }) {
+ function Continuation({isSame}) {
ops.push(['Continuation', isSame]);
return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
}
// An alternative API could mark Continuation as something that needs
// yielding. E.g. Continuation.yieldType = 123;
- function Child({ bar }) {
+ function Child({bar}) {
ops.push(['Child', bar]);
return ReactCoroutine.createYield({
props: {
@@ -62,9 +62,9 @@ describe('ReactCoroutine', () => {
function HandleYields(props, yields) {
ops.push('HandleYields');
- return yields.map(y =>
+ return yields.map(y => (
<y.continuation isSame={props.foo === y.props.bar} />
- );
+ ));
}
// An alternative API could mark Parent as something that needs
@@ -74,7 +74,7 @@ describe('ReactCoroutine', () => {
return ReactCoroutine.createCoroutine(
props.children,
HandleYields,
- props
+ props,
);
}
@@ -98,19 +98,16 @@ describe('ReactCoroutine', () => {
['Continuation', false],
]);
expect(ReactNoop.getChildren()).toEqual([
- div(
- span('foo==bar'),
- span('foo!=bar'),
- ),
+ div(span('foo==bar'), span('foo!=bar')),
]);
});
it('should update a coroutine', () => {
- function Continuation({ isSame }) {
+ function Continuation({isSame}) {
return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
}
- function Child({ bar }) {
+ function Child({bar}) {
return ReactCoroutine.createYield({
props: {
bar: bar,
@@ -124,16 +121,16 @@ describe('ReactCoroutine', () => {
}
function HandleYields(props, yields) {
- return yields.map(y =>
+ return yields.map(y => (
<y.continuation isSame={props.foo === y.props.bar} />
- );
+ ));
}
function Parent(props) {
return ReactCoroutine.createCoroutine(
props.children,
HandleYields,
- props
+ props,
);
}
@@ -144,19 +141,13 @@ describe('ReactCoroutine', () => {
ReactNoop.render(<App foo={true} />);
ReactNoop.flush();
expect(ReactNoop.getChildren()).toEqual([
- div(
- span('foo==bar'),
- span('foo!=bar'),
- ),
+ div(span('foo==bar'), span('foo!=bar')),
]);
ReactNoop.render(<App foo={false} />);
ReactNoop.flush();
expect(ReactNoop.getChildren()).toEqual([
- div(
- span('foo!=bar'),
- span('foo==bar'),
- ),
+ div(span('foo!=bar'), span('foo==bar')),
]);
});
@@ -194,7 +185,7 @@ describe('ReactCoroutine', () => {
return ReactCoroutine.createCoroutine(
this.props.children,
HandleYields,
- this.props
+ this.props,
);
}
componentWillUnmount() {
@@ -205,12 +196,7 @@ describe('ReactCoroutine', () => {
ReactNoop.render(<Parent><Child /></Parent>);
ReactNoop.flush();
- expect(ops).toEqual([
- 'Parent',
- 'Child',
- 'HandleYields',
- 'Continuation',
- ]);
+ expect(ops).toEqual(['Parent', 'Child', 'HandleYields', 'Continuation']);
ops = [];
@@ -222,7 +208,6 @@ describe('ReactCoroutine', () => {
'Unmount Child',
'Unmount Continuation',
]);
-
});
it('should handle deep updates in coroutine', () => {
@@ -238,31 +223,19 @@ describe('ReactCoroutine', () => {
function App(props) {
return ReactCoroutine.createCoroutine(
- [
- <Counter id="a" />,
- <Counter id="b" />,
- <Counter id="c" />,
- ],
+ [<Counter id="a" />, <Counter id="b" />, <Counter id="c" />],
(p, yields) => yields.map(y => <span prop={y * 100} />),
- {}
+ {},
);
}
ReactNoop.render(<App />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- span(500),
- span(500),
- span(500),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([span(500), span(500), span(500)]);
instances.a.setState({value: 1});
instances.b.setState({value: 2});
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- span(100),
- span(200),
- span(500),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([span(100), span(200), span(500)]);
});
});
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
index 7b3997e74a..96a3f032e5 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -26,7 +26,6 @@ describe('ReactIncremental', () => {
});
it('should render a simple component', () => {
-
function Bar() {
return <div>Hello World</div>;
}
@@ -37,11 +36,9 @@ describe('ReactIncremental', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
-
});
it('should render a simple component, in steps if needed', () => {
-
var renderCallbackCalled = false;
var barCalled = false;
function Bar() {
@@ -52,10 +49,7 @@ describe('ReactIncremental', () => {
var fooCalled = false;
function Foo() {
fooCalled = true;
- return [
- <Bar isBar={true} />,
- <Bar isBar={true} />,
- ];
+ return [<Bar isBar={true} />, <Bar isBar={true} />];
}
ReactNoop.render(<Foo />, () => renderCallbackCalled = true);
@@ -75,7 +69,6 @@ describe('ReactIncremental', () => {
});
it('updates a previous render', () => {
-
var ops = [];
function Header() {
@@ -107,27 +100,39 @@ describe('ReactIncremental', () => {
);
}
- ReactNoop.render(<Foo text="foo" />, () => ops.push('renderCallbackCalled'));
+ ReactNoop.render(<Foo text="foo" />, () =>
+ ops.push('renderCallbackCalled'));
ReactNoop.flush();
- expect(ops).toEqual(['Foo', 'Header', 'Content', 'Footer', 'renderCallbackCalled']);
+ expect(ops).toEqual([
+ 'Foo',
+ 'Header',
+ 'Content',
+ 'Footer',
+ 'renderCallbackCalled',
+ ]);
ops = [];
- ReactNoop.render(<Foo text="bar" />, () => ops.push('firstRenderCallbackCalled'));
- ReactNoop.render(<Foo text="bar" />, () => ops.push('secondRenderCallbackCalled'));
+ ReactNoop.render(<Foo text="bar" />, () =>
+ ops.push('firstRenderCallbackCalled'));
+ ReactNoop.render(<Foo text="bar" />, () =>
+ ops.push('secondRenderCallbackCalled'));
ReactNoop.flush();
// TODO: Test bail out of host components. This is currently unobservable.
// Since this is an update, it should bail out and reuse the work from
// Header and Content.
- expect(ops).toEqual(['Foo', 'Content', 'firstRenderCallbackCalled', 'secondRenderCallbackCalled']);
-
+ expect(ops).toEqual([
+ 'Foo',
+ 'Content',
+ 'firstRenderCallbackCalled',
+ 'secondRenderCallbackCalled',
+ ]);
});
it('can cancel partially rendered work and restart', () => {
-
var ops = [];
function Bar(props) {
@@ -171,11 +176,9 @@ describe('ReactIncremental', () => {
ReactNoop.flush(20);
expect(ops).toEqual(['Foo', 'Bar', 'Bar']);
-
});
it('can deprioritize unfinished work and resume it later', () => {
-
var ops = [];
function Bar(props) {
@@ -225,7 +228,6 @@ describe('ReactIncremental', () => {
ReactNoop.flush();
expect(ops).toEqual(['Middle', 'Middle']);
-
});
it('can deprioritize a tree from without dropping work', () => {
@@ -285,7 +287,6 @@ describe('ReactIncremental', () => {
});
it('can resume work in a subtree even when a parent bails out', () => {
-
var ops = [];
function Bar(props) {
@@ -447,7 +448,6 @@ describe('ReactIncremental', () => {
});
it('can reuse work done after being preempted', () => {
-
var ops = [];
function Bar(props) {
@@ -482,11 +482,7 @@ describe('ReactIncremental', () => {
<div>
<Bar>{props.text2}</Bar>
<div hidden={true}>
- {
- props.step === 0 ?
- step0
- : middleContent
- }
+ {props.step === 0 ? step0 : middleContent}
</div>
</div>
);
@@ -542,7 +538,6 @@ describe('ReactIncremental', () => {
// without restarting.
ReactNoop.flush();
expect(ops).toEqual(['Middle']);
-
});
it('can reuse work that began but did not complete, after being preempted', () => {
@@ -561,7 +556,7 @@ describe('ReactIncremental', () => {
}
class Child extends React.Component {
- state = { step: 0 };
+ state = {step: 0};
render() {
child = this;
ops.push('Child');
@@ -597,12 +592,9 @@ describe('ReactIncremental', () => {
// Begin working on a low priority update to Child, but stop before
// GreatGrandchild. Child and Grandchild begin but don't complete.
- child.setState({ step: 1 });
+ child.setState({step: 1});
ReactNoop.flushDeferredPri(30);
- expect(ops).toEqual([
- 'Child',
- 'Grandchild',
- ]);
+ expect(ops).toEqual(['Child', 'Grandchild']);
// Interrupt the current low pri work with a high pri update elsewhere in
// the tree.
@@ -625,7 +617,6 @@ describe('ReactIncremental', () => {
});
it('can reuse work if shouldComponentUpdate is false, after being preempted', () => {
-
var ops = [];
function Bar(props) {
@@ -708,7 +699,6 @@ describe('ReactIncremental', () => {
// without restarting.
ReactNoop.flush();
expect(ops).toEqual(['Middle']);
-
});
it('memoizes work even if shouldComponentUpdate returns false', () => {
@@ -733,9 +723,7 @@ describe('ReactIncremental', () => {
ops = [];
ReactNoop.render(<Foo step={2} />);
ReactNoop.flush();
- expect(ops).toEqual([
- 'shouldComponentUpdate: false',
- ]);
+ expect(ops).toEqual(['shouldComponentUpdate: false']);
ops = [];
ReactNoop.render(<Foo step={3} />);
@@ -753,7 +741,7 @@ describe('ReactIncremental', () => {
class Bar extends React.Component {
constructor() {
super();
- this.state = { a: 'a' };
+ this.state = {a: 'a'};
instance = this;
}
render() {
@@ -771,10 +759,10 @@ describe('ReactIncremental', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
- expect(instance.state).toEqual({ a: 'a' });
- instance.setState({ b: 'b' });
+ expect(instance.state).toEqual({a: 'a'});
+ instance.setState({b: 'b'});
ReactNoop.flush();
- expect(instance.state).toEqual({ a: 'a', b: 'b' });
+ expect(instance.state).toEqual({a: 'a', b: 'b'});
});
it('can queue multiple state updates', () => {
@@ -782,7 +770,7 @@ describe('ReactIncremental', () => {
class Bar extends React.Component {
constructor() {
super();
- this.state = { a: 'a' };
+ this.state = {a: 'a'};
instance = this;
}
render() {
@@ -801,11 +789,11 @@ describe('ReactIncremental', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
// Call setState multiple times before flushing
- instance.setState({ b: 'b' });
- instance.setState({ c: 'c' });
- instance.setState({ d: 'd' });
+ instance.setState({b: 'b'});
+ instance.setState({c: 'c'});
+ instance.setState({d: 'd'});
ReactNoop.flush();
- expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c', d: 'd' });
+ expect(instance.state).toEqual({a: 'a', b: 'b', c: 'c', d: 'd'});
});
it('can use updater form of setState', () => {
@@ -813,7 +801,7 @@ describe('ReactIncremental', () => {
class Bar extends React.Component {
constructor() {
super();
- this.state = { num: 1 };
+ this.state = {num: 1};
instance = this;
}
render() {
@@ -821,7 +809,7 @@ describe('ReactIncremental', () => {
}
}
- function Foo({ multiplier }) {
+ function Foo({multiplier}) {
return (
<div>
<Bar multiplier={multiplier} />
@@ -830,7 +818,7 @@ describe('ReactIncremental', () => {
}
function updater(state, props) {
- return { num: state.num * props.multiplier };
+ return {num: state.num * props.multiplier};
}
ReactNoop.render(<Foo multiplier={2} />);
@@ -850,7 +838,7 @@ describe('ReactIncremental', () => {
class Bar extends React.Component {
constructor() {
super();
- this.state = { num: 1 };
+ this.state = {num: 1};
instance = this;
}
render() {
@@ -858,7 +846,7 @@ describe('ReactIncremental', () => {
}
}
- function Foo({ multiplier }) {
+ function Foo({multiplier}) {
return (
<div>
<Bar multiplier={multiplier} />
@@ -867,11 +855,11 @@ describe('ReactIncremental', () => {
}
function updater(state, props) {
- return { num: state.num * props.multiplier };
+ return {num: state.num * props.multiplier};
}
function callback() {
- this.setState({ called: true });
+ this.setState({called: true});
}
ReactNoop.render(<Foo multiplier={2} />);
@@ -888,7 +876,7 @@ describe('ReactIncremental', () => {
const Bar = React.createClass({
getInitialState() {
instance = this;
- return { a: 'a' };
+ return {a: 'a'};
},
render() {
return <div>{this.props.children}</div>;
@@ -905,11 +893,11 @@ describe('ReactIncremental', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
- instance.setState({ b: 'b' });
- instance.setState({ c: 'c' });
- instance.replaceState({ d: 'd' });
+ instance.setState({b: 'b'});
+ instance.setState({c: 'c'});
+ instance.replaceState({d: 'd'});
ReactNoop.flush();
- expect(instance.state).toEqual({ d: 'd' });
+ expect(instance.state).toEqual({d: 'd'});
});
it('can forceUpdate', () => {
@@ -958,14 +946,13 @@ describe('ReactIncremental', () => {
var instances = new Set();
class Bar extends React.Component {
- state = { y: 'A' };
+ state = {y: 'A'};
constructor() {
super();
instances.add(this);
}
shouldComponentUpdate(newProps, newState) {
- return this.props.x !== newProps.x ||
- this.state.y !== newState.y;
+ return this.props.x !== newProps.x || this.state.y !== newState.y;
}
render() {
ops.push('Bar:' + this.props.x);
@@ -1007,7 +994,7 @@ describe('ReactIncremental', () => {
var instances = [];
class Bar extends React.Component {
- state = { y: 'A' };
+ state = {y: 'A'};
constructor() {
super();
instances.push(this);
@@ -1062,7 +1049,7 @@ describe('ReactIncremental', () => {
var ops = [];
class LifeCycle extends React.Component {
- state = { x: this.props.x };
+ state = {x: this.props.x};
componentWillMount() {
ops.push('componentWillMount:' + this.state.x + '-' + this.props.x);
}
@@ -1092,10 +1079,7 @@ describe('ReactIncremental', () => {
ReactNoop.render(<App x={0} />);
ReactNoop.flushDeferredPri(30);
- expect(ops).toEqual([
- 'App',
- 'componentWillMount:0-0',
- ]);
+ expect(ops).toEqual(['App', 'componentWillMount:0-0']);
ops = [];
@@ -1168,7 +1152,9 @@ describe('ReactIncremental', () => {
ops.push('componentDidMount:' + this.props.x);
}
componentWillReceiveProps(nextProps) {
- ops.push('componentWillReceiveProps:' + this.props.x + '-' + nextProps.x);
+ ops.push(
+ 'componentWillReceiveProps:' + this.props.x + '-' + nextProps.x,
+ );
}
shouldComponentUpdate(nextProps) {
ops.push('shouldComponentUpdate:' + this.props.x + '-' + nextProps.x);
@@ -1196,10 +1182,7 @@ describe('ReactIncremental', () => {
function App(props) {
ops.push('App');
- return [
- <LifeCycle key="a" x={props.x} />,
- <Sibling key="b" />,
- ];
+ return [<LifeCycle key="a" x={props.x} />, <Sibling key="b" />];
}
ReactNoop.render(<App x={0} />);
@@ -1251,7 +1234,7 @@ describe('ReactIncremental', () => {
var instances = [];
class LifeCycle extends React.Component {
- state = { x: 0 };
+ state = {x: 0};
tick() {
this.setState({
x: this.state.x + 1,
@@ -1287,7 +1270,7 @@ describe('ReactIncremental', () => {
// there is currently an issue where a component can't reuse its render
// output unless it fully completed.
class Wrap extends React.Component {
- state = { y: 0 };
+ state = {y: 0};
componentWillMount() {
instances.push(this);
}
@@ -1311,10 +1294,7 @@ describe('ReactIncremental', () => {
function App(props) {
ops.push('App');
- return [
- <Wrap key="a" />,
- <Sibling key="b" />,
- ];
+ return [<Wrap key="a" />, <Sibling key="b" />];
}
ReactNoop.render(<App y={0} />);
@@ -1395,7 +1375,6 @@ describe('ReactIncremental', () => {
// TODO: Test that we get the expected values for the same scenario with
// incomplete parents.
-
});
it('skips will/DidUpdate when bailing unless an update was already in progress', () => {
@@ -1434,10 +1413,7 @@ describe('ReactIncremental', () => {
}
function App(props) {
- return [
- <LifeCycle x={props.x} />,
- <Sibling />,
- ];
+ return [<LifeCycle x={props.x} />, <Sibling />];
}
ReactNoop.render(<App x={0} />);
@@ -1502,7 +1478,7 @@ describe('ReactIncremental', () => {
var instance;
class Foo extends React.Component {
- state = { n: 0 };
+ state = {n: 0};
render() {
instance = this;
return <div />;
@@ -1515,8 +1491,8 @@ describe('ReactIncremental', () => {
ReactNoop.syncUpdates(() => {
ReactNoop.batchedUpdates(() => {
- instance.setState({ n: 1 }, () => ops.push('setState 1'));
- instance.setState({ n: 2 }, () => ops.push('setState 2'));
+ instance.setState({n: 1}, () => ops.push('setState 1'));
+ instance.setState({n: 2}, () => ops.push('setState 2'));
ops.push('end batchedUpdates');
});
ops.push('end syncUpdates');
@@ -1538,7 +1514,7 @@ describe('ReactIncremental', () => {
var instance;
class Foo extends React.Component {
- state = { n: 0 };
+ state = {n: 0};
render() {
instance = this;
return <div />;
@@ -1551,11 +1527,11 @@ describe('ReactIncremental', () => {
ReactNoop.syncUpdates(() => {
ReactNoop.batchedUpdates(() => {
- instance.setState({ n: 1 }, () => ops.push('setState 1'));
- instance.setState({ n: 2 }, () => ops.push('setState 2'));
+ instance.setState({n: 1}, () => ops.push('setState 1'));
+ instance.setState({n: 2}, () => ops.push('setState 2'));
ReactNoop.batchedUpdates(() => {
- instance.setState({ n: 3 }, () => ops.push('setState 3'));
- instance.setState({ n: 4 }, () => ops.push('setState 4'));
+ instance.setState({n: 3}, () => ops.push('setState 3'));
+ instance.setState({n: 4}, () => ops.push('setState 4'));
ops.push('end inner batchedUpdates');
});
ops.push('end outer batchedUpdates');
@@ -1582,7 +1558,7 @@ describe('ReactIncremental', () => {
var instance;
class Foo extends React.Component {
- state = { n: 0 };
+ state = {n: 0};
render() {
instance = this;
return <div />;
@@ -1593,8 +1569,8 @@ describe('ReactIncremental', () => {
ReactNoop.flush();
ops = [];
- function updater({ n }) {
- return { n: n + 1 };
+ function updater({n}) {
+ return {n: n + 1};
}
instance.setState(updater, () => ops.push('first callback'));
@@ -1609,10 +1585,7 @@ describe('ReactIncremental', () => {
}).toThrow('callback error');
// The third callback isn't called because the second one throws
- expect(ops).toEqual([
- 'first callback',
- 'second callback',
- ]);
+ expect(ops).toEqual(['first callback', 'second callback']);
expect(instance.state.n).toEqual(3);
});
@@ -1707,7 +1680,7 @@ describe('ReactIncremental', () => {
<div>
<ShowBoth />
</div>
- </Intl>
+ </Intl>,
);
ReactNoop.flush();
expect(ops).toEqual([
@@ -1723,7 +1696,7 @@ describe('ReactIncremental', () => {
<div>
<ShowBoth />
</div>
- </Intl>
+ </Intl>,
);
ReactNoop.flush();
expect(ops).toEqual([
@@ -1739,12 +1712,10 @@ describe('ReactIncremental', () => {
<div>
<ShowBoth />
</div>
- </Intl>
+ </Intl>,
);
ReactNoop.flushDeferredPri(15);
- expect(ops).toEqual([
- 'Intl {}',
- ]);
+ expect(ops).toEqual(['Intl {}']);
ops.length = 0;
ReactNoop.render(
@@ -1754,7 +1725,7 @@ describe('ReactIncremental', () => {
<Indirection />
</Router>
<ShowBoth />
- </Intl>
+ </Intl>,
);
ReactNoop.flush();
expect(ops).toEqual([
@@ -1842,7 +1813,7 @@ describe('ReactIncremental', () => {
</Intl>
</div>
<ShowLocale />
- </Intl>
+ </Intl>,
);
ReactNoop.flushDeferredPri(40);
expect(ops).toEqual([
@@ -1930,7 +1901,7 @@ describe('ReactIncremental', () => {
</Stateful>
</IndirectionClass>
</IndirectionFn>
- </Intl>
+ </Intl>,
);
ReactNoop.flush();
expect(ops).toEqual([
@@ -2022,7 +1993,7 @@ describe('ReactIncremental', () => {
<ShowLocaleFn />
</IndirectionClass>
</IndirectionFn>
- </Stateful>
+ </Stateful>,
);
ReactNoop.flush();
expect(ops).toEqual([
@@ -2047,7 +2018,7 @@ describe('ReactIncremental', () => {
// these components even though they don't depend on context.
'IndirectionFn {}',
'IndirectionClass {}',
- // These components depend on context:
+ // These components depend on context:
'ShowLocaleClass:read {"locale":"gr"}',
'ShowLocaleFn:read {"locale":"gr"}',
]);
@@ -2152,17 +2123,17 @@ describe('ReactIncremental', () => {
static contextTypes = {};
componentDidMount(prevProps, prevState) {
ops.push('componentDidMount');
- this.setState({ setStateInCDU: true });
+ this.setState({setStateInCDU: true});
}
componentDidUpdate(prevProps, prevState) {
ops.push('componentDidUpdate');
if (this.state.setStateInCDU) {
- this.setState({ setStateInCDU: false });
+ this.setState({setStateInCDU: false});
}
}
componentWillReceiveProps(nextProps) {
ops.push('componentWillReceiveProps');
- this.setState({ setStateInCDU: true });
+ this.setState({setStateInCDU: true});
}
render() {
ops.push('render');
@@ -2251,8 +2222,8 @@ describe('ReactIncremental', () => {
// At this point our FirstChild component has rendered a second time,
// But since the render is not completed cDU should not be called yet.
expect(renderCounter).toBe(2);
- expect(scuPrevProps).toEqual([{ children: 'A' }]);
- expect(scuNextProps).toEqual([{ children: 'B' }]);
+ expect(scuPrevProps).toEqual([{children: 'A'}]);
+ expect(scuNextProps).toEqual([{children: 'B'}]);
expect(cduPrevProps).toEqual([]);
expect(cduNextProps).toEqual([]);
@@ -2266,9 +2237,9 @@ describe('ReactIncremental', () => {
// Since FirstChild props didn't change, sCU returned false.
// The previous memoized copy should be used.
expect(renderCounter).toBe(2);
- expect(scuPrevProps).toEqual([{ children: 'A' }, { children: 'B' }]);
- expect(scuNextProps).toEqual([{ children: 'B' }, { children: 'B' }]);
- expect(cduPrevProps).toEqual([{ children: 'A' }]);
- expect(cduNextProps).toEqual([{ children: 'B' }]);
+ expect(scuPrevProps).toEqual([{children: 'A'}, {children: 'B'}]);
+ expect(scuNextProps).toEqual([{children: 'B'}, {children: 'B'}]);
+ expect(cduPrevProps).toEqual([{children: 'A'}]);
+ expect(cduNextProps).toEqual([{children: 'B'}]);
});
});
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
index 0af4dc2f10..4b4b415cc7 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
@@ -25,12 +25,12 @@ describe('ReactIncrementalErrorHandling', () => {
});
function div(...children) {
- children = children.map(c => typeof c === 'string' ? { text: c } : c);
- return { type: 'div', children, prop: undefined };
+ children = children.map(c => typeof c === 'string' ? {text: c} : c);
+ return {type: 'div', children, prop: undefined};
}
function span(prop) {
- return { type: 'span', children: [], prop };
+ return {type: 'span', children: [], prop};
}
it('catches render error in a boundary during full deferred mounting', () => {
@@ -41,7 +41,9 @@ describe('ReactIncrementalErrorHandling', () => {
}
render() {
if (this.state.error) {
- return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+ return (
+ <span prop={`Caught an error: ${this.state.error.message}.`} />
+ );
}
return this.props.children;
}
@@ -54,7 +56,7 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<ErrorBoundary>
<BrokenRender />
- </ErrorBoundary>
+ </ErrorBoundary>,
);
ReactNoop.flushDeferredPri();
expect(ReactNoop.getChildren()).toEqual([span('Caught an error: Hello.')]);
@@ -71,7 +73,9 @@ describe('ReactIncrementalErrorHandling', () => {
render() {
if (this.state.error) {
ops.push('ErrorBoundary render error');
- return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+ return (
+ <span prop={`Caught an error: ${this.state.error.message}.`} />
+ );
}
ops.push('ErrorBoundary render success');
return this.props.children;
@@ -86,13 +90,11 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<ErrorBoundary>
<BrokenRender />
- </ErrorBoundary>
+ </ErrorBoundary>,
);
ReactNoop.flushDeferredPri(15);
- expect(ops).toEqual([
- 'ErrorBoundary render success',
- ]);
+ expect(ops).toEqual(['ErrorBoundary render success']);
expect(ReactNoop.getChildren()).toEqual([]);
ops.length = 0;
@@ -116,7 +118,9 @@ describe('ReactIncrementalErrorHandling', () => {
render() {
if (this.state.error) {
ops.push('ErrorBoundary render error');
- return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+ return (
+ <span prop={`Caught an error: ${this.state.error.message}.`} />
+ );
}
ops.push('ErrorBoundary render success');
return this.props.children;
@@ -132,7 +136,7 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<ErrorBoundary>
<BrokenRender />
- </ErrorBoundary>
+ </ErrorBoundary>,
);
});
@@ -157,7 +161,9 @@ describe('ReactIncrementalErrorHandling', () => {
render() {
if (this.state.error) {
ops.push('ErrorBoundary render error');
- return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+ return (
+ <span prop={`Caught an error: ${this.state.error.message}.`} />
+ );
}
ops.push('ErrorBoundary render success');
return this.props.children;
@@ -173,7 +179,7 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<ErrorBoundary>
<BrokenRender />
- </ErrorBoundary>
+ </ErrorBoundary>,
);
});
@@ -197,7 +203,9 @@ describe('ReactIncrementalErrorHandling', () => {
render() {
if (this.state.error) {
ops.push('ErrorBoundary render error');
- return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+ return (
+ <span prop={`Caught an error: ${this.state.error.message}.`} />
+ );
}
ops.push('ErrorBoundary render success');
return this.props.children;
@@ -214,12 +222,12 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<ErrorBoundary>
Before the storm.
- </ErrorBoundary>
+ </ErrorBoundary>,
);
ReactNoop.render(
<ErrorBoundary>
<BrokenRender />
- </ErrorBoundary>
+ </ErrorBoundary>,
);
});
});
@@ -254,7 +262,7 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<RethrowErrorBoundary>
<BrokenRender />
- </RethrowErrorBoundary>
+ </RethrowErrorBoundary>,
);
expect(() => {
@@ -289,13 +297,11 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<RethrowErrorBoundary>
<BrokenRender />
- </RethrowErrorBoundary>
+ </RethrowErrorBoundary>,
);
ReactNoop.flushDeferredPri(15);
- expect(ops).toEqual([
- 'RethrowErrorBoundary render',
- ]);
+ expect(ops).toEqual(['RethrowErrorBoundary render']);
ops.length = 0;
expect(() => {
@@ -330,7 +336,7 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<RethrowErrorBoundary>
<BrokenRender />
- </RethrowErrorBoundary>
+ </RethrowErrorBoundary>,
);
});
@@ -368,7 +374,7 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<RethrowErrorBoundary>
<BrokenRender />
- </RethrowErrorBoundary>
+ </RethrowErrorBoundary>,
);
});
}).toThrow('Hello');
@@ -404,12 +410,12 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<RethrowErrorBoundary>
Before the storm.
- </RethrowErrorBoundary>
+ </RethrowErrorBoundary>,
);
ReactNoop.render(
<RethrowErrorBoundary>
<BrokenRender />
- </RethrowErrorBoundary>
+ </RethrowErrorBoundary>,
);
});
});
@@ -562,7 +568,9 @@ describe('ReactIncrementalErrorHandling', () => {
}
render() {
if (this.state.error) {
- return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+ return (
+ <span prop={`Caught an error: ${this.state.error.message}.`} />
+ );
}
return this.props.children;
}
@@ -576,11 +584,13 @@ describe('ReactIncrementalErrorHandling', () => {
<ErrorBoundary>
<BrokenRender />
</ErrorBoundary>,
- 'a'
+ 'a',
);
ReactNoop.renderToRootWithID(<span prop="b:1" />, 'b');
ReactNoop.flush();
- expect(ReactNoop.getChildren('a')).toEqual([span('Caught an error: Hello.')]);
+ expect(ReactNoop.getChildren('a')).toEqual([
+ span('Caught an error: Hello.'),
+ ]);
expect(ReactNoop.getChildren('b')).toEqual([span('b:1')]);
});
@@ -669,8 +679,8 @@ describe('ReactIncrementalErrorHandling', () => {
it('unwinds the context stack correctly on error', () => {
class Provider extends React.Component {
- static childContextTypes = { message: React.PropTypes.string };
- static contextTypes = { message: React.PropTypes.string };
+ static childContextTypes = {message: React.PropTypes.string};
+ static contextTypes = {message: React.PropTypes.string};
getChildContext() {
return {
message: (this.context.message || '') + this.props.message,
@@ -694,9 +704,9 @@ describe('ReactIncrementalErrorHandling', () => {
}
class Boundary extends React.Component {
- state = { error: null };
+ state = {error: null};
unstable_handleError(error) {
- this.setState({ error });
+ this.setState({error});
}
render() {
return (
@@ -717,14 +727,12 @@ describe('ReactIncrementalErrorHandling', () => {
<Provider message="a">
<Boundary />
<Connector />
- </Provider>
+ </Provider>,
);
ReactNoop.flush();
// If the context stack does not unwind, span will get 'abcde'
- expect(ReactNoop.getChildren()).toEqual([
- span('a'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([span('a')]);
});
it('catches reconciler errors in a boundary during mounting', () => {
@@ -750,15 +758,17 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<ErrorBoundary>
<BrokenRender />
- </ErrorBoundary>
+ </ErrorBoundary>,
);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([span(
- '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.\n\nCheck the render method of `BrokenRender`.'
- )]);
+ expect(ReactNoop.getChildren()).toEqual([
+ span(
+ '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.\n\nCheck the render method of `BrokenRender`.',
+ ),
+ ]);
expect(console.error.calls.count()).toBe(1);
});
@@ -786,22 +796,24 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(
<ErrorBoundary>
<BrokenRender fail={false} />
- </ErrorBoundary>
+ </ErrorBoundary>,
);
ReactNoop.flush();
ReactNoop.render(
<ErrorBoundary>
<BrokenRender fail={true} />
- </ErrorBoundary>
+ </ErrorBoundary>,
);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([span(
- '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.\n\nCheck the render method of `BrokenRender`.'
- )]);
+ expect(ReactNoop.getChildren()).toEqual([
+ span(
+ '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.\n\nCheck the render method of `BrokenRender`.',
+ ),
+ ]);
expect(console.error.calls.count()).toBe(1);
});
@@ -813,9 +825,9 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.flush();
}).toThrowError(
'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.'
+ 'a class/function (for composite components) but got: undefined. ' +
+ "You likely forgot to export your component from the file it's " +
+ 'defined in.',
);
ReactNoop.render(<span prop="hi" />);
@@ -856,7 +868,7 @@ describe('ReactIncrementalErrorHandling', () => {
<Parent>
<BrokenRenderAndUnmount />
</Parent>
- </Parent>
+ </Parent>,
);
ReactNoop.flush();
@@ -906,11 +918,7 @@ describe('ReactIncrementalErrorHandling', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
expect(ops).toEqual(['barRef attach']);
- expect(ReactNoop.getChildren()).toEqual([
- div(
- span('Bar'),
- ),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(span('Bar'))]);
ops = [];
@@ -978,15 +986,15 @@ describe('ReactIncrementalErrorHandling', () => {
const errorMessage = console.error.calls.argsFor(0)[0];
expect(errorMessage).toContain(
'React caught an error thrown by ErrorThrowingComponent. ' +
- 'You should fix this error in your code. ' +
- 'Consider adding an error boundary to your tree to customize error handling behavior.'
+ 'You should fix this error in your code. ' +
+ 'Consider adding an error boundary to your tree to customize error handling behavior.',
);
expect(errorMessage).toContain('Error: componentWillMount error');
expect(normalizeCodeLocInfo(errorMessage)).toContain(
'The error is located at: \n' +
- ' in ErrorThrowingComponent (at **)\n' +
- ' in span (at **)\n' +
- ' in div (at **)'
+ ' in ErrorThrowingComponent (at **)\n' +
+ ' in span (at **)\n' +
+ ' in div (at **)',
);
});
@@ -1012,15 +1020,15 @@ describe('ReactIncrementalErrorHandling', () => {
const errorMessage = console.error.calls.argsFor(0)[0];
expect(errorMessage).toContain(
'React caught an error thrown by ErrorThrowingComponent. ' +
- 'You should fix this error in your code. ' +
- 'Consider adding an error boundary to your tree to customize error handling behavior.'
+ 'You should fix this error in your code. ' +
+ 'Consider adding an error boundary to your tree to customize error handling behavior.',
);
expect(errorMessage).toContain('Error: componentDidMount error');
expect(normalizeCodeLocInfo(errorMessage)).toContain(
'The error is located at: \n' +
- ' in ErrorThrowingComponent (at **)\n' +
- ' in span (at **)\n' +
- ' in div (at **)'
+ ' in ErrorThrowingComponent (at **)\n' +
+ ' in span (at **)\n' +
+ ' in div (at **)',
);
});
@@ -1038,10 +1046,10 @@ describe('ReactIncrementalErrorHandling', () => {
const ReactFiberErrorLogger = require('ReactFiberErrorLogger');
ReactFiberErrorLogger.logCapturedError.mockImplementation(
- (capturedError) => {
+ capturedError => {
logCapturedErrorCalls.push(capturedError);
throw Error('logCapturedError error');
- }
+ },
);
try {
@@ -1053,7 +1061,9 @@ describe('ReactIncrementalErrorHandling', () => {
// The error thrown in logCapturedError should also be logged
expect(console.error.calls.count()).toBe(1);
- expect(console.error.calls.argsFor(0)[0].message).toContain('logCapturedError error');
+ expect(console.error.calls.argsFor(0)[0].message).toContain(
+ 'logCapturedError error',
+ );
});
it('should relay info about error boundary and retry attempts if applicable', () => {
@@ -1099,15 +1109,15 @@ describe('ReactIncrementalErrorHandling', () => {
expect(console.error.calls.count()).toBe(2);
expect(console.error.calls.argsFor(0)[0]).toContain(
'React caught an error thrown by ErrorThrowingComponent. ' +
- 'You should fix this error in your code. ' +
- 'React will try to recreate this component tree from scratch ' +
- 'using the error boundary you provided, ErrorBoundaryComponent.'
+ 'You should fix this error in your code. ' +
+ 'React will try to recreate this component tree from scratch ' +
+ 'using the error boundary you provided, ErrorBoundaryComponent.',
);
expect(console.error.calls.argsFor(1)[0]).toContain(
'React caught an error thrown by ErrorThrowingComponent. ' +
- 'You should fix this error in your code. ' +
- 'This error was initially handled by the error boundary ErrorBoundaryComponent. ' +
- 'Recreating the tree from scratch failed so React will unmount the tree.'
+ 'You should fix this error in your code. ' +
+ 'This error was initially handled by the error boundary ErrorBoundaryComponent. ' +
+ 'Recreating the tree from scratch failed so React will unmount the tree.',
);
});
});
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
index 98780e516c..b4a4748003 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
@@ -41,7 +41,7 @@ describe('ReactDebugFiberPerf', () => {
function addComment(comment) {
activeMeasure.children.push(
- `${' '.repeat(activeMeasure.indent + 1)}// ${comment}`
+ `${' '.repeat(activeMeasure.indent + 1)}// ${comment}`,
);
}
@@ -73,10 +73,9 @@ describe('ReactDebugFiberPerf', () => {
return [
' '.repeat(this.indent) + this.label,
...this.children.map(c => c.toString()),
- ].join('\n') + (
+ ].join('\n') +
// Extra newline after each root reconciliation
- this.indent === 0 ? '\n' : ''
- );
+ (this.indent === 0 ? '\n' : '');
},
};
// Step one level deeper
@@ -175,7 +174,7 @@ describe('ReactDebugFiberPerf', () => {
<Parent>
<B ref={inst => b = inst} />
</Parent>
- </Parent>
+ </Parent>,
);
ReactNoop.flush();
resetFlamechart();
@@ -283,7 +282,7 @@ describe('ReactDebugFiberPerf', () => {
<div hidden={true}>
<Child />
</div>
- </Parent>
+ </Parent>,
);
});
addComment('Flush the parent');
@@ -314,7 +313,7 @@ describe('ReactDebugFiberPerf', () => {
<B>
<Child />
</B>
- </Parent>
+ </Parent>,
);
addComment('Start mounting Parent and A');
ReactNoop.flushDeferredPri(40);
@@ -372,7 +371,7 @@ describe('ReactDebugFiberPerf', () => {
<Baddie />
</Parent>
</Boundary>
- </Parent>
+ </Parent>,
);
addComment('Stop on Baddie and restart from Boundary');
ReactNoop.flush();
@@ -404,7 +403,7 @@ describe('ReactDebugFiberPerf', () => {
<B />
<A />
<B />
- </Parent>
+ </Parent>,
);
ReactNoop.flush();
resetFlamechart();
@@ -415,7 +414,7 @@ describe('ReactDebugFiberPerf', () => {
<B />
<A />
<B />
- </Parent>
+ </Parent>,
);
addComment('The commit phase should mention A and B just once');
ReactNoop.flush();
@@ -425,20 +424,20 @@ describe('ReactDebugFiberPerf', () => {
<B />
<A />
<B cascade={true} />
- </Parent>
+ </Parent>,
);
- addComment('Because of deduplication, we don\'t know B was cascading,');
+ addComment("Because of deduplication, we don't know B was cascading,");
addComment('but we should still see the warning for the commit phase.');
ReactNoop.flush();
expect(getFlameChart()).toMatchSnapshot();
});
it('supports coroutines', () => {
- function Continuation({ isSame }) {
+ function Continuation({isSame}) {
return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
}
- function CoChild({ bar }) {
+ function CoChild({bar}) {
return ReactCoroutine.createYield({
props: {
bar: bar,
@@ -452,16 +451,16 @@ describe('ReactDebugFiberPerf', () => {
}
function HandleYields(props, yields) {
- return yields.map(y =>
+ return yields.map(y => (
<y.continuation isSame={props.foo === y.props.bar} />
- );
+ ));
}
function CoParent(props) {
return ReactCoroutine.createCoroutine(
props.children,
HandleYields,
- props
+ props,
);
}
@@ -479,7 +478,7 @@ describe('ReactDebugFiberPerf', () => {
ReactNoop.render(
<Parent>
{ReactPortal.createPortal(<Child />, noopContainer, null)}
- </Parent>
+ </Parent>,
);
ReactNoop.flush();
expect(getFlameChart()).toMatchSnapshot();
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
index 187ff7095e..bae5b1e35f 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
@@ -25,7 +25,6 @@ describe('ReactIncrementalReflection', () => {
});
it('handles isMounted even when the initial render is deferred', () => {
-
let ops = [];
const instances = [];
@@ -52,9 +51,7 @@ describe('ReactIncrementalReflection', () => {
// Render part way through but don't yet commit the updates.
ReactNoop.flushDeferredPri(20);
- expect(ops).toEqual([
- 'componentWillMount', false,
- ]);
+ expect(ops).toEqual(['componentWillMount', false]);
expect(instances[0].isMounted()).toBe(false);
@@ -63,16 +60,12 @@ describe('ReactIncrementalReflection', () => {
// Render the rest and commit the updates.
ReactNoop.flush();
- expect(ops).toEqual([
- 'componentDidMount', true,
- ]);
+ expect(ops).toEqual(['componentDidMount', true]);
expect(instances[0].isMounted()).toBe(true);
-
});
it('handles isMounted when an unmount is deferred', () => {
-
let ops = [];
const instances = [];
@@ -120,16 +113,12 @@ describe('ReactIncrementalReflection', () => {
// Finish flushing the unmount.
ReactNoop.flush();
- expect(ops).toEqual([
- 'componentWillUnmount', true,
- ]);
+ expect(ops).toEqual(['componentWillUnmount', true]);
expect(instances[0].isMounted()).toBe(false);
-
});
it('finds no node before insertion and correct node before deletion', () => {
-
let ops = [];
let classInstance = null;
@@ -153,15 +142,15 @@ describe('ReactIncrementalReflection', () => {
}
render() {
ops.push('render');
- return this.props.step < 2 ?
- <span ref={ref => this.span = ref} /> :
- this.props.step === 2 ?
- <div ref={ref => this.div = ref} /> :
- this.props.step === 3 ?
- null :
- this.props.step === 4 ?
- <div ref={ref => this.span = ref} /> :
- null;
+ return this.props.step < 2
+ ? <span ref={ref => this.span = ref} />
+ : this.props.step === 2
+ ? <div ref={ref => this.div = ref} />
+ : this.props.step === 3
+ ? null
+ : this.props.step === 4
+ ? <div ref={ref => this.span = ref} />
+ : null;
}
}
@@ -172,10 +161,7 @@ describe('ReactIncrementalReflection', () => {
}
function Foo(props) {
- return [
- <Component step={props.step} />,
- <Sibling />,
- ];
+ return [<Component step={props.step} />, <Sibling />];
}
ReactNoop.render(<Foo step={0} />);
@@ -183,7 +169,8 @@ describe('ReactIncrementalReflection', () => {
ReactNoop.flushDeferredPri(30);
expect(ops).toEqual([
- 'componentWillMount', null,
+ 'componentWillMount',
+ null,
'render',
'render sibling',
]);
@@ -202,9 +189,7 @@ describe('ReactIncrementalReflection', () => {
expect(ReactNoop.findInstance(classInstance)).toBe(hostSpan);
- expect(ops).toEqual([
- 'componentDidMount', hostSpan,
- ]);
+ expect(ops).toEqual(['componentDidMount', hostSpan]);
ops = [];
@@ -214,10 +199,12 @@ describe('ReactIncrementalReflection', () => {
ReactNoop.flush();
expect(ops).toEqual([
- 'componentWillUpdate', hostSpan,
+ 'componentWillUpdate',
+ hostSpan,
'render',
'render sibling',
- 'componentDidUpdate', hostSpan,
+ 'componentDidUpdate',
+ hostSpan,
]);
expect(ReactNoop.findInstance(classInstance)).toBe(hostSpan);
@@ -230,7 +217,8 @@ describe('ReactIncrementalReflection', () => {
ReactNoop.flushDeferredPri(30);
expect(ops).toEqual([
- 'componentWillUpdate', hostSpan,
+ 'componentWillUpdate',
+ hostSpan,
'render',
'render sibling',
]);
@@ -248,9 +236,7 @@ describe('ReactIncrementalReflection', () => {
expect(hostDiv).toBeDefined();
expect(hostSpan).not.toBe(hostDiv);
- expect(ops).toEqual([
- 'componentDidUpdate', hostDiv,
- ]);
+ expect(ops).toEqual(['componentDidUpdate', hostDiv]);
ops = [];
@@ -262,7 +248,8 @@ describe('ReactIncrementalReflection', () => {
ReactNoop.flushDeferredPri(25);
expect(ops).toEqual([
- 'componentWillUpdate', hostDiv,
+ 'componentWillUpdate',
+ hostDiv,
'render',
'render sibling',
]);
@@ -274,9 +261,7 @@ describe('ReactIncrementalReflection', () => {
ReactNoop.flush();
- expect(ops).toEqual([
- 'componentDidUpdate', null,
- ]);
+ expect(ops).toEqual(['componentDidUpdate', null]);
// This should still be the host div since the deletion is not committed.
expect(ReactNoop.findInstance(classInstance)).toBe(null);
@@ -290,8 +275,6 @@ describe('ReactIncrementalReflection', () => {
// Unmount the component.
ReactNoop.render([]);
ReactNoop.flush();
- expect(ops).toEqual([
- 'componentWillUnmount', hostDiv,
- ]);
+ expect(ops).toEqual(['componentWillUnmount', hostDiv]);
});
});
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
index cbc037579d..8bc9176ef3 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
@@ -25,7 +25,7 @@ describe('ReactIncrementalScheduling', () => {
});
function span(prop) {
- return { type: 'span', children: [], prop };
+ return {type: 'span', children: [], prop};
}
it('schedules and flushes deferred work', () => {
@@ -60,12 +60,12 @@ describe('ReactIncrementalScheduling', () => {
it('schedules an animation callback when there`\s leftover animation work', () => {
class Foo extends React.Component {
- state = { step: 0 };
+ state = {step: 0};
componentDidMount() {
ReactNoop.performAnimationWork(() => {
- this.setState({ step: 2 });
+ this.setState({step: 2});
});
- this.setState({ step: 1 });
+ this.setState({step: 1});
}
render() {
return <span prop={this.state.step} />;
@@ -152,11 +152,11 @@ describe('ReactIncrementalScheduling', () => {
var ops = [];
class Foo extends React.Component {
- state = { tick: 0 };
+ state = {tick: 0};
componentDidMount() {
ops.push('componentDidMount (before setState): ' + this.state.tick);
- this.setState({ tick: 1 });
+ this.setState({tick: 1});
// We're in a batch. Update hasn't flushed yet.
ops.push('componentDidMount (after setState): ' + this.state.tick);
}
@@ -165,7 +165,7 @@ describe('ReactIncrementalScheduling', () => {
ops.push('componentDidUpdate: ' + this.state.tick);
if (this.state.tick === 2) {
ops.push('componentDidUpdate (before setState): ' + this.state.tick);
- this.setState({ tick: 3 });
+ this.setState({tick: 3});
ops.push('componentDidUpdate (after setState): ' + this.state.tick);
// We're in a batch. Update hasn't flushed yet.
}
@@ -192,7 +192,7 @@ describe('ReactIncrementalScheduling', () => {
]);
ops = [];
- instance.setState({ tick: 2 });
+ instance.setState({tick: 2});
ReactNoop.flushDeferredPri(20 + 5);
expect(ops).toEqual([
@@ -212,12 +212,12 @@ describe('ReactIncrementalScheduling', () => {
var ops = [];
class Foo extends React.Component {
- state = { tick: 0 };
+ state = {tick: 0};
componentDidMount() {
ReactNoop.performAnimationWork(() => {
ops.push('componentDidMount (before setState): ' + this.state.tick);
- this.setState({ tick: 1 });
+ this.setState({tick: 1});
ops.push('componentDidMount (after setState): ' + this.state.tick);
});
}
@@ -226,8 +226,10 @@ describe('ReactIncrementalScheduling', () => {
ReactNoop.performAnimationWork(() => {
ops.push('componentDidUpdate: ' + this.state.tick);
if (this.state.tick === 2) {
- ops.push('componentDidUpdate (before setState): ' + this.state.tick);
- this.setState({ tick: 3 });
+ ops.push(
+ 'componentDidUpdate (before setState): ' + this.state.tick,
+ );
+ this.setState({tick: 3});
ops.push('componentDidUpdate (after setState): ' + this.state.tick);
}
});
@@ -256,13 +258,10 @@ describe('ReactIncrementalScheduling', () => {
ops = [];
ReactNoop.flushAnimationPri();
- expect(ops).toEqual([
- 'render: 1',
- 'componentDidUpdate: 1',
- ]);
+ expect(ops).toEqual(['render: 1', 'componentDidUpdate: 1']);
ops = [];
- instance.setState({ tick: 2 });
+ instance.setState({tick: 2});
ReactNoop.flushDeferredPri(20 + 5);
expect(ops).toEqual([
@@ -279,20 +278,17 @@ describe('ReactIncrementalScheduling', () => {
ops = [];
ReactNoop.flushAnimationPri();
- expect(ops).toEqual([
- 'render: 3',
- 'componentDidUpdate: 3',
- ]);
+ expect(ops).toEqual(['render: 3', 'componentDidUpdate: 3']);
});
it('performs Task work even after time runs out', () => {
class Foo extends React.Component {
- state = { step: 1 };
+ state = {step: 1};
componentDidMount() {
- this.setState({ step: 2 }, () => {
- this.setState({ step: 3 }, () => {
- this.setState({ step: 4 }, () => {
- this.setState({ step: 5 });
+ this.setState({step: 2}, () => {
+ this.setState({step: 3}, () => {
+ this.setState({step: 4}, () => {
+ this.setState({step: 5});
});
});
});
@@ -315,13 +311,13 @@ describe('ReactIncrementalScheduling', () => {
it('does not perform animation work after time runs out', () => {
class Foo extends React.Component {
- state = { step: 1 };
+ state = {step: 1};
componentDidMount() {
ReactNoop.performAnimationWork(() => {
- this.setState({ step: 2 }, () => {
- this.setState({ step: 3 }, () => {
- this.setState({ step: 4 }, () => {
- this.setState({ step: 5 });
+ this.setState({step: 2}, () => {
+ this.setState({step: 3}, () => {
+ this.setState({step: 4}, () => {
+ this.setState({step: 5});
});
});
});
@@ -374,7 +370,7 @@ describe('ReactIncrementalScheduling', () => {
let instance;
let ops = [];
class Foo extends React.Component {
- state = { step: 0 };
+ state = {step: 0};
componentDidUpdate() {
ops.push('componentDidUpdate: ' + this.state.step);
if (this.state.step === 1) {
@@ -382,7 +378,7 @@ describe('ReactIncrementalScheduling', () => {
// This is a nested state update, so it should not be
// flushed synchronously, even though we wrapped it
// in unbatchedUpdates.
- this.setState({ step: 2 });
+ this.setState({step: 2});
});
expect(ReactNoop.getChildren()).toEqual([span(1)]);
}
@@ -398,7 +394,7 @@ describe('ReactIncrementalScheduling', () => {
expect(ReactNoop.getChildren()).toEqual([span(0)]);
ReactNoop.syncUpdates(() => {
- instance.setState({ step: 1 });
+ instance.setState({step: 1});
expect(ReactNoop.getChildren()).toEqual([span(2)]);
});
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
index 04e3daeebb..97106fbc96 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
@@ -29,16 +29,15 @@ describe('ReactIncrementalSideEffects', () => {
}
function div(...children) {
- children = children.map(c => typeof c === 'string' ? { text: c } : c);
- return { type: 'div', children, prop: undefined };
+ children = children.map(c => typeof c === 'string' ? {text: c} : c);
+ return {type: 'div', children, prop: undefined};
}
function span(prop) {
- return { type: 'span', children: [], prop };
+ return {type: 'span', children: [], prop};
}
it('can update child nodes of a host instance', () => {
-
function Bar(props) {
return <span>{props.text}</span>;
}
@@ -54,20 +53,14 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo text="Hello" />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(span()),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(span())]);
ReactNoop.render(<Foo text="World" />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(span(), span()),
- ]);
-
+ expect(ReactNoop.getChildren()).toEqual([div(span(), span())]);
});
it('can update child nodes of a fragment', function() {
-
function Bar(props) {
return <span>{props.text}</span>;
}
@@ -76,13 +69,11 @@ describe('ReactIncrementalSideEffects', () => {
return (
<div>
<Bar text={props.text} />
- {props.text === 'World' ? [
- <Bar key="a" text={props.text} />,
- <div key="b" />,
- ] : props.text === 'Hi' ? [
- <div key="b" />,
- <Bar key="a" text={props.text} />,
- ] : null}
+ {props.text === 'World'
+ ? [<Bar key="a" text={props.text} />, <div key="b" />]
+ : props.text === 'Hi'
+ ? [<div key="b" />, <Bar key="a" text={props.text} />]
+ : null}
<span prop="test" />
</div>
);
@@ -90,9 +81,7 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo text="Hello" />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(span(), span('test')),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(span(), span('test'))]);
ReactNoop.render(<Foo text="World" />);
ReactNoop.flush();
@@ -105,11 +94,9 @@ describe('ReactIncrementalSideEffects', () => {
expect(ReactNoop.getChildren()).toEqual([
div(span(), div(), span(), span('test')),
]);
-
});
it('can update child nodes rendering into text nodes', function() {
-
function Bar(props) {
return props.text;
}
@@ -118,30 +105,23 @@ describe('ReactIncrementalSideEffects', () => {
return (
<div>
<Bar text={props.text} />
- {props.text === 'World' ? [
- <Bar key="a" text={props.text} />,
- '!',
- ] : null}
+ {props.text === 'World'
+ ? [<Bar key="a" text={props.text} />, '!']
+ : null}
</div>
);
}
ReactNoop.render(<Foo text="Hello" />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div('Hello'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div('Hello')]);
ReactNoop.render(<Foo text="World" />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div('World', 'World', '!'),
- ]);
-
+ expect(ReactNoop.getChildren()).toEqual([div('World', 'World', '!')]);
});
it('can deletes children either components, host or text', function() {
-
function Bar(props) {
return <span prop={props.children} />;
}
@@ -149,11 +129,9 @@ describe('ReactIncrementalSideEffects', () => {
function Foo(props) {
return (
<div>
- {props.show ? [
- <div key="a" />,
- <Bar key="b">Hello</Bar>,
- 'World',
- ] : []}
+ {props.show
+ ? [<div key="a" />, <Bar key="b">Hello</Bar>, 'World']
+ : []}
</div>
);
}
@@ -166,14 +144,10 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo show={false} />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(),
- ]);
-
+ expect(ReactNoop.getChildren()).toEqual([div()]);
});
it('can delete a child that changes type - implicit keys', function() {
-
let unmounted = false;
class ClassComponent extends React.Component {
@@ -192,14 +166,11 @@ describe('ReactIncrementalSideEffects', () => {
function Foo(props) {
return (
<div>
- {props.useClass ?
- <ClassComponent /> :
- props.useFunction ?
- <FunctionalComponent /> :
- props.useText ?
- 'Text' :
- null
- }
+ {props.useClass
+ ? <ClassComponent />
+ : props.useFunction
+ ? <FunctionalComponent />
+ : props.useText ? 'Text' : null}
Trail
</div>
);
@@ -207,36 +178,26 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo useClass={true} />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(span('Class'), 'Trail'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(span('Class'), 'Trail')]);
expect(unmounted).toBe(false);
ReactNoop.render(<Foo useFunction={true} />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(span('Function'), 'Trail'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(span('Function'), 'Trail')]);
expect(unmounted).toBe(true);
ReactNoop.render(<Foo useText={true} />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div('Text', 'Trail'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div('Text', 'Trail')]);
ReactNoop.render(<Foo />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div('Trail'),
- ]);
-
+ expect(ReactNoop.getChildren()).toEqual([div('Trail')]);
});
it('can delete a child that changes type - explicit keys', function() {
-
let unmounted = false;
class ClassComponent extends React.Component {
@@ -255,12 +216,9 @@ describe('ReactIncrementalSideEffects', () => {
function Foo(props) {
return (
<div>
- {props.useClass ?
- <ClassComponent key="a" /> :
- props.useFunction ?
- <FunctionalComponent key="a" /> :
- null
- }
+ {props.useClass
+ ? <ClassComponent key="a" />
+ : props.useFunction ? <FunctionalComponent key="a" /> : null}
Trail
</div>
);
@@ -268,30 +226,22 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo useClass={true} />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(span('Class'), 'Trail'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(span('Class'), 'Trail')]);
expect(unmounted).toBe(false);
ReactNoop.render(<Foo useFunction={true} />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(span('Function'), 'Trail'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(span('Function'), 'Trail')]);
expect(unmounted).toBe(true);
ReactNoop.render(<Foo />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div('Trail'),
- ]);
-
+ expect(ReactNoop.getChildren()).toEqual([div('Trail')]);
});
it('does not update child nodes if a flush is aborted', () => {
-
function Bar(props) {
return <span prop={props.text} />;
}
@@ -319,11 +269,9 @@ describe('ReactIncrementalSideEffects', () => {
expect(ReactNoop.getChildren()).toEqual([
div(div(span('Hello'), span('Hello')), span('Yo')),
]);
-
});
it('preserves a previously rendered node when deprioritized', () => {
-
function Middle(props) {
return <span prop={props.children} />;
}
@@ -341,27 +289,19 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo text="foo" />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(div(span('foo'))),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(div(span('foo')))]);
ReactNoop.render(<Foo text="bar" />);
ReactNoop.flushDeferredPri(20);
- expect(ReactNoop.getChildren()).toEqual([
- div(div(span('foo'))),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(div(span('foo')))]);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(div(span('bar'))),
- ]);
-
+ expect(ReactNoop.getChildren()).toEqual([div(div(span('bar')))]);
});
it('can reuse side-effects after being preempted', () => {
-
function Bar(props) {
return <span prop={props.children} />;
}
@@ -376,14 +316,12 @@ describe('ReactIncrementalSideEffects', () => {
function Foo(props) {
return (
<div hidden={true}>
- {
- props.step === 0 ?
- <div>
+ {props.step === 0
+ ? <div>
<Bar>Hi</Bar>
<Bar>{props.text}</Bar>
</div>
- : middleContent
- }
+ : middleContent}
</div>
);
}
@@ -422,7 +360,6 @@ describe('ReactIncrementalSideEffects', () => {
});
it('can reuse side-effects after being preempted, if shouldComponentUpdate is false', () => {
-
class Bar extends React.Component {
shouldComponentUpdate(nextProps) {
return this.props.children !== nextProps.children;
@@ -530,9 +467,7 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- div(span(1)),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([div(span(1))]);
});
it('can defer side-effects and resume them later on', function() {
@@ -560,16 +495,13 @@ describe('ReactIncrementalSideEffects', () => {
expect(ReactNoop.getChildren()).toEqual([
div(
span(0),
- div(/*the spans are down-prioritized and not rendered yet*/)
+ div(/*the spans are down-prioritized and not rendered yet*/),
),
]);
ReactNoop.render(<Foo tick={1} idx={0} />);
ReactNoop.flushDeferredPri(35 + 25);
expect(ReactNoop.getChildren()).toEqual([
- div(
- span(1),
- div(/*still not rendered yet*/)
- ),
+ div(span(1), div(/*still not rendered yet*/)),
]);
ReactNoop.flushDeferredPri(30 + 25);
expect(ReactNoop.getChildren()).toEqual([
@@ -578,8 +510,8 @@ describe('ReactIncrementalSideEffects', () => {
div(
// Now we had enough time to finish the spans.
span(0),
- span(1)
- )
+ span(1),
+ ),
),
]);
var innerSpanA = ReactNoop.getChildren()[0].children[1].children[1];
@@ -591,8 +523,8 @@ describe('ReactIncrementalSideEffects', () => {
div(
// Still same old numbers.
span(0),
- span(1)
- )
+ span(1),
+ ),
),
]);
ReactNoop.render(<Foo tick={3} idx={1} />);
@@ -603,8 +535,8 @@ describe('ReactIncrementalSideEffects', () => {
div(
// New numbers.
span(1),
- span(2)
- )
+ span(2),
+ ),
),
]);
@@ -654,7 +586,7 @@ describe('ReactIncrementalSideEffects', () => {
expect(ReactNoop.getChildren()).toEqual([
div(
span(0),
- div(/*the spans are down-prioritized and not rendered yet*/)
+ div(/*the spans are down-prioritized and not rendered yet*/),
),
]);
@@ -664,10 +596,7 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo tick={1} idx={0} />);
ReactNoop.flushDeferredPri(70);
expect(ReactNoop.getChildren()).toEqual([
- div(
- span(1),
- div(/*still not rendered yet*/)
- ),
+ div(span(1), div(/*still not rendered yet*/)),
]);
expect(ops).toEqual(['Foo']);
@@ -684,8 +613,8 @@ describe('ReactIncrementalSideEffects', () => {
span(0),
span(0),
span(0),
- span(0)
- )
+ span(0),
+ ),
),
]);
@@ -706,8 +635,8 @@ describe('ReactIncrementalSideEffects', () => {
span(0),
span(0),
span(0),
- span(0)
- )
+ span(0),
+ ),
),
]);
@@ -730,8 +659,8 @@ describe('ReactIncrementalSideEffects', () => {
span(0),
span(0),
span(0),
- span(0)
- )
+ span(0),
+ ),
),
]);
@@ -751,8 +680,8 @@ describe('ReactIncrementalSideEffects', () => {
span(1),
span(1),
span(1),
- span(1)
- )
+ span(1),
+ ),
),
]);
@@ -767,11 +696,11 @@ describe('ReactIncrementalSideEffects', () => {
class Bar extends React.Component {
constructor() {
super();
- this.state = { active: false };
+ this.state = {active: false};
barInstances.push(this);
}
activate() {
- this.setState({ active: true });
+ this.setState({active: true});
}
render() {
ops.push('Bar');
@@ -794,14 +723,7 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo tick={0} idx={0} />);
ReactNoop.flush();
expect(ReactNoop.getChildren()).toEqual([
- div(
- span(0),
- div(
- span(0),
- span(0),
- span(0)
- )
- ),
+ div(span(0), div(span(0), span(0), span(0))),
]);
expect(ops).toEqual(['Foo', 'Bar', 'Bar', 'Bar']);
@@ -818,8 +740,8 @@ describe('ReactIncrementalSideEffects', () => {
// Still not updated.
span(0),
span(0),
- span(0)
- )
+ span(0),
+ ),
),
]);
@@ -841,8 +763,8 @@ describe('ReactIncrementalSideEffects', () => {
// Still not updated.
span(0),
span(0),
- span(0)
- )
+ span(0),
+ ),
),
]);
@@ -860,7 +782,7 @@ describe('ReactIncrementalSideEffects', () => {
span('X'),
span(1),
span(1),
- )
+ ),
),
]);
@@ -876,7 +798,7 @@ describe('ReactIncrementalSideEffects', () => {
constructor() {
super();
instance = this;
- this.state = { text: 'foo' };
+ this.state = {text: 'foo'};
}
render() {
return <span prop={this.state.text} />;
@@ -885,14 +807,10 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- span('foo'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([span('foo')]);
let called = false;
- instance.setState({ text: 'bar' }, () => {
- expect(ReactNoop.getChildren()).toEqual([
- span('bar'),
- ]);
+ instance.setState({text: 'bar'}, () => {
+ expect(ReactNoop.getChildren()).toEqual([span('bar')]);
called = true;
});
ReactNoop.flush();
@@ -905,7 +823,7 @@ describe('ReactIncrementalSideEffects', () => {
constructor() {
super();
instance = this;
- this.state = { text: 'foo' };
+ this.state = {text: 'foo'};
}
shouldComponentUpdate(nextProps, nextState) {
return this.state.text !== nextState.text;
@@ -917,9 +835,7 @@ describe('ReactIncrementalSideEffects', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
- expect(ReactNoop.getChildren()).toEqual([
- span('foo'),
- ]);
+ expect(ReactNoop.getChildren()).toEqual([span('foo')]);
let called = false;
instance.setState({}, () => {
called = true;
@@ -931,7 +847,6 @@ describe('ReactIncrementalSideEffects', () => {
// TODO: Test that callbacks are not lost if an update is preempted.
it('calls componentWillUnmount after a deletion, even if nested', () => {
-
var ops = [];
class Bar extends React.Component {
@@ -955,18 +870,17 @@ describe('ReactIncrementalSideEffects', () => {
function Foo(props) {
return (
<div>
- {props.show ? [
- <Bar key="a" name="A" />,
- <Wrapper key="b" name="B" />,
- <div key="cd">
- <Bar name="C" />
- <Wrapper name="D" />,
- </div>,
- [
- <Bar key="e" name="E" />,
- <Bar key="f" name="F" />,
- ],
- ] : []}
+ {props.show
+ ? [
+ <Bar key="a" name="A" />,
+ <Wrapper key="b" name="B" />,
+ <div key="cd">
+ <Bar name="C" />
+ <Wrapper name="D" />,
+ </div>,
+ [<Bar key="e" name="E" />, <Bar key="f" name="F" />],
+ ]
+ : []}
<div>
{props.show ? <Bar key="g" name="G" /> : null}
</div>
@@ -992,11 +906,9 @@ describe('ReactIncrementalSideEffects', () => {
'F',
'G',
]);
-
});
it('calls componentDidMount/Update after insertion/update', () => {
-
var ops = [];
class Bar extends React.Component {
@@ -1032,10 +944,7 @@ describe('ReactIncrementalSideEffects', () => {
<Bar name="C" />
<Wrapper name="D" />
</div>
- {[
- <Bar key="e" name="E" />,
- <Bar key="f" name="F" />,
- ]}
+ {[<Bar key="e" name="E" />, <Bar key="f" name="F" />]}
<div>
<Bar key="g" name="G" />
</div>
@@ -1072,7 +981,6 @@ describe('ReactIncrementalSideEffects', () => {
'update:F',
'update:G',
]);
-
});
it('invokes ref callbacks after insertion/update/unmount', () => {
@@ -1093,15 +1001,13 @@ describe('ReactIncrementalSideEffects', () => {
}
function Foo(props) {
- return (
- props.show ?
- <div>
- <ClassComponent ref={n => ops.push(n)} />
- <FunctionalComponent ref={n => ops.push(n)} />
- <div ref={n => ops.push(n)} />
- </div> :
- null
- );
+ return props.show
+ ? <div>
+ <ClassComponent ref={n => ops.push(n)} />
+ <FunctionalComponent ref={n => ops.push(n)} />
+ <div ref={n => ops.push(n)} />
+ </div>
+ : null;
}
ReactNoop.render(<Foo show={true} />);
@@ -1138,11 +1044,11 @@ describe('ReactIncrementalSideEffects', () => {
expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
'Warning: Stateless function components cannot be given refs. ' +
- 'Attempts to access this ref will fail.\n\nCheck the render method ' +
- 'of `Foo`.\n' +
- ' in FunctionalComponent (at **)\n' +
- ' in div (at **)\n' +
- ' in Foo (at **)'
+ 'Attempts to access this ref will fail.\n\nCheck the render method ' +
+ 'of `Foo`.\n' +
+ ' in FunctionalComponent (at **)\n' +
+ ' in div (at **)\n' +
+ ' in Foo (at **)',
);
});
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
index 55a241636b..b55d7a3196 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
@@ -31,11 +31,11 @@ describe('ReactIncrementalUpdates', () => {
componentDidMount() {
ReactNoop.performAnimationWork(() => {
// Has Animation priority
- this.setState({ b: 'b' });
- this.setState({ c: 'c' });
+ this.setState({b: 'b'});
+ this.setState({c: 'c'});
});
// Has Task priority
- this.setState({ a: 'a' });
+ this.setState({a: 'a'});
}
render() {
state = this.state;
@@ -45,9 +45,9 @@ describe('ReactIncrementalUpdates', () => {
ReactNoop.render(<Foo />);
ReactNoop.flushDeferredPri(25);
- expect(state).toEqual({ a: 'a' });
+ expect(state).toEqual({a: 'a'});
ReactNoop.flush();
- expect(state).toEqual({ a: 'a', b: 'b', c: 'c' });
+ expect(state).toEqual({a: 'a', b: 'b', c: 'c'});
});
it('applies updates with equal priority in insertion order', () => {
@@ -56,9 +56,9 @@ describe('ReactIncrementalUpdates', () => {
state = {};
componentDidMount() {
// All have Task priority
- this.setState({ a: 'a' });
- this.setState({ b: 'b' });
- this.setState({ c: 'c' });
+ this.setState({a: 'a'});
+ this.setState({b: 'b'});
+ this.setState({c: 'c'});
}
render() {
state = this.state;
@@ -68,7 +68,7 @@ describe('ReactIncrementalUpdates', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
- expect(state).toEqual({ a: 'a', b: 'b', c: 'c' });
+ expect(state).toEqual({a: 'a', b: 'b', c: 'c'});
});
it('only drops updates with equal or lesser priority when replaceState is called', () => {
@@ -94,19 +94,19 @@ describe('ReactIncrementalUpdates', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
- instance.setState({ x: 'x' });
- instance.setState({ y: 'y' });
+ instance.setState({x: 'x'});
+ instance.setState({y: 'y'});
ReactNoop.performAnimationWork(() => {
- instance.setState({ a: 'a' });
- instance.setState({ b: 'b' });
+ instance.setState({a: 'a'});
+ instance.setState({b: 'b'});
});
- instance.replaceState({ c: 'c' });
- instance.setState({ d: 'd' });
+ instance.replaceState({c: 'c'});
+ instance.setState({d: 'd'});
ReactNoop.flushAnimationPri();
// Even though a replaceState has been already scheduled, it hasn't been
// flushed yet because it has low priority.
- expect(instance.state).toEqual({ a: 'a', b: 'b' });
+ expect(instance.state).toEqual({a: 'a', b: 'b'});
expect(ops).toEqual([
'render',
'componentDidMount',
@@ -118,11 +118,8 @@ describe('ReactIncrementalUpdates', () => {
ReactNoop.flush();
// Now the rest of the updates are flushed.
- expect(instance.state).toEqual({ c: 'c', d: 'd' });
- expect(ops).toEqual([
- 'render',
- 'componentDidUpdate',
- ]);
+ expect(instance.state).toEqual({c: 'c', d: 'd'});
+ expect(ops).toEqual(['render', 'componentDidUpdate']);
});
it('can abort an update, schedule additional updates, and resume', () => {
@@ -164,7 +161,7 @@ describe('ReactIncrementalUpdates', () => {
// expect(ReactNoop.getChildren()).toEqual([span('')]);
expect(ops).toEqual(['render']);
expect(progressedUpdates).toEqual(['a', 'b', 'c']);
- expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c' });
+ expect(instance.state).toEqual({a: 'a', b: 'b', c: 'c'});
ops = [];
progressedUpdates = [];
@@ -190,7 +187,15 @@ describe('ReactIncrementalUpdates', () => {
'componentDidUpdate',
]);
expect(progressedUpdates).toEqual(['d', 'e', 'a', 'b', 'c', 'f', 'g']);
- expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c', d: 'd', e: 'e', f: 'f', g: 'g' });
+ expect(instance.state).toEqual({
+ a: 'a',
+ b: 'b',
+ c: 'c',
+ d: 'd',
+ e: 'e',
+ f: 'f',
+ g: 'g',
+ });
});
it('can abort an update, schedule a replaceState, and resume', () => {
@@ -232,7 +237,7 @@ describe('ReactIncrementalUpdates', () => {
ReactNoop.flushDeferredPri(20);
expect(ops).toEqual(['render']);
expect(progressedUpdates).toEqual(['a', 'b', 'c']);
- expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c' });
+ expect(instance.state).toEqual({a: 'a', b: 'b', c: 'c'});
ops = [];
progressedUpdates = [];
@@ -246,7 +251,7 @@ describe('ReactIncrementalUpdates', () => {
ReactNoop.flush();
expect(progressedUpdates).toEqual(['d', 'e', 'f', 'g']);
- expect(instance.state).toEqual({ e: 'e', f: 'f', g: 'g' });
+ expect(instance.state).toEqual({e: 'e', f: 'f', g: 'g'});
});
it('passes accumulation of previous updates to replaceState updater function', () => {
@@ -263,11 +268,11 @@ describe('ReactIncrementalUpdates', () => {
ReactNoop.render(<Foo />);
ReactNoop.flush();
- instance.setState({ a: 'a' });
- instance.setState({ b: 'b' });
- instance.replaceState(previousState => ({ previousState }));
+ instance.setState({a: 'a'});
+ instance.setState({b: 'b'});
+ instance.replaceState(previousState => ({previousState}));
ReactNoop.flush();
- expect(instance.state).toEqual({ previousState: { a: 'a', b : 'b' } });
+ expect(instance.state).toEqual({previousState: {a: 'a', b: 'b'}});
});
it('does not call callbacks that are scheduled by another callback until a later commit', () => {
@@ -276,9 +281,9 @@ describe('ReactIncrementalUpdates', () => {
state = {};
componentDidMount() {
ops.push('did mount');
- this.setState({ a: 'a' }, () => {
+ this.setState({a: 'a'}, () => {
ops.push('callback a');
- this.setState({ b: 'b' }, () => {
+ this.setState({b: 'b'}, () => {
ops.push('callback b');
});
});
@@ -309,7 +314,7 @@ describe('ReactIncrementalUpdates', () => {
state = {};
componentWillReceiveProps() {
ops.push('componentWillReceiveProps');
- this.setState({ b: 'b' });
+ this.setState({b: 'b'});
}
render() {
ops.push('render');
@@ -323,19 +328,15 @@ describe('ReactIncrementalUpdates', () => {
ops = [];
ReactNoop.performAnimationWork(() => {
- instance.setState({ a: 'a' });
+ instance.setState({a: 'a'});
ReactNoop.render(<Foo />); // Trigger componentWillReceiveProps
});
ReactNoop.flush();
- expect(instance.state).toEqual({ a: 'a', b: 'b' });
- expect(ops).toEqual([
- 'componentWillReceiveProps',
- 'render',
- ]);
+ expect(instance.state).toEqual({a: 'a', b: 'b'});
+ expect(ops).toEqual(['componentWillReceiveProps', 'render']);
});
-
it('enqueues setState inside an updater function as if the in-progress update is progressed (and warns)', () => {
spyOn(console, 'error');
let instance;
@@ -354,8 +355,8 @@ describe('ReactIncrementalUpdates', () => {
instance.setState(function a() {
ops.push('setState updater');
- this.setState({ b: 'b' });
- return { a: 'a' };
+ this.setState({b: 'b'});
+ return {a: 'a'};
});
ReactNoop.flush();
@@ -367,7 +368,7 @@ describe('ReactIncrementalUpdates', () => {
// be flushed in the same commit.
'render',
]);
- expect(instance.state).toEqual({ a: 'a', b: 'b' });
+ expect(instance.state).toEqual({a: 'a', b: 'b'});
expectDev(console.error.calls.count()).toBe(1);
console.error.calls.reset();
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
index 703a6310fd..fb0771fcb2 100644
--- a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
@@ -27,17 +27,14 @@ describe('ReactTopLevelFragment', function() {
});
it('should render a simple fragment at the top of a component', function() {
-
function Fragment() {
return [<div key="a">Hello</div>, <div key="b">World</div>];
}
ReactNoop.render(<Fragment />);
ReactNoop.flush();
-
});
it('should preserve state when switching from a single child', function() {
-
var instance = null;
class Stateful extends React.Component {
@@ -47,9 +44,10 @@ describe('ReactTopLevelFragment', function() {
}
}
- function Fragment({ condition }) {
- return condition ? <Stateful key="a" /> :
- [<Stateful key="a" />, <div key="b">World</div>];
+ function Fragment({condition}) {
+ return condition
+ ? <Stateful key="a" />
+ : [<Stateful key="a" />, <div key="b">World</div>];
}
ReactNoop.render(<Fragment />);
ReactNoop.flush();
@@ -64,11 +62,9 @@ describe('ReactTopLevelFragment', function() {
var instanceB = instance;
expect(instanceB).toBe(instanceA);
-
});
it('should not preserve state when switching to a nested array', function() {
-
var instance = null;
class Stateful extends React.Component {
@@ -78,9 +74,10 @@ describe('ReactTopLevelFragment', function() {
}
}
- function Fragment({ condition }) {
- return condition ? <Stateful key="a" /> :
- [[<Stateful key="a" />, <div key="b">World</div>], <div />];
+ function Fragment({condition}) {
+ return condition
+ ? <Stateful key="a" />
+ : [[<Stateful key="a" />, <div key="b">World</div>], <div />];
}
ReactNoop.render(<Fragment />);
ReactNoop.flush();
@@ -95,11 +92,9 @@ describe('ReactTopLevelFragment', function() {
var instanceB = instance;
expect(instanceB).not.toBe(instanceA);
-
});
it('preserves state if an implicit key slot switches from/to null', function() {
-
var instance = null;
class Stateful extends React.Component {
@@ -109,9 +104,10 @@ describe('ReactTopLevelFragment', function() {
}
}
- function Fragment({ condition }) {
- return condition ? [null, <Stateful />] :
- [<div>Hello</div>, <Stateful />];
+ function Fragment({condition}) {
+ return condition
+ ? [null, <Stateful />]
+ : [<div>Hello</div>, <Stateful />];
}
ReactNoop.render(<Fragment />);
ReactNoop.flush();
@@ -133,11 +129,9 @@ describe('ReactTopLevelFragment', function() {
var instanceC = instance;
expect(instanceC === instanceA).toBe(true);
-
});
it('should preserve state in a reorder', function() {
-
var instance = null;
class Stateful extends React.Component {
@@ -147,9 +141,10 @@ describe('ReactTopLevelFragment', function() {
}
}
- function Fragment({ condition }) {
- return condition ? [[<div key="b">World</div>, <Stateful key="a" />]] :
- [[<Stateful key="a" />, <div key="b">World</div>], <div />];
+ function Fragment({condition}) {
+ return condition
+ ? [[<div key="b">World</div>, <Stateful key="a" />]]
+ : [[<Stateful key="a" />, <div key="b">World</div>], <div />];
}
ReactNoop.render(<Fragment />);
ReactNoop.flush();
@@ -164,7 +159,5 @@ describe('ReactTopLevelFragment', function() {
var instanceB = instance;
expect(instanceB).toBe(instanceA);
-
});
-
});
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
index 45fb416251..99e5c59b37 100644
--- a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
@@ -39,5 +39,4 @@ describe('ReactTopLevelText', () => {
ReactNoop.flush();
expect(ReactNoop.getChildren()).toEqual([{text: '10'}]);
});
-
});
diff --git a/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js b/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
index 68f3a99b5d..605b15e883 100644
--- a/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
+++ b/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
@@ -12,7 +12,7 @@
'use strict';
-import type { ReactNodeList } from 'ReactTypes';
+import type {ReactNodeList} from 'ReactTypes';
// The Symbol used to tag the special React types. If there is no native Symbol
// nor polyfill, then a plain number is used for performance.
@@ -42,11 +42,11 @@ export type ReactYield = {
};
exports.createCoroutine = function<T>(
- children : mixed,
- handler : CoroutineHandler<T>,
- props : T,
- key : ?string = null
-) : ReactCoroutine {
+ children: mixed,
+ handler: CoroutineHandler<T>,
+ props: T,
+ key: ?string = null,
+): ReactCoroutine {
var coroutine = {
// This tag allow us to uniquely identify this as a React Coroutine
$$typeof: REACT_COROUTINE_TYPE,
@@ -67,7 +67,7 @@ exports.createCoroutine = function<T>(
return coroutine;
};
-exports.createYield = function(value : mixed) : ReactYield {
+exports.createYield = function(value: mixed): ReactYield {
var yieldNode = {
// This tag allow us to uniquely identify this as a React Yield
$$typeof: REACT_YIELD_TYPE,
@@ -87,23 +87,19 @@ exports.createYield = function(value : mixed) : ReactYield {
/**
* Verifies the object is a coroutine object.
*/
-exports.isCoroutine = function(object : mixed) : boolean {
- return (
- typeof object === 'object' &&
+exports.isCoroutine = function(object: mixed): boolean {
+ return typeof object === 'object' &&
object !== null &&
- object.$$typeof === REACT_COROUTINE_TYPE
- );
+ object.$$typeof === REACT_COROUTINE_TYPE;
};
/**
* Verifies the object is a yield object.
*/
-exports.isYield = function(object : mixed) : boolean {
- return (
- typeof object === 'object' &&
+exports.isYield = function(object: mixed): boolean {
+ return typeof object === 'object' &&
object !== null &&
- object.$$typeof === REACT_YIELD_TYPE
- );
+ object.$$typeof === REACT_YIELD_TYPE;
};
exports.REACT_YIELD_TYPE = REACT_YIELD_TYPE;
diff --git a/src/renderers/shared/fiber/isomorphic/ReactPortal.js b/src/renderers/shared/fiber/isomorphic/ReactPortal.js
index 5cb03f96b7..13d99c7116 100644
--- a/src/renderers/shared/fiber/isomorphic/ReactPortal.js
+++ b/src/renderers/shared/fiber/isomorphic/ReactPortal.js
@@ -12,30 +12,31 @@
'use strict';
-import type { ReactNodeList } from 'ReactTypes';
+import type {ReactNodeList} from 'ReactTypes';
// The Symbol used to tag the special React types. If there is no native Symbol
// nor polyfill, then a plain number is used for performance.
-var REACT_PORTAL_TYPE =
- (typeof Symbol === 'function' && Symbol.for && Symbol.for('react.portal')) ||
+var REACT_PORTAL_TYPE = (typeof Symbol === 'function' &&
+ Symbol.for &&
+ Symbol.for('react.portal')) ||
0xeaca;
export type ReactPortal = {
$$typeof: Symbol | number,
key: null | string,
containerInfo: any,
- children : ReactNodeList,
+ children: ReactNodeList,
// TODO: figure out the API for cross-renderer implementation.
implementation: any,
};
exports.createPortal = function(
- children : ReactNodeList,
- containerInfo : any,
+ children: ReactNodeList,
+ containerInfo: any,
// TODO: figure out the API for cross-renderer implementation.
implementation: any,
- key : ?string = null
-) : ReactPortal {
+ key: ?string = null,
+): ReactPortal {
return {
// This tag allow us to uniquely identify this as a React Portal
$$typeof: REACT_PORTAL_TYPE,
@@ -49,12 +50,10 @@ exports.createPortal = function(
/**
* Verifies the object is a portal object.
*/
-exports.isPortal = function(object : mixed) : boolean {
- return (
- typeof object === 'object' &&
+exports.isPortal = function(object: mixed): boolean {
+ return typeof object === 'object' &&
object !== null &&
- object.$$typeof === REACT_PORTAL_TYPE
- );
+ object.$$typeof === REACT_PORTAL_TYPE;
};
exports.REACT_PORTAL_TYPE = REACT_PORTAL_TYPE;
diff --git a/src/renderers/shared/fiber/isomorphic/ReactTypes.js b/src/renderers/shared/fiber/isomorphic/ReactTypes.js
index 4b90269000..2a3c05a1f5 100644
--- a/src/renderers/shared/fiber/isomorphic/ReactTypes.js
+++ b/src/renderers/shared/fiber/isomorphic/ReactTypes.js
@@ -12,10 +12,16 @@
'use strict';
-import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';
-import type { ReactPortal } from 'ReactPortal';
+import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
+import type {ReactPortal} from 'ReactPortal';
-export type ReactNode = ReactElement<any> | ReactCoroutine | ReactYield | ReactPortal | ReactText | ReactFragment;
+export type ReactNode =
+ | ReactElement<any>
+ | ReactCoroutine
+ | ReactYield
+ | ReactPortal
+ | ReactText
+ | ReactFragment;
export type ReactFragment = ReactEmpty | Iterable<ReactNode>;
diff --git a/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js b/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
index 8827275b08..ef3ec1ae8d 100644
--- a/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
+++ b/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
@@ -12,19 +12,20 @@
'use strict';
-import type { DebugID } from 'ReactInstanceType';
+import type {DebugID} from 'ReactInstanceType';
-export type Operation = {instanceID: DebugID} & (
- {type: 'mount', payload: string} |
- {type: 'insert child', payload: {toIndex: number, content: string}} |
- {type: 'move child', payload: {fromIndex: number, toIndex: number}} |
- {type: 'replace children', payload: string} |
- {type: 'replace text', payload: string} |
- {type: 'replace with', payload: string} |
- {type: 'update styles', payload: mixed /* Style Object */} |
- {type: 'update attribute', payload: {[name: string]: string}} |
- {type: 'remove attribute', payload: string}
-);
+export type Operation =
+ & {instanceID: DebugID}
+ & (
+ | {type: 'mount', payload: string}
+ | {type: 'insert child', payload: {toIndex: number, content: string}}
+ | {type: 'move child', payload: {fromIndex: number, toIndex: number}}
+ | {type: 'replace children', payload: string}
+ | {type: 'replace text', payload: string}
+ | {type: 'replace with', payload: string}
+ | {type: 'update styles', payload: mixed /* Style Object */}
+ | {type: 'update attribute', payload: {[name: string]: string}}
+ | {type: 'remove attribute', payload: string});
// Trust the developer to only use this with a __DEV__ check
var ReactHostOperationHistoryHook = ((null: any): typeof ReactHostOperationHistoryHook);
diff --git a/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js b/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
index b121f765ff..6819cd80b0 100644
--- a/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
+++ b/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
@@ -22,7 +22,7 @@ if (__DEV__) {
var warnInvalidSetState = function() {
warning(
!processingChildContext,
- 'setState(...): Cannot call setState() inside getChildContext()'
+ 'setState(...): Cannot call setState() inside getChildContext()',
);
};
diff --git a/src/renderers/shared/shared/ReactInstanceMap.js b/src/renderers/shared/shared/ReactInstanceMap.js
index 24eeb2d740..495c82c311 100644
--- a/src/renderers/shared/shared/ReactInstanceMap.js
+++ b/src/renderers/shared/shared/ReactInstanceMap.js
@@ -20,7 +20,6 @@
// TODO: Replace this with ES6: var ReactInstanceMap = new Map();
var ReactInstanceMap = {
-
/**
* This API should be called `delete` but we'd have to make sure to always
* transform these to strings for IE support. When this transform is fully
@@ -41,7 +40,6 @@ var ReactInstanceMap = {
set: function(key, value) {
key._reactInternalInstance = value;
},
-
};
module.exports = ReactInstanceMap;
diff --git a/src/renderers/shared/shared/ReactTreeTraversal.js b/src/renderers/shared/shared/ReactTreeTraversal.js
index 07969dc4a6..c6c8aa2656 100644
--- a/src/renderers/shared/shared/ReactTreeTraversal.js
+++ b/src/renderers/shared/shared/ReactTreeTraversal.js
@@ -11,7 +11,7 @@
'use strict';
-var { HostComponent } = require('ReactTypeOfWork');
+var {HostComponent} = require('ReactTypeOfWork');
function getParent(inst) {
if (inst._hostParent !== undefined) {
@@ -101,7 +101,7 @@ function traverseTwoPhase(inst, fn, arg) {
inst = getParent(inst);
}
var i;
- for (i = path.length; i-- > 0;) {
+ for (i = path.length; i-- > 0; ) {
fn(path[i], 'captured', arg);
}
for (i = 0; i < path.length; i++) {
@@ -132,7 +132,7 @@ function traverseEnterLeave(from, to, fn, argFrom, argTo) {
for (i = 0; i < pathFrom.length; i++) {
fn(pathFrom[i], 'bubbled', argFrom);
}
- for (i = pathTo.length; i-- > 0;) {
+ for (i = pathTo.length; i-- > 0; ) {
fn(pathTo[i], 'captured', argTo);
}
}
diff --git a/src/renderers/shared/shared/event/EventPluginHub.js b/src/renderers/shared/shared/event/EventPluginHub.js
index 179e89d651..7ed1950708 100644
--- a/src/renderers/shared/shared/event/EventPluginHub.js
+++ b/src/renderers/shared/shared/event/EventPluginHub.js
@@ -49,10 +49,10 @@ var executeDispatchesAndReleaseTopLevel = function(e) {
};
function isInteractive(tag) {
- return (
- tag === 'button' || tag === 'input' ||
- tag === 'select' || tag === 'textarea'
- );
+ return tag === 'button' ||
+ tag === 'input' ||
+ tag === 'select' ||
+ tag === 'textarea';
}
function shouldPreventMouseEvent(name, type, props) {
@@ -96,12 +96,10 @@ function shouldPreventMouseEvent(name, type, props) {
* @public
*/
var EventPluginHub = {
-
/**
* Methods for injecting dependencies.
*/
injection: {
-
/**
* @param {array} InjectedEventPluginOrder
* @public
@@ -112,7 +110,6 @@ var EventPluginHub = {
* @param {object} injectedNamesToPlugins Map from names to plugin modules.
*/
injectEventPluginsByName: EventPluginRegistry.injectEventPluginsByName,
-
},
/**
@@ -151,7 +148,13 @@ var EventPluginHub = {
}
const props = inst._currentElement.props;
listener = props[registrationName];
- if (shouldPreventMouseEvent(registrationName, inst._currentElement.type, props)) {
+ if (
+ shouldPreventMouseEvent(
+ registrationName,
+ inst._currentElement.type,
+ props,
+ )
+ ) {
return null;
}
}
@@ -160,7 +163,7 @@ var EventPluginHub = {
!listener || typeof listener === 'function',
'Expected %s listener to be a function, instead got type %s',
registrationName,
- typeof listener
+ typeof listener,
);
return listener;
},
@@ -173,10 +176,11 @@ var EventPluginHub = {
* @internal
*/
extractEvents: function(
- topLevelType,
- targetInst,
- nativeEvent,
- nativeEventTarget) {
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget,
+ ) {
var events;
var plugins = EventPluginRegistry.plugins;
for (var i = 0; i < plugins.length; i++) {
@@ -187,7 +191,7 @@ var EventPluginHub = {
topLevelType,
targetInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
);
if (extractedEvents) {
events = accumulateInto(events, extractedEvents);
@@ -223,23 +227,22 @@ var EventPluginHub = {
if (simulated) {
forEachAccumulated(
processingEventQueue,
- executeDispatchesAndReleaseSimulated
+ executeDispatchesAndReleaseSimulated,
);
} else {
forEachAccumulated(
processingEventQueue,
- executeDispatchesAndReleaseTopLevel
+ executeDispatchesAndReleaseTopLevel,
);
}
invariant(
!eventQueue,
'processEventQueue(): Additional events were enqueued while processing ' +
- 'an event queue. Support for this has not yet been implemented.'
+ 'an event queue. Support for this has not yet been implemented.',
);
// This would be a good time to rethrow if any of the event handlers threw.
ReactErrorUtils.rethrowCaughtError();
},
-
};
module.exports = EventPluginHub;
diff --git a/src/renderers/shared/shared/event/EventPluginRegistry.js b/src/renderers/shared/shared/event/EventPluginRegistry.js
index b379ce1e9d..e60ba5d829 100644
--- a/src/renderers/shared/shared/event/EventPluginRegistry.js
+++ b/src/renderers/shared/shared/event/EventPluginRegistry.js
@@ -12,15 +12,9 @@
'use strict';
-import type {
- DispatchConfig,
-} from 'ReactSyntheticEventType';
+import type {DispatchConfig} from 'ReactSyntheticEventType';
-import type {
- AnyNativeEvent,
- PluginName,
- PluginModule,
-} from 'PluginModuleType';
+import type {AnyNativeEvent, PluginName, PluginModule} from 'PluginModuleType';
type NamesToPlugins = {[key: PluginName]: PluginModule<AnyNativeEvent>};
@@ -54,7 +48,7 @@ function recomputePluginOrdering(): void {
invariant(
pluginIndex > -1,
'EventPluginRegistry: Cannot inject event plugins that do not exist in ' +
- 'the plugin ordering, `%s`.',
+ 'the plugin ordering, `%s`.',
pluginName,
);
if (EventPluginRegistry.plugins[pluginIndex]) {
@@ -63,7 +57,7 @@ function recomputePluginOrdering(): void {
invariant(
pluginModule.extractEvents,
'EventPluginRegistry: Event plugins must implement an `extractEvents` ' +
- 'method, but `%s` does not.',
+ 'method, but `%s` does not.',
pluginName,
);
EventPluginRegistry.plugins[pluginIndex] = pluginModule;
@@ -99,7 +93,7 @@ function publishEventForPlugin(
invariant(
!EventPluginRegistry.eventNameDispatchConfigs.hasOwnProperty(eventName),
'EventPluginHub: More than one plugin attempted to publish the same ' +
- 'event name, `%s`.',
+ 'event name, `%s`.',
eventName,
);
EventPluginRegistry.eventNameDispatchConfigs[eventName] = dispatchConfig;
@@ -143,18 +137,19 @@ function publishRegistrationName(
invariant(
!EventPluginRegistry.registrationNameModules[registrationName],
'EventPluginHub: More than one plugin attempted to publish the same ' +
- 'registration name, `%s`.',
+ 'registration name, `%s`.',
registrationName,
);
EventPluginRegistry.registrationNameModules[registrationName] = pluginModule;
- EventPluginRegistry.registrationNameDependencies[registrationName] =
- pluginModule.eventTypes[eventName].dependencies;
+ EventPluginRegistry.registrationNameDependencies[
+ registrationName
+ ] = pluginModule.eventTypes[eventName].dependencies;
if (__DEV__) {
var lowerCasedName = registrationName.toLowerCase();
- EventPluginRegistry.possibleRegistrationNames[lowerCasedName] =
- registrationName;
-
+ EventPluginRegistry.possibleRegistrationNames[
+ lowerCasedName
+ ] = registrationName;
if (registrationName === 'onDoubleClick') {
EventPluginRegistry.possibleRegistrationNames.ondblclick = registrationName;
@@ -168,7 +163,6 @@ function publishRegistrationName(
* @see {EventPluginHub}
*/
var EventPluginRegistry = {
-
/**
* Ordered list of injected plugins.
*/
@@ -213,7 +207,7 @@ var EventPluginRegistry = {
invariant(
!eventPluginOrder,
'EventPluginRegistry: Cannot inject event plugin ordering more than ' +
- 'once. You are likely trying to load more than one copy of React.',
+ 'once. You are likely trying to load more than one copy of React.',
);
// Clone the ordering so it cannot be dynamically mutated.
eventPluginOrder = Array.prototype.slice.call(injectedEventPluginOrder);
@@ -231,7 +225,7 @@ var EventPluginRegistry = {
* @see {EventPluginHub.injection.injectEventPluginsByName}
*/
injectEventPluginsByName: function(
- injectedNamesToPlugins: NamesToPlugins
+ injectedNamesToPlugins: NamesToPlugins,
): void {
var isOrderingDirty = false;
for (var pluginName in injectedNamesToPlugins) {
@@ -239,12 +233,14 @@ var EventPluginRegistry = {
continue;
}
var pluginModule = injectedNamesToPlugins[pluginName];
- if (!namesToPlugins.hasOwnProperty(pluginName) ||
- namesToPlugins[pluginName] !== pluginModule) {
+ if (
+ !namesToPlugins.hasOwnProperty(pluginName) ||
+ namesToPlugins[pluginName] !== pluginModule
+ ) {
invariant(
!namesToPlugins[pluginName],
'EventPluginRegistry: Cannot inject two different event plugins ' +
- 'using the same name, `%s`.',
+ 'using the same name, `%s`.',
pluginName,
);
namesToPlugins[pluginName] = pluginModule;
diff --git a/src/renderers/shared/shared/event/EventPluginUtils.js b/src/renderers/shared/shared/event/EventPluginUtils.js
index 8714541941..38952088b2 100644
--- a/src/renderers/shared/shared/event/EventPluginUtils.js
+++ b/src/renderers/shared/shared/event/EventPluginUtils.js
@@ -31,10 +31,10 @@ var injection = {
if (__DEV__) {
warning(
Injected &&
- Injected.getNodeFromInstance &&
- Injected.getInstanceFromNode,
+ Injected.getNodeFromInstance &&
+ Injected.getInstanceFromNode,
'EventPluginUtils.injection.injectComponentTree(...): Injected ' +
- 'module is missing getNodeFromInstance or getInstanceFromNode.'
+ 'module is missing getNodeFromInstance or getInstanceFromNode.',
);
}
},
@@ -42,20 +42,17 @@ var injection = {
function isEndish(topLevelType) {
return topLevelType === 'topMouseUp' ||
- topLevelType === 'topTouchEnd' ||
- topLevelType === 'topTouchCancel';
+ topLevelType === 'topTouchEnd' ||
+ topLevelType === 'topTouchCancel';
}
function isMoveish(topLevelType) {
- return topLevelType === 'topMouseMove' ||
- topLevelType === 'topTouchMove';
+ return topLevelType === 'topMouseMove' || topLevelType === 'topTouchMove';
}
function isStartish(topLevelType) {
- return topLevelType === 'topMouseDown' ||
- topLevelType === 'topTouchStart';
+ return topLevelType === 'topMouseDown' || topLevelType === 'topTouchStart';
}
-
var validateEventDispatches;
if (__DEV__) {
validateEventDispatches = function(event) {
@@ -63,18 +60,18 @@ if (__DEV__) {
var dispatchInstances = event._dispatchInstances;
var listenersIsArr = Array.isArray(dispatchListeners);
- var listenersLen = listenersIsArr ?
- dispatchListeners.length :
- dispatchListeners ? 1 : 0;
+ var listenersLen = listenersIsArr
+ ? dispatchListeners.length
+ : dispatchListeners ? 1 : 0;
var instancesIsArr = Array.isArray(dispatchInstances);
- var instancesLen = instancesIsArr ?
- dispatchInstances.length :
- dispatchInstances ? 1 : 0;
+ var instancesLen = instancesIsArr
+ ? dispatchInstances.length
+ : dispatchInstances ? 1 : 0;
warning(
instancesIsArr === listenersIsArr && instancesLen === listenersLen,
- 'EventPluginUtils: Invalid `event`.'
+ 'EventPluginUtils: Invalid `event`.',
);
};
}
@@ -89,7 +86,12 @@ if (__DEV__) {
function executeDispatch(event, simulated, listener, inst) {
var type = event.type || 'unknown-event';
event.currentTarget = EventPluginUtils.getNodeFromInstance(inst);
- ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(type, listener, undefined, event);
+ ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
+ type,
+ listener,
+ undefined,
+ event,
+ );
event.currentTarget = null;
}
@@ -112,7 +114,7 @@ function executeDispatchesInOrder(event, simulated) {
event,
simulated,
dispatchListeners[i],
- dispatchInstances[i]
+ dispatchInstances[i],
);
}
} else if (dispatchListeners) {
@@ -180,9 +182,11 @@ function executeDirectDispatch(event) {
var dispatchInstance = event._dispatchInstances;
invariant(
!Array.isArray(dispatchListener),
- 'executeDirectDispatch(...): Invalid `event`.'
+ 'executeDirectDispatch(...): Invalid `event`.',
);
- event.currentTarget = dispatchListener ? EventPluginUtils.getNodeFromInstance(dispatchInstance) : null;
+ event.currentTarget = dispatchListener
+ ? EventPluginUtils.getNodeFromInstance(dispatchInstance)
+ : null;
var res = dispatchListener ? dispatchListener(event) : null;
event.currentTarget = null;
event._dispatchListeners = null;
diff --git a/src/renderers/shared/shared/event/EventPropagators.js b/src/renderers/shared/shared/event/EventPropagators.js
index 159d2e6c19..db9537b833 100644
--- a/src/renderers/shared/shared/event/EventPropagators.js
+++ b/src/renderers/shared/shared/event/EventPropagators.js
@@ -18,7 +18,7 @@ var accumulateInto = require('accumulateInto');
var forEachAccumulated = require('forEachAccumulated');
var warning = require('fbjs/lib/warning');
-import type { PropagationPhases } from 'EventConstants';
+import type {PropagationPhases} from 'EventConstants';
var getListener = EventPluginHub.getListener;
@@ -27,8 +27,9 @@ var getListener = EventPluginHub.getListener;
* "phases" of propagation. This finds listeners by a given phase.
*/
function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {
- var registrationName =
- event.dispatchConfig.phasedRegistrationNames[propagationPhase];
+ var registrationName = event.dispatchConfig.phasedRegistrationNames[
+ propagationPhase
+ ];
return getListener(inst, registrationName);
}
@@ -40,15 +41,14 @@ function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {
*/
function accumulateDirectionalDispatches(inst, phase, event) {
if (__DEV__) {
- warning(
- inst,
- 'Dispatching inst must not be null'
- );
+ warning(inst, 'Dispatching inst must not be null');
}
var listener = listenerAtPhase(inst, event, phase);
if (listener) {
- event._dispatchListeners =
- accumulateInto(event._dispatchListeners, listener);
+ event._dispatchListeners = accumulateInto(
+ event._dispatchListeners,
+ listener,
+ );
event._dispatchInstances = accumulateInto(event._dispatchInstances, inst);
}
}
@@ -65,7 +65,7 @@ function accumulateTwoPhaseDispatchesSingle(event) {
ReactTreeTraversal.traverseTwoPhase(
event._targetInst,
accumulateDirectionalDispatches,
- event
+ event,
);
}
}
@@ -76,17 +76,17 @@ function accumulateTwoPhaseDispatchesSingle(event) {
function accumulateTwoPhaseDispatchesSingleSkipTarget(event) {
if (event && event.dispatchConfig.phasedRegistrationNames) {
var targetInst = event._targetInst;
- var parentInst =
- targetInst ? ReactTreeTraversal.getParentInstance(targetInst) : null;
+ var parentInst = targetInst
+ ? ReactTreeTraversal.getParentInstance(targetInst)
+ : null;
ReactTreeTraversal.traverseTwoPhase(
parentInst,
accumulateDirectionalDispatches,
- event
+ event,
);
}
}
-
/**
* Accumulates without regard to direction, does not look for phased
* registration names. Same as `accumulateDirectDispatchesSingle` but without
@@ -97,8 +97,10 @@ function accumulateDispatches(inst, ignoredDirection, event) {
var registrationName = event.dispatchConfig.registrationName;
var listener = getListener(inst, registrationName);
if (listener) {
- event._dispatchListeners =
- accumulateInto(event._dispatchListeners, listener);
+ event._dispatchListeners = accumulateInto(
+ event._dispatchListeners,
+ listener,
+ );
event._dispatchInstances = accumulateInto(event._dispatchInstances, inst);
}
}
@@ -129,17 +131,14 @@ function accumulateEnterLeaveDispatches(leave, enter, from, to) {
to,
accumulateDispatches,
leave,
- enter
+ enter,
);
}
-
function accumulateDirectDispatches(events) {
forEachAccumulated(events, accumulateDirectDispatchesSingle);
}
-
-
/**
* A small set of propagation patterns, each of which will accept a small amount
* of information, and generate a set of "dispatch ready event objects" - which
diff --git a/src/renderers/shared/shared/event/PluginModuleType.js b/src/renderers/shared/shared/event/PluginModuleType.js
index 1d9044d6bd..5b51f9f7a2 100644
--- a/src/renderers/shared/shared/event/PluginModuleType.js
+++ b/src/renderers/shared/shared/event/PluginModuleType.js
@@ -20,11 +20,7 @@ import type {
export type EventTypes = {[key: string]: DispatchConfig};
-export type AnyNativeEvent =
- Event |
- KeyboardEvent |
- MouseEvent |
- Touch;
+export type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | Touch;
export type PluginName = string;
diff --git a/src/renderers/shared/shared/event/ReactControlledComponent.js b/src/renderers/shared/shared/event/ReactControlledComponent.js
index b2e0f5b8b2..08819e991d 100644
--- a/src/renderers/shared/shared/event/ReactControlledComponent.js
+++ b/src/renderers/shared/shared/event/ReactControlledComponent.js
@@ -41,23 +41,23 @@ function restoreStateOfTarget(target) {
if (typeof internalInstance.tag === 'number') {
invariant(
fiberHostComponent &&
- typeof fiberHostComponent.restoreControlledState === 'function',
+ typeof fiberHostComponent.restoreControlledState === 'function',
'Fiber needs to be injected to handle a fiber target for controlled ' +
- 'events.'
+ 'events.',
);
const props = EventPluginUtils.getFiberCurrentPropsFromNode(
- internalInstance.stateNode
+ internalInstance.stateNode,
);
fiberHostComponent.restoreControlledState(
internalInstance.stateNode,
internalInstance.type,
- props
+ props,
);
return;
}
invariant(
typeof internalInstance.restoreControlledState === 'function',
- 'The internal instance must be a React host component.'
+ 'The internal instance must be a React host component.',
);
// If it is not a Fiber, we can just use dynamic dispatch.
internalInstance.restoreControlledState();
diff --git a/src/renderers/shared/shared/event/ReactEventEmitterMixin.js b/src/renderers/shared/shared/event/ReactEventEmitterMixin.js
index 94461f8802..63134a57e1 100644
--- a/src/renderers/shared/shared/event/ReactEventEmitterMixin.js
+++ b/src/renderers/shared/shared/event/ReactEventEmitterMixin.js
@@ -19,21 +19,21 @@ function runEventQueueInBatch(events) {
}
var ReactEventEmitterMixin = {
-
/**
* Streams a fired top-level event to `EventPluginHub` where plugins have the
* opportunity to create `ReactEvent`s to be dispatched.
*/
handleTopLevel: function(
- topLevelType,
- targetInst,
- nativeEvent,
- nativeEventTarget) {
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget,
+ ) {
var events = EventPluginHub.extractEvents(
topLevelType,
targetInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
);
runEventQueueInBatch(events);
},
diff --git a/src/renderers/shared/shared/event/ReactSyntheticEventType.js b/src/renderers/shared/shared/event/ReactSyntheticEventType.js
index 3496d633c9..a9e453bcb2 100644
--- a/src/renderers/shared/shared/event/ReactSyntheticEventType.js
+++ b/src/renderers/shared/shared/event/ReactSyntheticEventType.js
@@ -25,12 +25,14 @@ export type DispatchConfig = {
registrationName?: string,
};
-export type ReactSyntheticEvent = {
- dispatchConfig: DispatchConfig,
- getPooled: (
+export type ReactSyntheticEvent =
+ & {
dispatchConfig: DispatchConfig,
- targetInst: ReactInstance,
- nativeTarget: Event,
- nativeEventTarget: EventTarget,
- ) => ReactSyntheticEvent,
-} & SyntheticEvent;
+ getPooled: (
+ dispatchConfig: DispatchConfig,
+ targetInst: ReactInstance,
+ nativeTarget: Event,
+ nativeEventTarget: EventTarget,
+ ) => ReactSyntheticEvent,
+ }
+ & SyntheticEvent;
diff --git a/src/renderers/shared/shared/event/SyntheticEvent.js b/src/renderers/shared/shared/event/SyntheticEvent.js
index 6972c67233..81bb3d784c 100644
--- a/src/renderers/shared/shared/event/SyntheticEvent.js
+++ b/src/renderers/shared/shared/event/SyntheticEvent.js
@@ -9,6 +9,8 @@
* @providesModule SyntheticEvent
*/
+/* eslint valid-typeof: 0 */
+
'use strict';
var PooledClass = require('PooledClass');
@@ -66,7 +68,12 @@ var EventInterface = {
* @param {object} nativeEvent Native browser event.
* @param {DOMEventTarget} nativeEventTarget Target node.
*/
-function SyntheticEvent(dispatchConfig, targetInst, nativeEvent, nativeEventTarget) {
+function SyntheticEvent(
+ dispatchConfig,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget,
+) {
if (__DEV__) {
// these have a getter/setter for warnings
delete this.nativeEvent;
@@ -98,9 +105,9 @@ function SyntheticEvent(dispatchConfig, targetInst, nativeEvent, nativeEventTarg
}
}
- var defaultPrevented = nativeEvent.defaultPrevented != null ?
- nativeEvent.defaultPrevented :
- nativeEvent.returnValue === false;
+ var defaultPrevented = nativeEvent.defaultPrevented != null
+ ? nativeEvent.defaultPrevented
+ : nativeEvent.returnValue === false;
if (defaultPrevented) {
this.isDefaultPrevented = emptyFunction.thatReturnsTrue;
} else {
@@ -111,7 +118,6 @@ function SyntheticEvent(dispatchConfig, targetInst, nativeEvent, nativeEventTarg
}
Object.assign(SyntheticEvent.prototype, {
-
preventDefault: function() {
this.defaultPrevented = true;
var event = this.nativeEvent;
@@ -121,7 +127,7 @@ Object.assign(SyntheticEvent.prototype, {
if (event.preventDefault) {
event.preventDefault();
- } else if (typeof event.returnValue !== 'unknown') { // eslint-disable-line valid-typeof
+ } else if (typeof event.returnValue !== 'unknown') {
event.returnValue = false;
}
this.isDefaultPrevented = emptyFunction.thatReturnsTrue;
@@ -135,7 +141,7 @@ Object.assign(SyntheticEvent.prototype, {
if (event.stopPropagation) {
event.stopPropagation();
- } else if (typeof event.cancelBubble !== 'unknown') { // eslint-disable-line valid-typeof
+ } else if (typeof event.cancelBubble !== 'unknown') {
// The ChangeEventPlugin registers a "propertychange" event for
// IE. This event does not support bubbling or cancelling, and
// any references to cancelBubble throw "Member not found". A
@@ -170,7 +176,11 @@ Object.assign(SyntheticEvent.prototype, {
var Interface = this.constructor.Interface;
for (var propName in Interface) {
if (__DEV__) {
- Object.defineProperty(this, propName, getPooledWarningPropertyDefinition(propName, Interface[propName]));
+ Object.defineProperty(
+ this,
+ propName,
+ getPooledWarningPropertyDefinition(propName, Interface[propName]),
+ );
} else {
this[propName] = null;
}
@@ -182,21 +192,20 @@ Object.assign(SyntheticEvent.prototype, {
Object.defineProperty(
this,
'nativeEvent',
- getPooledWarningPropertyDefinition('nativeEvent', null)
+ getPooledWarningPropertyDefinition('nativeEvent', null),
);
Object.defineProperty(
this,
'preventDefault',
- getPooledWarningPropertyDefinition('preventDefault', emptyFunction)
+ getPooledWarningPropertyDefinition('preventDefault', emptyFunction),
);
Object.defineProperty(
this,
'stopPropagation',
- getPooledWarningPropertyDefinition('stopPropagation', emptyFunction)
+ getPooledWarningPropertyDefinition('stopPropagation', emptyFunction),
);
}
},
-
});
SyntheticEvent.Interface = EventInterface;
@@ -211,15 +220,17 @@ if (__DEV__) {
apply: function(constructor, that, args) {
return new Proxy(constructor.apply(that, args), {
set: function(target, prop, value) {
- if (prop !== 'isPersistent' &&
- !target.constructor.Interface.hasOwnProperty(prop) &&
- shouldBeReleasedProperties.indexOf(prop) === -1) {
+ if (
+ prop !== 'isPersistent' &&
+ !target.constructor.Interface.hasOwnProperty(prop) &&
+ shouldBeReleasedProperties.indexOf(prop) === -1
+ ) {
warning(
didWarnForAddedNewProperty || target.isPersistent(),
- 'This synthetic event is reused for performance reasons. If you\'re ' +
- 'seeing this, you\'re adding a new property in the synthetic event object. ' +
- 'The property is never released. See ' +
- 'https://fb.me/react-event-pooling for more information.'
+ "This synthetic event is reused for performance reasons. If you're " +
+ "seeing this, you're adding a new property in the synthetic event object. " +
+ 'The property is never released. See ' +
+ 'https://fb.me/react-event-pooling for more information.',
);
didWarnForAddedNewProperty = true;
}
@@ -282,7 +293,9 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
function get() {
var action = isFunction ? 'accessing the method' : 'accessing the property';
- var result = isFunction ? 'This is a no-op function' : 'This is set to null';
+ var result = isFunction
+ ? 'This is a no-op function'
+ : 'This is set to null';
warn(action, result);
return getVal;
}
@@ -291,13 +304,13 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
var warningCondition = false;
warning(
warningCondition,
- 'This synthetic event is reused for performance reasons. If you\'re seeing this, ' +
- 'you\'re %s `%s` on a released/nullified synthetic event. %s. ' +
- 'If you must keep the original synthetic event around, use event.persist(). ' +
- 'See https://fb.me/react-event-pooling for more information.',
+ "This synthetic event is reused for performance reasons. If you're seeing this, " +
+ "you're %s `%s` on a released/nullified synthetic event. %s. " +
+ 'If you must keep the original synthetic event around, use event.persist(). ' +
+ 'See https://fb.me/react-event-pooling for more information.',
action,
propName,
- result
+ result,
);
}
}
diff --git a/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js b/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
index 01e872abb6..cc8f6c45b6 100644
--- a/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
+++ b/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
@@ -11,7 +11,6 @@
'use strict';
-
describe('EventPluginRegistry', () => {
var EventPluginRegistry;
var createPlugin;
@@ -97,7 +96,7 @@ describe('EventPluginRegistry', () => {
});
}).toThrowError(
'EventPluginRegistry: Event plugins must implement an `extractEvents` ' +
- 'method, but `bad` does not.'
+ 'method, but `bad` does not.',
);
});
@@ -114,7 +113,7 @@ describe('EventPluginRegistry', () => {
});
}).toThrowError(
'EventPluginRegistry: Cannot inject event plugins that do not exist ' +
- 'in the plugin ordering, `random`.'
+ 'in the plugin ordering, `random`.',
);
});
@@ -127,7 +126,7 @@ describe('EventPluginRegistry', () => {
EventPluginRegistry.injectEventPluginOrder(pluginOrdering);
}).toThrowError(
'EventPluginRegistry: Cannot inject event plugin ordering more than ' +
- 'once. You are likely trying to load more than one copy of React.'
+ 'once. You are likely trying to load more than one copy of React.',
);
});
@@ -141,7 +140,7 @@ describe('EventPluginRegistry', () => {
EventPluginRegistry.injectEventPluginsByName({same: TwoPlugin});
}).toThrowError(
'EventPluginRegistry: Cannot inject two different event plugins using ' +
- 'the same name, `same`.'
+ 'the same name, `same`.',
);
});
@@ -166,17 +165,23 @@ describe('EventPluginRegistry', () => {
EventPluginRegistry.injectEventPluginsByName({one: OnePlugin});
EventPluginRegistry.injectEventPluginOrder(['one', 'two']);
- expect(Object.keys(EventPluginRegistry.registrationNameModules).length).toBe(2);
+ expect(
+ Object.keys(EventPluginRegistry.registrationNameModules).length,
+ ).toBe(2);
expect(EventPluginRegistry.registrationNameModules.onClick).toBe(OnePlugin);
expect(EventPluginRegistry.registrationNameModules.onFocus).toBe(OnePlugin);
EventPluginRegistry.injectEventPluginsByName({two: TwoPlugin});
- expect(Object.keys(EventPluginRegistry.registrationNameModules).length).toBe(4);
- expect(EventPluginRegistry.registrationNameModules.onMagicBubble).toBe(TwoPlugin);
expect(
- EventPluginRegistry.registrationNameModules.onMagicCapture
- ).toBe(TwoPlugin);
+ Object.keys(EventPluginRegistry.registrationNameModules).length,
+ ).toBe(4);
+ expect(EventPluginRegistry.registrationNameModules.onMagicBubble).toBe(
+ TwoPlugin,
+ );
+ expect(EventPluginRegistry.registrationNameModules.onMagicCapture).toBe(
+ TwoPlugin,
+ );
});
it('should throw if multiple registration names collide', () => {
@@ -205,14 +210,16 @@ describe('EventPluginRegistry', () => {
EventPluginRegistry.injectEventPluginOrder(['one', 'two']);
}).toThrowError(
'EventPluginHub: More than one plugin attempted to publish the same ' +
- 'registration name, `onPhotoCapture`.'
+ 'registration name, `onPhotoCapture`.',
);
});
it('should throw if an invalid event is published', () => {
var OnePlugin = createPlugin({
eventTypes: {
- badEvent: {/* missing configuration */},
+ badEvent: {
+ /* missing configuration */
+ },
},
});
@@ -222,7 +229,7 @@ describe('EventPluginRegistry', () => {
EventPluginRegistry.injectEventPluginOrder(['one']);
}).toThrowError(
'EventPluginRegistry: Failed to publish event `badEvent` for plugin ' +
- '`one`.'
+ '`one`.',
);
});
});
diff --git a/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js b/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
index d4057833c2..8f853afe08 100644
--- a/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
+++ b/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
@@ -24,8 +24,7 @@ var isMoveish = EventPluginUtils.isMoveish;
var isEndish = EventPluginUtils.isEndish;
var executeDirectDispatch = EventPluginUtils.executeDirectDispatch;
var hasDispatches = EventPluginUtils.hasDispatches;
-var executeDispatchesInOrderStopAtTrue =
- EventPluginUtils.executeDispatchesInOrderStopAtTrue;
+var executeDispatchesInOrderStopAtTrue = EventPluginUtils.executeDispatchesInOrderStopAtTrue;
/**
* Instance of element that should respond to touch/move types of interactions,
@@ -51,7 +50,7 @@ var changeResponder = function(nextResponderInst, blockHostResponder) {
ResponderEventPlugin.GlobalResponderHandler.onChange(
oldResponderInst,
nextResponderInst,
- blockHostResponder
+ blockHostResponder,
);
}
};
@@ -254,8 +253,6 @@ to return true:wantsResponderID| |
| |
+ + */
-
-
/**
* A note about event ordering in the `EventPluginHub`.
*
@@ -320,19 +317,20 @@ function setResponderAndExtractTransfer(
topLevelType,
targetInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
) {
- var shouldSetEventType =
- isStartish(topLevelType) ? eventTypes.startShouldSetResponder :
- isMoveish(topLevelType) ? eventTypes.moveShouldSetResponder :
- topLevelType === 'topSelectionChange' ?
- eventTypes.selectionChangeShouldSetResponder :
- eventTypes.scrollShouldSetResponder;
+ var shouldSetEventType = isStartish(topLevelType)
+ ? eventTypes.startShouldSetResponder
+ : isMoveish(topLevelType)
+ ? eventTypes.moveShouldSetResponder
+ : topLevelType === 'topSelectionChange'
+ ? eventTypes.selectionChangeShouldSetResponder
+ : eventTypes.scrollShouldSetResponder;
// TODO: stop one short of the current responder.
- var bubbleShouldSetFrom = !responderInst ?
- targetInst :
- ReactTreeTraversal.getLowestCommonAncestor(responderInst, targetInst);
+ var bubbleShouldSetFrom = !responderInst
+ ? targetInst
+ : ReactTreeTraversal.getLowestCommonAncestor(responderInst, targetInst);
// When capturing/bubbling the "shouldSet" event, we want to skip the target
// (deepest ID) if it happens to be the current responder. The reasoning:
@@ -343,7 +341,7 @@ function setResponderAndExtractTransfer(
shouldSetEventType,
bubbleShouldSetFrom,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
);
shouldSetEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
if (skipOverBubbleShouldSetFrom) {
@@ -364,19 +362,18 @@ function setResponderAndExtractTransfer(
eventTypes.responderGrant,
wantsResponderInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
);
grantEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(grantEvent);
var blockHostResponder = executeDirectDispatch(grantEvent) === true;
if (responderInst) {
-
var terminationRequestEvent = ResponderSyntheticEvent.getPooled(
eventTypes.responderTerminationRequest,
responderInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
);
terminationRequestEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(terminationRequestEvent);
@@ -391,7 +388,7 @@ function setResponderAndExtractTransfer(
eventTypes.responderTerminate,
responderInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
);
terminateEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(terminateEvent);
@@ -402,7 +399,7 @@ function setResponderAndExtractTransfer(
eventTypes.responderReject,
wantsResponderInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
);
rejectEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(rejectEvent);
@@ -424,17 +421,14 @@ function setResponderAndExtractTransfer(
* @return {boolean} True if a transfer of responder could possibly occur.
*/
function canTriggerTransfer(topLevelType, topLevelInst, nativeEvent) {
- return topLevelInst && (
+ return topLevelInst &&
// responderIgnoreScroll: We are trying to migrate away from specifically
// tracking native scroll events here and responderIgnoreScroll indicates we
// will send topTouchCancel to handle canceling touch events instead
- (topLevelType === 'topScroll' &&
- !nativeEvent.responderIgnoreScroll) ||
- (trackedTouchCount > 0 &&
- topLevelType === 'topSelectionChange') ||
- isStartish(topLevelType) ||
- isMoveish(topLevelType)
- );
+ ((topLevelType === 'topScroll' && !nativeEvent.responderIgnoreScroll) ||
+ (trackedTouchCount > 0 && topLevelType === 'topSelectionChange') ||
+ isStartish(topLevelType) ||
+ isMoveish(topLevelType));
}
/**
@@ -463,9 +457,7 @@ function noResponderTouches(nativeEvent) {
return true;
}
-
var ResponderEventPlugin = {
-
/* For unit testing only */
_getResponder: function() {
return responderInst;
@@ -482,7 +474,7 @@ var ResponderEventPlugin = {
topLevelType,
targetInst,
nativeEvent,
- nativeEventTarget
+ nativeEventTarget,
) {
if (isStartish(topLevelType)) {
trackedTouchCount += 1;
@@ -491,7 +483,7 @@ var ResponderEventPlugin = {
trackedTouchCount -= 1;
} else {
console.error(
- 'Ended a touch event which was not counted in `trackedTouchCount`.'
+ 'Ended a touch event which was not counted in `trackedTouchCount`.',
);
return null;
}
@@ -499,13 +491,14 @@ var ResponderEventPlugin = {
ResponderTouchHistoryStore.recordTouchTrack(topLevelType, nativeEvent);
- var extracted = canTriggerTransfer(topLevelType, targetInst, nativeEvent) ?
- setResponderAndExtractTransfer(
- topLevelType,
- targetInst,
- nativeEvent,
- nativeEventTarget) :
- null;
+ var extracted = canTriggerTransfer(topLevelType, targetInst, nativeEvent)
+ ? setResponderAndExtractTransfer(
+ topLevelType,
+ targetInst,
+ nativeEvent,
+ nativeEventTarget,
+ )
+ : null;
// Responder may or may not have transferred on a new touch start/move.
// Regardless, whoever is the responder after any potential transfer, we
// direct all touch start/move/ends to them in the form of
@@ -519,40 +512,39 @@ var ResponderEventPlugin = {
var isResponderTouchStart = responderInst && isStartish(topLevelType);
var isResponderTouchMove = responderInst && isMoveish(topLevelType);
var isResponderTouchEnd = responderInst && isEndish(topLevelType);
- var incrementalTouch =
- isResponderTouchStart ? eventTypes.responderStart :
- isResponderTouchMove ? eventTypes.responderMove :
- isResponderTouchEnd ? eventTypes.responderEnd :
- null;
+ var incrementalTouch = isResponderTouchStart
+ ? eventTypes.responderStart
+ : isResponderTouchMove
+ ? eventTypes.responderMove
+ : isResponderTouchEnd ? eventTypes.responderEnd : null;
if (incrementalTouch) {
- var gesture =
- ResponderSyntheticEvent.getPooled(
- incrementalTouch,
- responderInst,
- nativeEvent,
- nativeEventTarget
- );
+ var gesture = ResponderSyntheticEvent.getPooled(
+ incrementalTouch,
+ responderInst,
+ nativeEvent,
+ nativeEventTarget,
+ );
gesture.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(gesture);
extracted = accumulate(extracted, gesture);
}
- var isResponderTerminate =
- responderInst &&
+ var isResponderTerminate = responderInst &&
topLevelType === 'topTouchCancel';
- var isResponderRelease =
- responderInst &&
+ var isResponderRelease = responderInst &&
!isResponderTerminate &&
isEndish(topLevelType) &&
noResponderTouches(nativeEvent);
- var finalTouch =
- isResponderTerminate ? eventTypes.responderTerminate :
- isResponderRelease ? eventTypes.responderRelease :
- null;
+ var finalTouch = isResponderTerminate
+ ? eventTypes.responderTerminate
+ : isResponderRelease ? eventTypes.responderRelease : null;
if (finalTouch) {
var finalEvent = ResponderSyntheticEvent.getPooled(
- finalTouch, responderInst, nativeEvent, nativeEventTarget
+ finalTouch,
+ responderInst,
+ nativeEvent,
+ nativeEventTarget,
);
finalEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
EventPropagators.accumulateDirectDispatches(finalEvent);
@@ -560,12 +552,13 @@ var ResponderEventPlugin = {
changeResponder(null);
}
- var numberActiveTouches =
- ResponderTouchHistoryStore.touchHistory.numberActiveTouches;
- if (ResponderEventPlugin.GlobalInteractionHandler &&
- numberActiveTouches !== previousActiveTouches) {
+ var numberActiveTouches = ResponderTouchHistoryStore.touchHistory.numberActiveTouches;
+ if (
+ ResponderEventPlugin.GlobalInteractionHandler &&
+ numberActiveTouches !== previousActiveTouches
+ ) {
ResponderEventPlugin.GlobalInteractionHandler.onChange(
- numberActiveTouches
+ numberActiveTouches,
);
}
previousActiveTouches = numberActiveTouches;
diff --git a/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js b/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js
index f1cf77feac..f8e2132d56 100644
--- a/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js
+++ b/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js
@@ -30,8 +30,19 @@ var ResponderEventInterface = {
* @param {object} nativeEvent Native event.
* @extends {SyntheticEvent}
*/
-function ResponderSyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
- return SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
+function ResponderSyntheticEvent(
+ dispatchConfig,
+ dispatchMarker,
+ nativeEvent,
+ nativeEventTarget,
+) {
+ return SyntheticEvent.call(
+ this,
+ dispatchConfig,
+ dispatchMarker,
+ nativeEvent,
+ nativeEventTarget,
+ );
}
SyntheticEvent.augmentClass(ResponderSyntheticEvent, ResponderEventInterface);
diff --git a/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js b/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
index 78b7b31a80..b3831ce143 100644
--- a/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
+++ b/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
@@ -108,9 +108,9 @@ function getTouchIdentifier({identifier}: Touch): number {
warning(
identifier <= MAX_TOUCH_BANK,
'Touch identifier %s is greater than maximum supported %s which causes ' +
- 'performance issues backfilling array locations for all of the indices.',
+ 'performance issues backfilling array locations for all of the indices.',
identifier,
- MAX_TOUCH_BANK
+ MAX_TOUCH_BANK,
);
return identifier;
}
@@ -139,11 +139,10 @@ function recordTouchMove(touch: Touch): void {
touchHistory.mostRecentTimeStamp = timestampForTouch(touch);
} else {
console.error(
- 'Cannot record touch move without a touch start.\n' +
- 'Touch Move: %s\n',
+ 'Cannot record touch move without a touch start.\n' + 'Touch Move: %s\n',
'Touch Bank: %s',
printTouch(touch),
- printTouchBank()
+ printTouchBank(),
);
}
}
@@ -161,11 +160,10 @@ function recordTouchEnd(touch: Touch): void {
touchHistory.mostRecentTimeStamp = timestampForTouch(touch);
} else {
console.error(
- 'Cannot record touch end without a touch start.\n' +
- 'Touch End: %s\n',
+ 'Cannot record touch end without a touch start.\n' + 'Touch End: %s\n',
'Touch Bank: %s',
printTouch(touch),
- printTouchBank()
+ printTouchBank(),
);
}
}
@@ -195,8 +193,9 @@ const ResponderTouchHistoryStore = {
nativeEvent.changedTouches.forEach(recordTouchStart);
touchHistory.numberActiveTouches = nativeEvent.touches.length;
if (touchHistory.numberActiveTouches === 1) {
- touchHistory.indexOfSingleActiveTouch =
- nativeEvent.touches[0].identifier;
+ touchHistory.indexOfSingleActiveTouch = nativeEvent.touches[
+ 0
+ ].identifier;
}
} else if (isEndish(topLevelType)) {
nativeEvent.changedTouches.forEach(recordTouchEnd);
@@ -212,9 +211,8 @@ const ResponderTouchHistoryStore = {
if (__DEV__) {
const activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
warning(
- activeRecord != null &&
- activeRecord.touchActive,
- 'Cannot find single active touch.'
+ activeRecord != null && activeRecord.touchActive,
+ 'Cannot find single active touch.',
);
}
}
@@ -224,5 +222,4 @@ const ResponderTouchHistoryStore = {
touchHistory,
};
-
module.exports = ResponderTouchHistoryStore;
diff --git a/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js b/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js
index a2a725bd2f..50006f7e72 100644
--- a/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js
+++ b/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js
@@ -21,30 +21,44 @@ var TouchHistoryMath = {
* touches vs. previous centroid of now actively moving touches.
* @return {number} value of centroid in specified dimension.
*/
- centroidDimension: function(touchHistory, touchesChangedAfter, isXAxis, ofCurrent) {
+ centroidDimension: function(
+ touchHistory,
+ touchesChangedAfter,
+ isXAxis,
+ ofCurrent,
+ ) {
var touchBank = touchHistory.touchBank;
var total = 0;
var count = 0;
- var oneTouchData = touchHistory.numberActiveTouches === 1 ?
- touchHistory.touchBank[touchHistory.indexOfSingleActiveTouch] : null;
+ var oneTouchData = touchHistory.numberActiveTouches === 1
+ ? touchHistory.touchBank[touchHistory.indexOfSingleActiveTouch]
+ : null;
if (oneTouchData !== null) {
- if (oneTouchData.touchActive && oneTouchData.currentTimeStamp > touchesChangedAfter) {
- total += ofCurrent && isXAxis ? oneTouchData.currentPageX :
- ofCurrent && !isXAxis ? oneTouchData.currentPageY :
- !ofCurrent && isXAxis ? oneTouchData.previousPageX :
- oneTouchData.previousPageY;
+ if (
+ oneTouchData.touchActive &&
+ oneTouchData.currentTimeStamp > touchesChangedAfter
+ ) {
+ total += ofCurrent && isXAxis
+ ? oneTouchData.currentPageX
+ : ofCurrent && !isXAxis
+ ? oneTouchData.currentPageY
+ : !ofCurrent && isXAxis
+ ? oneTouchData.previousPageX
+ : oneTouchData.previousPageY;
count = 1;
}
} else {
for (var i = 0; i < touchBank.length; i++) {
var touchTrack = touchBank[i];
- if (touchTrack !== null &&
- touchTrack !== undefined &&
- touchTrack.touchActive &&
- touchTrack.currentTimeStamp >= touchesChangedAfter) {
- var toAdd; // Yuck, program temporarily in invalid state.
+ if (
+ touchTrack !== null &&
+ touchTrack !== undefined &&
+ touchTrack.touchActive &&
+ touchTrack.currentTimeStamp >= touchesChangedAfter
+ ) {
+ var toAdd; // Yuck, program temporarily in invalid state.
if (ofCurrent && isXAxis) {
toAdd = touchTrack.currentPageX;
} else if (ofCurrent && !isXAxis) {
@@ -62,57 +76,69 @@ var TouchHistoryMath = {
return count > 0 ? total / count : TouchHistoryMath.noCentroid;
},
- currentCentroidXOfTouchesChangedAfter: function(touchHistory, touchesChangedAfter) {
+ currentCentroidXOfTouchesChangedAfter: function(
+ touchHistory,
+ touchesChangedAfter,
+ ) {
return TouchHistoryMath.centroidDimension(
touchHistory,
touchesChangedAfter,
- true, // isXAxis
- true // ofCurrent
+ true, // isXAxis
+ true, // ofCurrent
);
},
- currentCentroidYOfTouchesChangedAfter: function(touchHistory, touchesChangedAfter) {
+ currentCentroidYOfTouchesChangedAfter: function(
+ touchHistory,
+ touchesChangedAfter,
+ ) {
return TouchHistoryMath.centroidDimension(
touchHistory,
touchesChangedAfter,
- false, // isXAxis
- true // ofCurrent
+ false, // isXAxis
+ true, // ofCurrent
);
},
- previousCentroidXOfTouchesChangedAfter: function(touchHistory, touchesChangedAfter) {
+ previousCentroidXOfTouchesChangedAfter: function(
+ touchHistory,
+ touchesChangedAfter,
+ ) {
return TouchHistoryMath.centroidDimension(
touchHistory,
touchesChangedAfter,
- true, // isXAxis
- false // ofCurrent
+ true, // isXAxis
+ false, // ofCurrent
);
},
- previousCentroidYOfTouchesChangedAfter: function(touchHistory, touchesChangedAfter) {
+ previousCentroidYOfTouchesChangedAfter: function(
+ touchHistory,
+ touchesChangedAfter,
+ ) {
return TouchHistoryMath.centroidDimension(
touchHistory,
touchesChangedAfter,
- false, // isXAxis
- false // ofCurrent
+ false, // isXAxis
+ false, // ofCurrent
);
},
currentCentroidX: function(touchHistory) {
return TouchHistoryMath.centroidDimension(
touchHistory,
- 0, // touchesChangedAfter
- true, // isXAxis
- true // ofCurrent
+ 0, // touchesChangedAfter
+ true, // isXAxis
+ true, // ofCurrent
);
},
currentCentroidY: function(touchHistory) {
return TouchHistoryMath.centroidDimension(
touchHistory,
- 0, // touchesChangedAfter
- false, // isXAxis
- true // ofCurrent
+ 0, // touchesChangedAfter
+ false, // isXAxis
+ true, // ofCurrent
);
},
diff --git a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
index b831e97e64..ed62c2fb83 100644
--- a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
+++ b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
@@ -62,22 +62,25 @@ var _touchConfig = function(
targetNodeHandle,
allTouchHandles,
changedIndices,
- eventTarget
+ eventTarget,
) {
var allTouchObjects = allTouchHandles.map(touch);
var changedTouchObjects = subsequence(allTouchObjects, changedIndices);
- var activeTouchObjects =
- topType === 'topTouchStart' ? allTouchObjects :
- topType === 'topTouchMove' ? allTouchObjects :
- topType === 'topTouchEnd' ? antiSubsequence(allTouchObjects, changedIndices) :
- topType === 'topTouchCancel' ? antiSubsequence(allTouchObjects, changedIndices) :
- null;
+ var activeTouchObjects = topType === 'topTouchStart'
+ ? allTouchObjects
+ : topType === 'topTouchMove'
+ ? allTouchObjects
+ : topType === 'topTouchEnd'
+ ? antiSubsequence(allTouchObjects, changedIndices)
+ : topType === 'topTouchCancel'
+ ? antiSubsequence(allTouchObjects, changedIndices)
+ : null;
return {
nativeEvent: touchEvent(
targetNodeHandle,
activeTouchObjects,
- changedTouchObjects
+ changedTouchObjects,
),
topLevelType: topType,
targetInst: getInstanceFromNode(targetNodeHandle),
@@ -108,7 +111,7 @@ var startConfig = function(nodeHandle, allTouchHandles, changedIndices) {
nodeHandle,
allTouchHandles,
changedIndices,
- nodeHandle
+ nodeHandle,
);
};
@@ -121,7 +124,7 @@ var moveConfig = function(nodeHandle, allTouchHandles, changedIndices) {
nodeHandle,
allTouchHandles,
changedIndices,
- nodeHandle
+ nodeHandle,
);
};
@@ -134,7 +137,7 @@ var endConfig = function(nodeHandle, allTouchHandles, changedIndices) {
nodeHandle,
allTouchHandles,
changedIndices,
- nodeHandle
+ nodeHandle,
);
};
@@ -169,31 +172,40 @@ var NA = -1;
var oneEventLoopTestConfig = function(readableIDToID) {
var ret = {
// Negotiation
- scrollShouldSetResponder: {bubbled: {}, captured: {}},
- startShouldSetResponder: {bubbled: {}, captured: {}},
- moveShouldSetResponder: {bubbled: {}, captured: {}},
+ scrollShouldSetResponder: {bubbled: {}, captured: {}},
+ startShouldSetResponder: {bubbled: {}, captured: {}},
+ moveShouldSetResponder: {bubbled: {}, captured: {}},
responderTerminationRequest: {},
// Non-negotiation
- responderReject: {}, // These do not bubble capture.
- responderGrant: {},
- responderStart: {},
- responderMove: {},
+ responderReject: {}, // These do not bubble capture.
+ responderGrant: {},
+ responderStart: {},
+ responderMove: {},
responderTerminate: {},
- responderEnd: {},
- responderRelease: {},
+ responderEnd: {},
+ responderRelease: {},
};
for (var eventName in ret) {
for (var readableNodeName in readableIDToID) {
if (ret[eventName].bubbled) {
// Two phase
- ret[eventName].bubbled[readableNodeName] =
- {order: NA, assertEvent: null, returnVal: undefined};
- ret[eventName].captured[readableNodeName] =
- {order: NA, assertEvent: null, returnVal: undefined};
+ ret[eventName].bubbled[readableNodeName] = {
+ order: NA,
+ assertEvent: null,
+ returnVal: undefined,
+ };
+ ret[eventName].captured[readableNodeName] = {
+ order: NA,
+ assertEvent: null,
+ returnVal: undefined,
+ };
} else {
- ret[eventName][readableNodeName] =
- {order: NA, assertEvent: null, returnVal: undefined};
+ ret[eventName][readableNodeName] = {
+ order: NA,
+ assertEvent: null,
+ returnVal: undefined,
+ };
}
}
}
@@ -209,9 +221,13 @@ var registerTestHandlers = function(eventTestConfig, readableIDToID) {
var neverFire = function(readableID, registrationName) {
runs.dispatchCount++;
expect('').toBe(
- 'Event type: ' + registrationName +
- '\nShould never occur on:' + readableID +
- '\nFor event test config:\n' + JSON.stringify(eventTestConfig) + '\n'
+ 'Event type: ' +
+ registrationName +
+ '\nShould never occur on:' +
+ readableID +
+ '\nFor event test config:\n' +
+ JSON.stringify(eventTestConfig) +
+ '\n',
);
};
@@ -219,20 +235,19 @@ var registerTestHandlers = function(eventTestConfig, readableIDToID) {
for (var readableID in eventTypeTestConfig) {
var nodeConfig = eventTypeTestConfig[readableID];
var id = readableIDToID[readableID];
- var handler = nodeConfig.order === NA ? neverFire.bind(null, readableID, registrationName) :
- // We partially apply readableID and nodeConfig, as they change in the
- // parent closure across iterations.
- function(rID, config, e) {
- expect(
- rID + '->' + registrationName + ' index:' + runs.dispatchCount++
- ).toBe(
- rID + '->' + registrationName + ' index:' + config.order
- );
- if (config.assertEvent) {
- config.assertEvent(e);
- }
- return config.returnVal;
- }.bind(null, readableID, nodeConfig);
+ var handler = nodeConfig.order === NA
+ ? neverFire.bind(null, readableID, registrationName)
+ : // We partially apply readableID and nodeConfig, as they change in the
+ // parent closure across iterations.
+ function(rID, config, e) {
+ expect(
+ rID + '->' + registrationName + ' index:' + runs.dispatchCount++,
+ ).toBe(rID + '->' + registrationName + ' index:' + config.order);
+ if (config.assertEvent) {
+ config.assertEvent(e);
+ }
+ return config.returnVal;
+ }.bind(null, readableID, nodeConfig);
putListener(getInstanceFromNode(id), registrationName, handler);
}
};
@@ -241,17 +256,21 @@ var registerTestHandlers = function(eventTestConfig, readableIDToID) {
var hasTwoPhase = !!oneEventTypeTestConfig.bubbled;
if (hasTwoPhase) {
registerOneEventType(
- ResponderEventPlugin.eventTypes[eventName].phasedRegistrationNames.bubbled,
- oneEventTypeTestConfig.bubbled
+ ResponderEventPlugin.eventTypes[
+ eventName
+ ].phasedRegistrationNames.bubbled,
+ oneEventTypeTestConfig.bubbled,
);
registerOneEventType(
- ResponderEventPlugin.eventTypes[eventName].phasedRegistrationNames.captured,
- oneEventTypeTestConfig.captured
+ ResponderEventPlugin.eventTypes[
+ eventName
+ ].phasedRegistrationNames.captured,
+ oneEventTypeTestConfig.captured,
);
} else {
registerOneEventType(
ResponderEventPlugin.eventTypes[eventName].registrationName,
- oneEventTypeTestConfig
+ oneEventTypeTestConfig,
);
}
}
@@ -284,7 +303,7 @@ var run = function(config, hierarchyConfig, nativeEventConfig) {
nativeEventConfig.topLevelType,
nativeEventConfig.targetInst,
nativeEventConfig.nativeEvent,
- nativeEventConfig.target
+ nativeEventConfig.target,
);
// At this point the negotiation events have been dispatched as part of the
@@ -294,41 +313,39 @@ var run = function(config, hierarchyConfig, nativeEventConfig) {
EventPluginHub.processEventQueue(true);
// Ensure that every event that declared an `order`, was actually dispatched.
- expect(
- 'number of events dispatched:' + runData.dispatchCount
- ).toBe(
- 'number of events dispatched:' + (max + 1)
+ expect('number of events dispatched:' + runData.dispatchCount).toBe(
+ 'number of events dispatched:' + (max + 1),
); // +1 for extra ++
};
-var GRANDPARENT_HOST_NODE = { };
-var PARENT_HOST_NODE = { };
-var CHILD_HOST_NODE = { };
-var CHILD_HOST_NODE2 = { };
+var GRANDPARENT_HOST_NODE = {};
+var PARENT_HOST_NODE = {};
+var CHILD_HOST_NODE = {};
+var CHILD_HOST_NODE2 = {};
var GRANDPARENT_INST = {
_hostParent: null,
_rootNodeID: '1',
_hostNode: GRANDPARENT_HOST_NODE,
- _currentElement: { props: {} },
+ _currentElement: {props: {}},
};
var PARENT_INST = {
_hostParent: GRANDPARENT_INST,
_rootNodeID: '2',
_hostNode: PARENT_HOST_NODE,
- _currentElement: { props: {} },
+ _currentElement: {props: {}},
};
var CHILD_INST = {
_hostParent: PARENT_INST,
_rootNodeID: '3',
_hostNode: CHILD_HOST_NODE,
- _currentElement: { props: {} },
+ _currentElement: {props: {}},
};
var CHILD_INST2 = {
_hostParent: PARENT_INST,
_rootNodeID: '4',
_hostNode: CHILD_HOST_NODE2,
- _currentElement: { props: {} },
+ _currentElement: {props: {}},
};
GRANDPARENT_HOST_NODE._reactInstance = GRANDPARENT_INST;
@@ -365,7 +382,6 @@ function deleteAllListeners(node) {
}
describe('ResponderEventPlugin', () => {
-
beforeEach(() => {
jest.resetModules();
@@ -386,12 +402,27 @@ describe('ResponderEventPlugin', () => {
it('should do nothing when no one wants to respond', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.child = {
+ order: 2,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
- config.startShouldSetResponder.bubbled.parent = {order: 4, returnVal: false};
- config.startShouldSetResponder.bubbled.grandParent = {order: 5, returnVal: false};
+ config.startShouldSetResponder.bubbled.parent = {
+ order: 4,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.bubbled.grandParent = {
+ order: 5,
+ returnVal: false,
+ };
run(config, three, startConfig(three.child, [three.child], [0]));
expect(ResponderEventPlugin._getResponder()).toBe(null);
@@ -401,20 +432,23 @@ describe('ResponderEventPlugin', () => {
expect(ResponderEventPlugin._getResponder()).toBe(null);
});
-
/**
* Simple Start Granting
* --------------------
*/
-
it('should grant responder grandParent while capturing', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: true};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: true,
+ };
config.responderGrant.grandParent = {order: 1};
config.responderStart.grandParent = {order: 2};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.grandParent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
@@ -425,12 +459,20 @@ describe('ResponderEventPlugin', () => {
it('should grant responder parent while capturing', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: true};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: true,
+ };
config.responderGrant.parent = {order: 2};
config.responderStart.parent = {order: 3};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.parent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
@@ -441,13 +483,21 @@ describe('ResponderEventPlugin', () => {
it('should grant responder child while capturing', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.startShouldSetResponder.captured.child = {order: 2, returnVal: true};
config.responderGrant.child = {order: 3};
config.responderStart.child = {order: 4};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
@@ -458,14 +508,25 @@ describe('ResponderEventPlugin', () => {
it('should grant responder child while bubbling', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.child = {
+ order: 2,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
config.responderGrant.child = {order: 4};
config.responderStart.child = {order: 5};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
@@ -476,15 +537,26 @@ describe('ResponderEventPlugin', () => {
it('should grant responder parent while bubbling', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.child = {
+ order: 2,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
config.startShouldSetResponder.bubbled.parent = {order: 4, returnVal: true};
config.responderGrant.parent = {order: 5};
config.responderStart.parent = {order: 6};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.parent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
@@ -495,16 +567,33 @@ describe('ResponderEventPlugin', () => {
it('should grant responder grandParent while bubbling', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.child = {
+ order: 2,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
- config.startShouldSetResponder.bubbled.parent = {order: 4, returnVal: false};
- config.startShouldSetResponder.bubbled.grandParent = {order: 5, returnVal: true};
+ config.startShouldSetResponder.bubbled.parent = {
+ order: 4,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.bubbled.grandParent = {
+ order: 5,
+ returnVal: true,
+ };
config.responderGrant.grandParent = {order: 6};
config.responderStart.grandParent = {order: 7};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.grandParent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
@@ -513,8 +602,6 @@ describe('ResponderEventPlugin', () => {
expect(ResponderEventPlugin._getResponder()).toBe(null);
});
-
-
/**
* Simple Move Granting
* --------------------
@@ -532,11 +619,16 @@ describe('ResponderEventPlugin', () => {
run(config, three, startConfig(three.child, [three.child], [0]));
config = oneEventLoopTestConfig(three);
- config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: true};
+ config.moveShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: true,
+ };
config.responderGrant.grandParent = {order: 1};
config.responderMove.grandParent = {order: 2};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.grandParent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
@@ -557,12 +649,17 @@ describe('ResponderEventPlugin', () => {
run(config, three, startConfig(three.child, [three.child], [0]));
config = oneEventLoopTestConfig(three);
- config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
+ config.moveShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: true};
config.responderGrant.parent = {order: 2};
config.responderMove.parent = {order: 3};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.parent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
@@ -583,13 +680,21 @@ describe('ResponderEventPlugin', () => {
run(config, three, startConfig(three.child, [three.child], [0]));
config = oneEventLoopTestConfig(three);
- config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+ config.moveShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.moveShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.moveShouldSetResponder.captured.child = {order: 2, returnVal: true};
config.responderGrant.child = {order: 3};
config.responderMove.child = {order: 4};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
@@ -610,14 +715,22 @@ describe('ResponderEventPlugin', () => {
run(config, three, startConfig(three.child, [three.child], [0]));
config = oneEventLoopTestConfig(three);
- config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+ config.moveShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.moveShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.moveShouldSetResponder.captured.child = {order: 2, returnVal: false};
config.moveShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
config.responderGrant.child = {order: 4};
config.responderMove.child = {order: 5};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
@@ -638,15 +751,23 @@ describe('ResponderEventPlugin', () => {
run(config, three, startConfig(three.child, [three.child], [0]));
config = oneEventLoopTestConfig(three);
- config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+ config.moveShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.moveShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.moveShouldSetResponder.captured.child = {order: 2, returnVal: false};
config.moveShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
config.moveShouldSetResponder.bubbled.parent = {order: 4, returnVal: true};
config.responderGrant.parent = {order: 5};
config.responderMove.parent = {order: 6};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.parent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
@@ -667,16 +788,27 @@ describe('ResponderEventPlugin', () => {
run(config, three, startConfig(three.child, [three.child], [0]));
config = oneEventLoopTestConfig(three);
- config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+ config.moveShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.moveShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.moveShouldSetResponder.captured.child = {order: 2, returnVal: false};
config.moveShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
config.moveShouldSetResponder.bubbled.parent = {order: 4, returnVal: false};
- config.moveShouldSetResponder.bubbled.grandParent = {order: 5, returnVal: true};
+ config.moveShouldSetResponder.bubbled.grandParent = {
+ order: 5,
+ returnVal: true,
+ };
config.responderGrant.grandParent = {order: 6};
config.responderMove.grandParent = {order: 7};
run(config, three, moveConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.grandParent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
@@ -685,7 +817,6 @@ describe('ResponderEventPlugin', () => {
expect(ResponderEventPlugin._getResponder()).toBe(null);
});
-
/**
* Common ancestor tests
* ---------------------
@@ -693,22 +824,38 @@ describe('ResponderEventPlugin', () => {
it('should bubble negotiation to first common ancestor of responder', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: true};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: true,
+ };
config.responderGrant.parent = {order: 2};
config.responderStart.parent = {order: 3};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.parent),
+ );
// While `parent` is still responder, we create new handlers that verify
// the ordering of propagation, restarting the count at `0`.
config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
- config.startShouldSetResponder.bubbled.grandParent = {order: 1, returnVal: false};
+ config.startShouldSetResponder.bubbled.grandParent = {
+ order: 1,
+ returnVal: false,
+ };
config.responderStart.parent = {order: 2};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.parent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.parent = {order: 0};
@@ -719,29 +866,48 @@ describe('ResponderEventPlugin', () => {
it('should bubble negotiation to first common ancestor of responder then transfer', () => {
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: true};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: true,
+ };
config.responderGrant.parent = {order: 2};
config.responderStart.parent = {order: 3};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.parent),
+ );
config = oneEventLoopTestConfig(three);
// Parent is responder, and responder is transferred by a second touch start
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: true};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: true,
+ };
config.responderGrant.grandParent = {order: 1};
config.responderTerminationRequest.parent = {order: 2, returnVal: true};
config.responderTerminate.parent = {order: 3};
config.responderStart.grandParent = {order: 4};
- run(config, three, startConfig(three.child, [three.child, three.child], [1]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+ run(
+ config,
+ three,
+ startConfig(three.child, [three.child, three.child], [1]),
+ );
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.grandParent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
- // one remains\ /one ended \
+ // one remains\ /one ended \
run(config, three, endConfig(three.child, [three.child, three.child], [1]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.grandParent),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.grandParent = {order: 0};
@@ -757,10 +923,22 @@ describe('ResponderEventPlugin', () => {
it('should negotiate with deepest target on second touch if nothing is responder', () => {
// Initially nothing wants to become the responder
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.bubbled.parent = {order: 2, returnVal: false};
- config.startShouldSetResponder.bubbled.grandParent = {order: 3, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.bubbled.parent = {
+ order: 2,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.bubbled.grandParent = {
+ order: 3,
+ returnVal: false,
+ };
run(config, three, startConfig(three.parent, [three.parent], [0]));
expect(ResponderEventPlugin._getResponder()).toBe(null);
@@ -771,16 +949,30 @@ describe('ResponderEventPlugin', () => {
// as the target is because we don't find first common ancestor (with
// current responder) because there is no current responder.
// (Even if this is the second active touch).
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.child = {
+ order: 2,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
config.responderGrant.child = {order: 4};
config.responderStart.child = {order: 5};
// / Two active touches \ /one of them new\
- run(config, three, startConfig(three.child, [three.parent, three.child], [1]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+ run(
+ config,
+ three,
+ startConfig(three.child, [three.parent, three.child], [1]),
+ );
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
// Now we remove the original first touch, keeping the second touch that
// started within the current responder (child). Nothing changes because
@@ -788,50 +980,90 @@ describe('ResponderEventPlugin', () => {
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
// / one ended\ /one remains \
- run(config, three, endConfig(three.child, [three.parent, three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ run(
+ config,
+ three,
+ endConfig(three.child, [three.parent, three.child], [0]),
+ );
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
// Okay, now let's add back that first touch (nothing should change) and
// then we'll try peeling back the touches in the opposite order to make
// sure that first removing the second touch instantly causes responder to
// be released.
config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.bubbled.parent = {order: 2, returnVal: false};
- config.startShouldSetResponder.bubbled.grandParent = {order: 3, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.bubbled.parent = {
+ order: 2,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.bubbled.grandParent = {
+ order: 3,
+ returnVal: false,
+ };
// Interesting: child still gets moves even though touch target is parent!
// Current responder gets a `responderStart` for any touch while responder.
config.responderStart.child = {order: 4};
// / Two active touches \ /one of them new\
- run(config, three, startConfig(three.parent, [three.child, three.parent], [1]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+ run(
+ config,
+ three,
+ startConfig(three.parent, [three.child, three.parent], [1]),
+ );
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
// Now, move that new touch that had no effect, and did not start within
// the current responder.
config = oneEventLoopTestConfig(three);
- config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+ config.moveShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.moveShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.moveShouldSetResponder.bubbled.parent = {order: 2, returnVal: false};
- config.moveShouldSetResponder.bubbled.grandParent = {order: 3, returnVal: false};
+ config.moveShouldSetResponder.bubbled.grandParent = {
+ order: 3,
+ returnVal: false,
+ };
// Interesting: child still gets moves even though touch target is parent!
// Current responder gets a `responderMove` for any touch while responder.
config.responderMove.child = {order: 4};
// / Two active touches \ /one of them moved\
- run(config, three, moveConfig(three.parent, [three.child, three.parent], [1]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+ run(
+ config,
+ three,
+ moveConfig(three.parent, [three.child, three.parent], [1]),
+ );
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
config.responderRelease.child = {order: 1};
// /child end \ /parent remain\
- run(config, three, endConfig(three.child, [three.child, three.parent], [0]));
+ run(
+ config,
+ three,
+ endConfig(three.child, [three.child, three.parent], [0]),
+ );
expect(ResponderEventPlugin._getResponder()).toBe(null);
});
-
/**
* If nothing is responder, then the negotiation should propagate directly to
* the deepest target in the second touch.
@@ -839,65 +1071,131 @@ describe('ResponderEventPlugin', () => {
it('should negotiate until first common ancestor when there are siblings', () => {
// Initially nothing wants to become the responder
var config = oneEventLoopTestConfig(siblings);
- config.startShouldSetResponder.captured.parent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.childOne = {order: 1, returnVal: false};
- config.startShouldSetResponder.bubbled.childOne = {order: 2, returnVal: true};
+ config.startShouldSetResponder.captured.parent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.childOne = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.bubbled.childOne = {
+ order: 2,
+ returnVal: true,
+ };
config.responderGrant.childOne = {order: 3};
config.responderStart.childOne = {order: 4};
- run(config, siblings, startConfig(siblings.childOne, [siblings.childOne], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(siblings.childOne));
+ run(
+ config,
+ siblings,
+ startConfig(siblings.childOne, [siblings.childOne], [0]),
+ );
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(siblings.childOne),
+ );
// If the touch target is the sibling item, the negotiation should only
// propagate to first common ancestor of current responder and sibling (so
// the parent).
config = oneEventLoopTestConfig(siblings);
- config.startShouldSetResponder.captured.parent = {order: 0, returnVal: false};
- config.startShouldSetResponder.bubbled.parent = {order: 1, returnVal: false};
+ config.startShouldSetResponder.captured.parent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.bubbled.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.responderStart.childOne = {order: 2};
- var touchConfig =
- startConfig(siblings.childTwo, [siblings.childOne, siblings.childTwo], [1]);
+ var touchConfig = startConfig(
+ siblings.childTwo,
+ [siblings.childOne, siblings.childTwo],
+ [1],
+ );
run(config, siblings, touchConfig);
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(siblings.childOne));
-
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(siblings.childOne),
+ );
// move childOne
config = oneEventLoopTestConfig(siblings);
- config.moveShouldSetResponder.captured.parent = {order: 0, returnVal: false};
+ config.moveShouldSetResponder.captured.parent = {
+ order: 0,
+ returnVal: false,
+ };
config.moveShouldSetResponder.bubbled.parent = {order: 1, returnVal: false};
config.responderMove.childOne = {order: 2};
- run(config, siblings, moveConfig(siblings.childOne, [siblings.childOne, siblings.childTwo], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(siblings.childOne));
+ run(
+ config,
+ siblings,
+ moveConfig(
+ siblings.childOne,
+ [siblings.childOne, siblings.childTwo],
+ [0],
+ ),
+ );
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(siblings.childOne),
+ );
// move childTwo: Only negotiates to `parent`.
config = oneEventLoopTestConfig(siblings);
- config.moveShouldSetResponder.captured.parent = {order: 0, returnVal: false};
+ config.moveShouldSetResponder.captured.parent = {
+ order: 0,
+ returnVal: false,
+ };
config.moveShouldSetResponder.bubbled.parent = {order: 1, returnVal: false};
config.responderMove.childOne = {order: 2};
- run(config, siblings, moveConfig(siblings.childTwo, [siblings.childOne, siblings.childTwo], [1]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(siblings.childOne));
-
+ run(
+ config,
+ siblings,
+ moveConfig(
+ siblings.childTwo,
+ [siblings.childOne, siblings.childTwo],
+ [1],
+ ),
+ );
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(siblings.childOne),
+ );
});
-
it('should notify of being rejected. responderStart/Move happens on current responder', () => {
// Initially nothing wants to become the responder
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.child = {
+ order: 2,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
config.responderGrant.child = {order: 4};
config.responderStart.child = {order: 5};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
// Suppose parent wants to become responder on move, and is rejected
config = oneEventLoopTestConfig(three);
- config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+ config.moveShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.moveShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.moveShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
config.responderGrant.parent = {order: 3};
config.responderTerminationRequest.child = {order: 4, returnVal: false};
@@ -905,14 +1203,21 @@ describe('ResponderEventPlugin', () => {
// The start/move should occur on the original responder if new one is rejected
config.responderMove.child = {order: 6};
- var touchConfig =
- moveConfig(three.child, [three.child], [0]);
+ var touchConfig = moveConfig(three.child, [three.child], [0]);
run(config, three, touchConfig);
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
config.responderGrant.parent = {order: 3};
config.responderTerminationRequest.child = {order: 4, returnVal: false};
@@ -920,34 +1225,53 @@ describe('ResponderEventPlugin', () => {
// The start/move should occur on the original responder if new one is rejected
config.responderStart.child = {order: 6};
- touchConfig =
- startConfig(three.child, [three.child, three.child], [1]);
+ touchConfig = startConfig(three.child, [three.child, three.child], [1]);
run(config, three, touchConfig);
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
});
-
it('should negotiate scroll', () => {
// Initially nothing wants to become the responder
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.child = {
+ order: 2,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
config.responderGrant.child = {order: 4};
config.responderStart.child = {order: 5};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
// If the touch target is the sibling item, the negotiation should only
// propagate to first common ancestor of current responder and sibling (so
// the parent).
config = oneEventLoopTestConfig(three);
- config.scrollShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.scrollShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.scrollShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
+ config.scrollShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.scrollShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.scrollShouldSetResponder.bubbled.parent = {
+ order: 2,
+ returnVal: true,
+ };
config.responderGrant.parent = {order: 3};
config.responderTerminationRequest.child = {order: 4, returnVal: false};
config.responderReject.parent = {order: 5};
@@ -957,14 +1281,24 @@ describe('ResponderEventPlugin', () => {
targetInst: getInstanceFromNode(three.parent),
nativeEvent: {},
});
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
// Now lets let the scroll take control this time.
config = oneEventLoopTestConfig(three);
- config.scrollShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.scrollShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.scrollShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
+ config.scrollShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.scrollShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.scrollShouldSetResponder.bubbled.parent = {
+ order: 2,
+ returnVal: true,
+ };
config.responderGrant.parent = {order: 3};
config.responderTerminationRequest.child = {order: 4, returnVal: true};
config.responderTerminate.child = {order: 5};
@@ -974,23 +1308,34 @@ describe('ResponderEventPlugin', () => {
targetInst: getInstanceFromNode(three.parent),
nativeEvent: {},
});
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
-
-
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.parent),
+ );
});
it('should cancel correctly', () => {
// Initially our child becomes responder
var config = oneEventLoopTestConfig(three);
- config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
- config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
- config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+ config.startShouldSetResponder.captured.grandParent = {
+ order: 0,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.parent = {
+ order: 1,
+ returnVal: false,
+ };
+ config.startShouldSetResponder.captured.child = {
+ order: 2,
+ returnVal: false,
+ };
config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
config.responderGrant.child = {order: 4};
config.responderStart.child = {order: 5};
run(config, three, startConfig(three.child, [three.child], [0]));
- expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+ expect(ResponderEventPlugin._getResponder()).toBe(
+ getInstanceFromNode(three.child),
+ );
config = oneEventLoopTestConfig(three);
config.responderEnd.child = {order: 0};
@@ -1000,7 +1345,7 @@ describe('ResponderEventPlugin', () => {
'topTouchCancel',
three.child,
[three.child],
- [0]
+ [0],
);
run(config, three, nativeEvent);
expect(ResponderEventPlugin._getResponder()).toBe(null);
diff --git a/src/renderers/shared/shared/getContextForSubtree.js b/src/renderers/shared/shared/getContextForSubtree.js
index 84f7e6a811..2883e36834 100644
--- a/src/renderers/shared/shared/getContextForSubtree.js
+++ b/src/renderers/shared/shared/getContextForSubtree.js
@@ -19,7 +19,9 @@ let getContextFiber = function(arg) {
invariant(false, 'Missing injection for fiber getContextForSubtree');
};
-function getContextForSubtree(parentComponent : ?ReactComponent<any, any, any>) : Object {
+function getContextForSubtree(
+ parentComponent: ?ReactComponent<any, any, any>,
+): Object {
if (!parentComponent) {
return emptyObject;
}
diff --git a/src/renderers/shared/shared/shouldUpdateReactComponent.js b/src/renderers/shared/shared/shouldUpdateReactComponent.js
index 2c4a155429..9a723b884d 100644
--- a/src/renderers/shared/shared/shouldUpdateReactComponent.js
+++ b/src/renderers/shared/shared/shouldUpdateReactComponent.js
@@ -32,13 +32,11 @@ function shouldUpdateReactComponent(prevElement, nextElement) {
var prevType = typeof prevElement;
var nextType = typeof nextElement;
if (prevType === 'string' || prevType === 'number') {
- return (nextType === 'string' || nextType === 'number');
+ return nextType === 'string' || nextType === 'number';
} else {
- return (
- nextType === 'object' &&
+ return nextType === 'object' &&
prevElement.type === nextElement.type &&
- prevElement.key === nextElement.key
- );
+ prevElement.key === nextElement.key;
}
}
diff --git a/src/renderers/shared/stack/reconciler/CallbackQueue.js b/src/renderers/shared/stack/reconciler/CallbackQueue.js
index 5816938448..c82dbfccd9 100644
--- a/src/renderers/shared/stack/reconciler/CallbackQueue.js
+++ b/src/renderers/shared/stack/reconciler/CallbackQueue.js
@@ -66,7 +66,7 @@ class CallbackQueue<T> {
if (callbacks && contexts) {
invariant(
callbacks.length === contexts.length,
- 'Mismatched list of contexts in callback queue'
+ 'Mismatched list of contexts in callback queue',
);
this._callbacks = null;
this._contexts = null;
diff --git a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
index d858ed07ee..7c9a13bfd0 100644
--- a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
+++ b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
@@ -37,7 +37,7 @@ if (
function instantiateChild(childInstances, child, name, selfDebugID) {
// We found a component instance.
- var keyUnique = (childInstances[name] === undefined);
+ var keyUnique = childInstances[name] === undefined;
if (__DEV__) {
if (!ReactComponentTreeHook) {
ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
@@ -46,10 +46,10 @@ function instantiateChild(childInstances, child, name, selfDebugID) {
warning(
false,
'flattenChildren(...): Encountered two children with the same key, ' +
- '`%s`. Child keys must be unique; when two children share a key, only ' +
- 'the first child will be used.%s',
+ '`%s`. Child keys must be unique; when two children share a key, only ' +
+ 'the first child will be used.%s',
KeyEscapeUtils.unescape(name),
- ReactComponentTreeHook.getStackAddendumByID(selfDebugID)
+ ReactComponentTreeHook.getStackAddendumByID(selfDebugID),
);
}
}
@@ -76,7 +76,7 @@ var ReactChildReconciler = {
nestedChildNodes,
transaction,
context,
- selfDebugID // 0 in production and for roots
+ selfDebugID, // 0 in production and for roots
) {
if (nestedChildNodes == null) {
return null;
@@ -86,13 +86,9 @@ var ReactChildReconciler = {
if (__DEV__) {
traverseAllChildren(
nestedChildNodes,
- (childInsts, child, name) => instantiateChild(
- childInsts,
- child,
- name,
- selfDebugID
- ),
- childInstances
+ (childInsts, child, name) =>
+ instantiateChild(childInsts, child, name, selfDebugID),
+ childInstances,
);
} else {
traverseAllChildren(nestedChildNodes, instantiateChild, childInstances);
@@ -119,7 +115,7 @@ var ReactChildReconciler = {
hostParent,
hostContainerInfo,
context,
- selfDebugID // 0 in production and for roots
+ selfDebugID, // 0 in production and for roots
) {
// We currently don't have a way to track moves here but if we use iterators
// instead of for..in we can zip the iterators and check if an item has
@@ -138,22 +134,26 @@ var ReactChildReconciler = {
prevChild = prevChildren && prevChildren[name];
var prevElement = prevChild && prevChild._currentElement;
var nextElement = nextChildren[name];
- if (prevChild != null &&
- shouldUpdateReactComponent(prevElement, nextElement)) {
+ if (
+ prevChild != null &&
+ shouldUpdateReactComponent(prevElement, nextElement)
+ ) {
ReactReconciler.receiveComponent(
- prevChild, nextElement, transaction, context
+ prevChild,
+ nextElement,
+ transaction,
+ context,
);
nextChildren[name] = prevChild;
} else {
if (
- !ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack &&
- prevChild
+ !ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack && prevChild
) {
removedNodes[name] = ReactReconciler.getHostNode(prevChild);
ReactReconciler.unmountComponent(
prevChild,
- false, /* safely */
- false /* skipLifecycle */
+ false /* safely */,
+ false /* skipLifecycle */,
);
}
// The child must be instantiated before it's mounted.
@@ -167,32 +167,33 @@ var ReactChildReconciler = {
hostParent,
hostContainerInfo,
context,
- selfDebugID
+ selfDebugID,
);
mountImages.push(nextChildMountImage);
if (
- ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack &&
- prevChild
+ ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack && prevChild
) {
removedNodes[name] = ReactReconciler.getHostNode(prevChild);
ReactReconciler.unmountComponent(
prevChild,
- false, /* safely */
- false /* skipLifecycle */
+ false /* safely */,
+ false /* skipLifecycle */,
);
}
}
}
// Unmount children that are no longer present.
for (name in prevChildren) {
- if (prevChildren.hasOwnProperty(name) &&
- !(nextChildren && nextChildren.hasOwnProperty(name))) {
+ if (
+ prevChildren.hasOwnProperty(name) &&
+ !(nextChildren && nextChildren.hasOwnProperty(name))
+ ) {
prevChild = prevChildren[name];
removedNodes[name] = ReactReconciler.getHostNode(prevChild);
ReactReconciler.unmountComponent(
prevChild,
- false, /* safely */
- false /* skipLifecycle */
+ false /* safely */,
+ false /* skipLifecycle */,
);
}
}
@@ -213,7 +214,6 @@ var ReactChildReconciler = {
}
}
},
-
};
module.exports = ReactChildReconciler;
diff --git a/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js b/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
index e35cb498c7..dae8811e7e 100644
--- a/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
+++ b/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
@@ -25,7 +25,6 @@ type Environment = {
var injected = false;
var ReactComponentEnvironment = {
-
/**
* Optionally injectable hook for swapping out mount images in the middle of
* the tree.
@@ -42,16 +41,13 @@ var ReactComponentEnvironment = {
injectEnvironment: function(environment: Environment) {
invariant(
!injected,
- 'ReactCompositeComponent: injectEnvironment() can only be called once.'
+ 'ReactCompositeComponent: injectEnvironment() can only be called once.',
);
- ReactComponentEnvironment.replaceNodeWithMarkup =
- environment.replaceNodeWithMarkup;
- ReactComponentEnvironment.processChildrenUpdates =
- environment.processChildrenUpdates;
+ ReactComponentEnvironment.replaceNodeWithMarkup = environment.replaceNodeWithMarkup;
+ ReactComponentEnvironment.processChildrenUpdates = environment.processChildrenUpdates;
injected = true;
},
},
-
};
module.exports = ReactComponentEnvironment;
diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index 7db8225d5b..5dfcc45d44 100644
--- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -34,8 +34,7 @@ var shallowEqual = require('fbjs/lib/shallowEqual');
var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
var warning = require('fbjs/lib/warning');
-function StatelessComponent(Component) {
-}
+function StatelessComponent(Component) {}
StatelessComponent.prototype.render = function() {
var Component = ReactInstanceMap.get(this)._currentElement.type;
var element = Component(this.props, this.context, this.updater);
@@ -106,7 +105,6 @@ var nextMountID = 1;
* @lends {ReactCompositeComponent.prototype}
*/
var ReactCompositeComponent = {
-
/**
* Base constructor for all composite component.
*
@@ -161,7 +159,7 @@ var ReactCompositeComponent = {
transaction,
hostParent,
hostContainerInfo,
- context
+ context,
) {
this._context = context;
this._mountOrder = nextMountID++;
@@ -181,7 +179,7 @@ var ReactCompositeComponent = {
doConstruct,
publicProps,
publicContext,
- updateQueue
+ updateQueue,
);
var renderedElement;
@@ -192,16 +190,14 @@ var ReactCompositeComponent = {
warning(
!Component.childContextTypes,
'%s(...): childContextTypes cannot be defined on a functional component.',
- Component.displayName || Component.name || 'Component'
+ Component.displayName || Component.name || 'Component',
);
}
invariant(
- inst === null ||
- inst === false ||
- React.isValidElement(inst),
+ inst === null || inst === false || React.isValidElement(inst),
'%s(...): A valid React element (or null) must be returned. You may have ' +
- 'returned undefined, an array or some other invalid object.',
- Component.displayName || Component.name || 'Component'
+ 'returned undefined, an array or some other invalid object.',
+ Component.displayName || Component.name || 'Component',
);
inst = new StatelessComponent(Component);
this._compositeType = ReactCompositeComponentTypes.StatelessFunctional;
@@ -220,20 +216,22 @@ var ReactCompositeComponent = {
warning(
false,
'%s(...): No `render` method found on the returned component ' +
- 'instance: you may have forgotten to define `render`.',
- Component.displayName || Component.name || 'Component'
+ 'instance: you may have forgotten to define `render`.',
+ Component.displayName || Component.name || 'Component',
);
}
var propsMutated = inst.props !== publicProps;
- var componentName =
- Component.displayName || Component.name || 'Component';
+ var componentName = Component.displayName ||
+ Component.name ||
+ 'Component';
warning(
inst.props === undefined || !propsMutated,
'%s(...): When calling super() in `%s`, make sure to pass ' +
- 'up the same props that your component\'s constructor was passed.',
- componentName, componentName
+ "up the same props that your component's constructor was passed.",
+ componentName,
+ componentName,
);
}
@@ -255,64 +253,63 @@ var ReactCompositeComponent = {
// catch them here, at initialization time, instead.
warning(
!inst.getInitialState ||
- inst.getInitialState.isReactClassApproved ||
- inst.state,
+ inst.getInitialState.isReactClassApproved ||
+ inst.state,
'getInitialState was defined on %s, a plain JavaScript class. ' +
- 'This is only supported for classes created using React.createClass. ' +
- 'Did you mean to define a state property instead?',
- this.getName() || 'a component'
+ 'This is only supported for classes created using React.createClass. ' +
+ 'Did you mean to define a state property instead?',
+ this.getName() || 'a component',
);
warning(
- !inst.getDefaultProps ||
- inst.getDefaultProps.isReactClassApproved,
+ !inst.getDefaultProps || inst.getDefaultProps.isReactClassApproved,
'getDefaultProps was defined on %s, a plain JavaScript class. ' +
- 'This is only supported for classes created using React.createClass. ' +
- 'Use a static property to define defaultProps instead.',
- this.getName() || 'a component'
+ 'This is only supported for classes created using React.createClass. ' +
+ 'Use a static property to define defaultProps instead.',
+ this.getName() || 'a component',
);
warning(
!inst.propTypes,
'propTypes was defined as an instance property on %s. Use a static ' +
- 'property to define propTypes instead.',
- this.getName() || 'a component'
+ 'property to define propTypes instead.',
+ this.getName() || 'a component',
);
warning(
!inst.contextTypes,
'contextTypes was defined as an instance property on %s. Use a ' +
- 'static property to define contextTypes instead.',
- this.getName() || 'a component'
+ 'static property to define contextTypes instead.',
+ this.getName() || 'a component',
);
warning(
typeof inst.componentShouldUpdate !== 'function',
'%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.',
- (this.getName() || 'A component')
+ 'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
+ 'The name is phrased as a question because the function is ' +
+ 'expected to return a value.',
+ this.getName() || 'A component',
);
warning(
typeof inst.componentDidUnmount !== 'function',
'%s has a method called ' +
- 'componentDidUnmount(). But there is no such lifecycle method. ' +
- 'Did you mean componentWillUnmount()?',
- this.getName() || 'A component'
+ 'componentDidUnmount(). But there is no such lifecycle method. ' +
+ 'Did you mean componentWillUnmount()?',
+ this.getName() || 'A component',
);
warning(
typeof inst.componentWillRecieveProps !== 'function',
'%s has a method called ' +
- 'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
- (this.getName() || 'A component')
+ 'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
+ this.getName() || 'A component',
);
}
var initialState = inst.state;
if (initialState === undefined) {
- inst.state = initialState = null;
+ inst.state = (initialState = null);
}
invariant(
typeof initialState === 'object' && !Array.isArray(initialState),
'%s.state: must be set to an object or null',
- this.getName() || 'ReactCompositeComponent'
+ this.getName() || 'ReactCompositeComponent',
);
this._pendingStateQueue = null;
@@ -324,7 +321,7 @@ var ReactCompositeComponent = {
measureLifeCyclePerf(
() => inst.componentWillMount(),
this._debugID,
- 'componentWillMount'
+ 'componentWillMount',
);
} else {
inst.componentWillMount();
@@ -343,7 +340,7 @@ var ReactCompositeComponent = {
hostParent,
hostContainerInfo,
transaction,
- context
+ context,
);
} else {
markup = this.performInitialMount(
@@ -351,7 +348,7 @@ var ReactCompositeComponent = {
hostParent,
hostContainerInfo,
transaction,
- context
+ context,
);
}
@@ -361,7 +358,7 @@ var ReactCompositeComponent = {
measureLifeCyclePerf(
() => inst.componentDidMount(),
this._debugID,
- 'componentDidMount'
+ 'componentDidMount',
);
});
} else {
@@ -374,10 +371,7 @@ var ReactCompositeComponent = {
if (callbacks) {
this._pendingCallbacks = null;
for (let i = 0; i < callbacks.length; i++) {
- transaction.getReactMountReady().enqueue(
- callbacks[i],
- inst
- );
+ transaction.getReactMountReady().enqueue(callbacks[i], inst);
}
}
@@ -388,7 +382,7 @@ var ReactCompositeComponent = {
doConstruct,
publicProps,
publicContext,
- updateQueue
+ updateQueue,
) {
if (__DEV__) {
ReactCurrentOwner.current = this;
@@ -397,7 +391,7 @@ var ReactCompositeComponent = {
doConstruct,
publicProps,
publicContext,
- updateQueue
+ updateQueue,
);
} finally {
ReactCurrentOwner.current = null;
@@ -407,7 +401,7 @@ var ReactCompositeComponent = {
doConstruct,
publicProps,
publicContext,
- updateQueue
+ updateQueue,
);
}
},
@@ -416,7 +410,7 @@ var ReactCompositeComponent = {
doConstruct,
publicProps,
publicContext,
- updateQueue
+ updateQueue,
) {
var Component = this._currentElement.type;
@@ -425,7 +419,7 @@ var ReactCompositeComponent = {
return measureLifeCyclePerf(
() => new Component(publicProps, publicContext, updateQueue),
this._debugID,
- 'ctor'
+ 'ctor',
);
} else {
return new Component(publicProps, publicContext, updateQueue);
@@ -438,7 +432,7 @@ var ReactCompositeComponent = {
return measureLifeCyclePerf(
() => Component(publicProps, publicContext, updateQueue),
this._debugID,
- 'render'
+ 'render',
);
} else {
return Component(publicProps, publicContext, updateQueue);
@@ -450,7 +444,7 @@ var ReactCompositeComponent = {
hostParent,
hostContainerInfo,
transaction,
- context
+ context,
) {
var markup;
var checkpoint = transaction.checkpoint();
@@ -460,20 +454,23 @@ var ReactCompositeComponent = {
hostParent,
hostContainerInfo,
transaction,
- context
+ context,
);
} catch (e) {
// Roll back to checkpoint, handle error (which may add items to the transaction), and take a new checkpoint
transaction.rollback(checkpoint);
this._instance.unstable_handleError(e);
if (this._pendingStateQueue) {
- this._instance.state = this._processPendingState(this._instance.props, this._instance.context);
+ this._instance.state = this._processPendingState(
+ this._instance.props,
+ this._instance.context,
+ );
}
checkpoint = transaction.checkpoint();
this._renderedComponent.unmountComponent(
- true, /* safely */
+ true /* safely */,
// Don't call componentWillUnmount() because they never fully mounted:
- true /* skipLifecyle */
+ true /* skipLifecyle */,
);
transaction.rollback(checkpoint);
@@ -484,7 +481,7 @@ var ReactCompositeComponent = {
hostParent,
hostContainerInfo,
transaction,
- context
+ context,
);
}
return markup;
@@ -495,7 +492,7 @@ var ReactCompositeComponent = {
hostParent,
hostContainerInfo,
transaction,
- context
+ context,
) {
// If not a stateless component, we now render
if (renderedElement === undefined) {
@@ -506,7 +503,7 @@ var ReactCompositeComponent = {
this._renderedNodeType = nodeType;
var child = this._instantiateReactComponent(
renderedElement,
- nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */
+ nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */,
);
this._renderedComponent = child;
@@ -521,7 +518,7 @@ var ReactCompositeComponent = {
hostParent,
hostContainerInfo,
this._processChildContext(context),
- debugID
+ debugID,
);
if (__DEV__) {
@@ -557,14 +554,18 @@ var ReactCompositeComponent = {
if (safely) {
if (!skipLifecycle) {
var name = this.getName() + '.componentWillUnmount()';
- ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(name, inst.componentWillUnmount, inst);
+ ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
+ name,
+ inst.componentWillUnmount,
+ inst,
+ );
}
} else {
if (__DEV__) {
measureLifeCyclePerf(
() => inst.componentWillUnmount(),
this._debugID,
- 'componentWillUnmount'
+ 'componentWillUnmount',
);
} else {
inst.componentWillUnmount();
@@ -576,7 +577,7 @@ var ReactCompositeComponent = {
ReactReconciler.unmountComponent(
this._renderedComponent,
safely,
- skipLifecycle
+ skipLifecycle,
);
this._renderedNodeType = null;
this._renderedComponent = null;
@@ -647,7 +648,7 @@ var ReactCompositeComponent = {
this._checkContextTypes(
Component.contextTypes,
maskedContext,
- 'context'
+ 'context',
);
}
}
@@ -679,14 +680,14 @@ var ReactCompositeComponent = {
invariant(
typeof Component.childContextTypes === 'object',
'%s.getChildContext(): childContextTypes must be defined in order to ' +
- 'use getChildContext().',
- this.getName() || 'ReactCompositeComponent'
+ 'use getChildContext().',
+ this.getName() || 'ReactCompositeComponent',
);
if (__DEV__) {
this._checkContextTypes(
Component.childContextTypes,
childContext,
- 'child context'
+ 'child context',
);
}
for (var name in childContext) {
@@ -694,7 +695,7 @@ var ReactCompositeComponent = {
name in Component.childContextTypes,
'%s.getChildContext(): key "%s" is not defined in childContextTypes.',
this.getName() || 'ReactCompositeComponent',
- name
+ name,
);
}
return Object.assign({}, currentContext, childContext);
@@ -707,8 +708,8 @@ var ReactCompositeComponent = {
warning(
!Component.childContextTypes,
'%s.childContextTypes is specified but there is no getChildContext() method ' +
- 'on the instance. You can either define getChildContext() on %s or remove ' +
- 'childContextTypes from it.',
+ 'on the instance. You can either define getChildContext() on %s or remove ' +
+ 'childContextTypes from it.',
componentName,
componentName,
);
@@ -726,19 +727,10 @@ var ReactCompositeComponent = {
* @param {string} location e.g. "prop", "context", "child context"
* @private
*/
- _checkContextTypes: function(
- typeSpecs,
- values,
- location: string,
- ) {
+ _checkContextTypes: function(typeSpecs, values, location: string) {
if (__DEV__) {
ReactDebugCurrentFrame.current = this._debugID;
- checkReactTypeSpec(
- typeSpecs,
- values,
- location,
- this.getName()
- );
+ checkReactTypeSpec(typeSpecs, values, location, this.getName());
ReactDebugCurrentFrame.current = null;
}
},
@@ -754,7 +746,7 @@ var ReactCompositeComponent = {
prevElement,
nextElement,
prevContext,
- nextContext
+ nextContext,
);
},
@@ -771,7 +763,7 @@ var ReactCompositeComponent = {
this,
this._pendingElement,
transaction,
- this._context
+ this._context,
);
} else if (this._pendingStateQueue !== null || this._pendingForceUpdate) {
this.updateComponent(
@@ -779,17 +771,16 @@ var ReactCompositeComponent = {
this._currentElement,
this._currentElement,
this._context,
- this._context
+ this._context,
);
} else {
var callbacks = this._pendingCallbacks;
this._pendingCallbacks = null;
if (callbacks) {
for (var j = 0; j < callbacks.length; j++) {
- transaction.getReactMountReady().enqueue(
- callbacks[j],
- this.getPublicInstance()
- );
+ transaction
+ .getReactMountReady()
+ .enqueue(callbacks[j], this.getPublicInstance());
}
}
this._updateBatchNumber = null;
@@ -816,14 +807,14 @@ var ReactCompositeComponent = {
prevParentElement,
nextParentElement,
prevUnmaskedContext,
- nextUnmaskedContext
+ nextUnmaskedContext,
) {
var inst = this._instance;
invariant(
inst != null,
'Attempted to update component `%s` that has already been unmounted ' +
- '(or failed to mount).',
- this.getName() || 'ReactCompositeComponent'
+ '(or failed to mount).',
+ this.getName() || 'ReactCompositeComponent',
);
var willReceive = false;
@@ -867,9 +858,9 @@ var ReactCompositeComponent = {
warning(
false,
'%s.componentWillReceiveProps(): Assigning directly to ' +
- 'this.state is deprecated (except inside a component\'s ' +
- 'constructor). Use setState instead.',
- this.getName() || 'ReactCompositeComponent'
+ "this.state is deprecated (except inside a component's " +
+ 'constructor). Use setState instead.',
+ this.getName() || 'ReactCompositeComponent',
);
}
}
@@ -890,15 +881,18 @@ var ReactCompositeComponent = {
shouldUpdate = measureLifeCyclePerf(
() => inst.shouldComponentUpdate(nextProps, nextState, nextContext),
this._debugID,
- 'shouldComponentUpdate'
+ 'shouldComponentUpdate',
);
} else {
- shouldUpdate = inst.shouldComponentUpdate(nextProps, nextState, nextContext);
+ shouldUpdate = inst.shouldComponentUpdate(
+ nextProps,
+ nextState,
+ nextContext,
+ );
}
} else {
if (this._compositeType === ReactCompositeComponentTypes.PureClass) {
- shouldUpdate =
- !shallowEqual(prevProps, nextProps) ||
+ shouldUpdate = !shallowEqual(prevProps, nextProps) ||
!shallowEqual(inst.state, nextState);
}
}
@@ -908,8 +902,8 @@ var ReactCompositeComponent = {
warning(
shouldUpdate !== undefined,
'%s.shouldComponentUpdate(): Returned undefined instead of a ' +
- 'boolean value. Make sure to return true or false.',
- this.getName() || 'ReactCompositeComponent'
+ 'boolean value. Make sure to return true or false.',
+ this.getName() || 'ReactCompositeComponent',
);
}
@@ -923,7 +917,7 @@ var ReactCompositeComponent = {
nextState,
nextContext,
transaction,
- nextUnmaskedContext
+ nextUnmaskedContext,
);
} else {
// If it's determined that a component should not update, we still want
@@ -937,10 +931,9 @@ var ReactCompositeComponent = {
if (callbacks) {
for (var j = 0; j < callbacks.length; j++) {
- transaction.getReactMountReady().enqueue(
- callbacks[j],
- this.getPublicInstance()
- );
+ transaction
+ .getReactMountReady()
+ .enqueue(callbacks[j], this.getPublicInstance());
}
}
},
@@ -964,9 +957,9 @@ var ReactCompositeComponent = {
var dontMutate = true;
for (var i = replace ? 1 : 0; i < queue.length; i++) {
var partial = queue[i];
- let partialState = typeof partial === 'function' ?
- partial.call(inst, nextState, props, context) :
- partial;
+ let partialState = typeof partial === 'function'
+ ? partial.call(inst, nextState, props, context)
+ : partial;
if (partialState) {
if (dontMutate) {
dontMutate = false;
@@ -998,7 +991,7 @@ var ReactCompositeComponent = {
nextState,
nextContext,
transaction,
- unmaskedContext
+ unmaskedContext,
) {
var inst = this._instance;
@@ -1017,7 +1010,7 @@ var ReactCompositeComponent = {
measureLifeCyclePerf(
() => inst.componentWillUpdate(nextProps, nextState, nextContext),
this._debugID,
- 'componentWillUpdate'
+ 'componentWillUpdate',
);
} else {
inst.componentWillUpdate(nextProps, nextState, nextContext);
@@ -1031,7 +1024,10 @@ var ReactCompositeComponent = {
inst.context = nextContext;
if (inst.unstable_handleError) {
- this._updateRenderedComponentWithErrorHandling(transaction, unmaskedContext);
+ this._updateRenderedComponentWithErrorHandling(
+ transaction,
+ unmaskedContext,
+ );
} else {
this._updateRenderedComponent(transaction, unmaskedContext);
}
@@ -1040,16 +1036,28 @@ var ReactCompositeComponent = {
if (__DEV__) {
transaction.getReactMountReady().enqueue(() => {
measureLifeCyclePerf(
- inst.componentDidUpdate.bind(inst, prevProps, prevState, prevContext),
+ inst.componentDidUpdate.bind(
+ inst,
+ prevProps,
+ prevState,
+ prevContext,
+ ),
this._debugID,
- 'componentDidUpdate'
+ 'componentDidUpdate',
);
});
} else {
- transaction.getReactMountReady().enqueue(
- inst.componentDidUpdate.bind(inst, prevProps, prevState, prevContext),
- inst
- );
+ transaction
+ .getReactMountReady()
+ .enqueue(
+ inst.componentDidUpdate.bind(
+ inst,
+ prevProps,
+ prevState,
+ prevContext,
+ ),
+ inst,
+ );
}
}
},
@@ -1070,7 +1078,10 @@ var ReactCompositeComponent = {
transaction.rollback(checkpoint);
this._instance.unstable_handleError(e);
if (this._pendingStateQueue) {
- this._instance.state = this._processPendingState(this._instance.props, this._instance.context);
+ this._instance.state = this._processPendingState(
+ this._instance.props,
+ this._instance.context,
+ );
}
checkpoint = transaction.checkpoint();
@@ -1079,7 +1090,7 @@ var ReactCompositeComponent = {
transaction,
context,
null,
- true /* safely */
+ true /* safely */,
);
// Try again - we've informed the component about the error, so they can render an error message this time.
@@ -1100,7 +1111,7 @@ var ReactCompositeComponent = {
transaction,
context,
nextRenderedElement,
- false /* safely */
+ false /* safely */,
);
},
@@ -1114,7 +1125,7 @@ var ReactCompositeComponent = {
transaction,
context,
nextRenderedElement,
- safely
+ safely,
) {
var prevComponentInstance = this._renderedComponent;
var prevRenderedElement = prevComponentInstance._currentElement;
@@ -1129,7 +1140,7 @@ var ReactCompositeComponent = {
prevComponentInstance,
nextRenderedElement,
transaction,
- this._processChildContext(context)
+ this._processChildContext(context),
);
} else {
var oldHostNode = ReactReconciler.getHostNode(prevComponentInstance);
@@ -1138,7 +1149,7 @@ var ReactCompositeComponent = {
ReactReconciler.unmountComponent(
prevComponentInstance,
safely,
- false /* skipLifecycle */
+ false /* skipLifecycle */,
);
}
@@ -1146,7 +1157,7 @@ var ReactCompositeComponent = {
this._renderedNodeType = nodeType;
var child = this._instantiateReactComponent(
nextRenderedElement,
- nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */
+ nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */,
);
this._renderedComponent = child;
@@ -1156,14 +1167,14 @@ var ReactCompositeComponent = {
this._hostParent,
this._hostContainerInfo,
this._processChildContext(context),
- debugID
+ debugID,
);
if (ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack) {
ReactReconciler.unmountComponent(
prevComponentInstance,
safely,
- false /* skipLifecycle */
+ false /* skipLifecycle */,
);
}
@@ -1177,7 +1188,7 @@ var ReactCompositeComponent = {
this._replaceNodeWithMarkup(
oldHostNode,
nextMarkup,
- prevComponentInstance
+ prevComponentInstance,
);
}
},
@@ -1191,7 +1202,7 @@ var ReactCompositeComponent = {
ReactComponentEnvironment.replaceNodeWithMarkup(
oldHostNode,
nextMarkup,
- prevInstance
+ prevInstance,
);
},
@@ -1206,7 +1217,7 @@ var ReactCompositeComponent = {
renderedElement = measureLifeCyclePerf(
() => inst.render(),
this._debugID,
- 'render'
+ 'render',
);
} else {
renderedElement = inst.render();
@@ -1214,8 +1225,7 @@ var ReactCompositeComponent = {
if (__DEV__) {
// We allow auto-mocks to proceed as if they're returning null.
- if (renderedElement === undefined &&
- inst.render._isMockFunction) {
+ if (renderedElement === undefined && inst.render._isMockFunction) {
// This is probably bad practice. Consider warning here and
// deprecating this convenience.
renderedElement = null;
@@ -1230,25 +1240,27 @@ var ReactCompositeComponent = {
*/
_renderValidatedComponent: function() {
var renderedElement;
- if (__DEV__ || this._compositeType !== ReactCompositeComponentTypes.StatelessFunctional) {
+ if (
+ __DEV__ ||
+ this._compositeType !== ReactCompositeComponentTypes.StatelessFunctional
+ ) {
ReactCurrentOwner.current = this;
try {
- renderedElement =
- this._renderValidatedComponentWithoutOwnerOrContext();
+ renderedElement = this._renderValidatedComponentWithoutOwnerOrContext();
} finally {
ReactCurrentOwner.current = null;
}
} else {
- renderedElement =
- this._renderValidatedComponentWithoutOwnerOrContext();
+ renderedElement = this._renderValidatedComponentWithoutOwnerOrContext();
}
invariant(
// TODO: An `isValidNode` function would probably be more appropriate
- renderedElement === null || renderedElement === false ||
- React.isValidElement(renderedElement),
+ renderedElement === null ||
+ renderedElement === false ||
+ React.isValidElement(renderedElement),
'%s.render(): A valid React element (or null) must be returned. You may have ' +
'returned undefined, an array or some other invalid object.',
- this.getName() || 'ReactCompositeComponent'
+ this.getName() || 'ReactCompositeComponent',
);
return renderedElement;
@@ -1291,11 +1303,11 @@ var ReactCompositeComponent = {
getName: function() {
var type = this._currentElement.type;
var constructor = this._instance && this._instance.constructor;
- return (
- type.displayName || (constructor && constructor.displayName) ||
- type.name || (constructor && constructor.name) ||
- null
- );
+ return type.displayName ||
+ (constructor && constructor.displayName) ||
+ type.name ||
+ (constructor && constructor.name) ||
+ null;
},
/**
@@ -1308,7 +1320,9 @@ var ReactCompositeComponent = {
*/
getPublicInstance: function() {
var inst = this._instance;
- if (this._compositeType === ReactCompositeComponentTypes.StatelessFunctional) {
+ if (
+ this._compositeType === ReactCompositeComponentTypes.StatelessFunctional
+ ) {
return null;
}
return inst;
@@ -1316,7 +1330,6 @@ var ReactCompositeComponent = {
// Stub
_instantiateReactComponent: null,
-
};
module.exports = ReactCompositeComponent;
diff --git a/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js b/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
index 9f131fe323..f787eff300 100644
--- a/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
+++ b/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
@@ -34,15 +34,11 @@ function ReactDefaultBatchingStrategyTransaction() {
this.reinitializeTransaction();
}
-Object.assign(
- ReactDefaultBatchingStrategyTransaction.prototype,
- Transaction,
- {
- getTransactionWrappers: function() {
- return TRANSACTION_WRAPPERS;
- },
- }
-);
+Object.assign(ReactDefaultBatchingStrategyTransaction.prototype, Transaction, {
+ getTransactionWrappers: function() {
+ return TRANSACTION_WRAPPERS;
+ },
+});
var transaction = new ReactDefaultBatchingStrategyTransaction();
diff --git a/src/renderers/shared/stack/reconciler/ReactHostComponent.js b/src/renderers/shared/stack/reconciler/ReactHostComponent.js
index 75db824f6b..5391ec289f 100644
--- a/src/renderers/shared/stack/reconciler/ReactHostComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactHostComponent.js
@@ -39,7 +39,7 @@ function createInternalComponent(element) {
invariant(
genericComponentClass,
'There is no registered component for the tag %s',
- element.type
+ element.type,
);
return new genericComponentClass(element);
}
diff --git a/src/renderers/shared/stack/reconciler/ReactMultiChild.js b/src/renderers/shared/stack/reconciler/ReactMultiChild.js
index 296ece9ab2..19fd366a38 100644
--- a/src/renderers/shared/stack/reconciler/ReactMultiChild.js
+++ b/src/renderers/shared/stack/reconciler/ReactMultiChild.js
@@ -133,10 +133,7 @@ function enqueue(queue, update) {
* @private
*/
function processQueue(inst, updateQueue) {
- ReactComponentEnvironment.processChildrenUpdates(
- inst,
- updateQueue,
- );
+ ReactComponentEnvironment.processChildrenUpdates(inst, updateQueue);
}
var setChildrenForInstrumentation = emptyFunction;
@@ -158,7 +155,9 @@ if (__DEV__) {
if (debugID !== 0) {
ReactInstrumentation.debugTool.onSetChildren(
debugID,
- children ? Object.keys(children).map(key => children[key]._debugID) : []
+ children
+ ? Object.keys(children).map(key => children[key]._debugID)
+ : [],
);
}
};
@@ -170,14 +169,21 @@ if (__DEV__) {
* unmount child components.
*/
var ReactMultiChild = {
- _reconcilerInstantiateChildren: function(nestedChildren, transaction, context) {
+ _reconcilerInstantiateChildren: function(
+ nestedChildren,
+ transaction,
+ context,
+ ) {
if (__DEV__) {
var selfDebugID = getDebugID(this);
if (this._currentElement) {
try {
ReactCurrentOwner.current = this._currentElement._owner;
return ReactChildReconciler.instantiateChildren(
- nestedChildren, transaction, context, selfDebugID
+ nestedChildren,
+ transaction,
+ context,
+ selfDebugID,
);
} finally {
ReactCurrentOwner.current = null;
@@ -185,7 +191,9 @@ var ReactMultiChild = {
}
}
return ReactChildReconciler.instantiateChildren(
- nestedChildren, transaction, context
+ nestedChildren,
+ transaction,
+ context,
);
},
@@ -195,7 +203,7 @@ var ReactMultiChild = {
mountImages,
removedNodes,
transaction,
- context
+ context,
) {
var nextChildren;
var selfDebugID = 0;
@@ -204,7 +212,10 @@ var ReactMultiChild = {
if (this._currentElement) {
try {
ReactCurrentOwner.current = this._currentElement._owner;
- nextChildren = flattenChildren(nextNestedChildrenElements, selfDebugID);
+ nextChildren = flattenChildren(
+ nextNestedChildrenElements,
+ selfDebugID,
+ );
} finally {
ReactCurrentOwner.current = null;
}
@@ -217,7 +228,7 @@ var ReactMultiChild = {
this,
this._hostContainerInfo,
context,
- selfDebugID
+ selfDebugID,
);
return nextChildren;
}
@@ -232,7 +243,7 @@ var ReactMultiChild = {
this,
this._hostContainerInfo,
context,
- selfDebugID
+ selfDebugID,
);
return nextChildren;
},
@@ -247,7 +258,9 @@ var ReactMultiChild = {
*/
mountChildren: function(nestedChildren, transaction, context) {
var children = this._reconcilerInstantiateChildren(
- nestedChildren, transaction, context
+ nestedChildren,
+ transaction,
+ context,
);
this._renderedChildren = children;
@@ -266,7 +279,7 @@ var ReactMultiChild = {
this,
this._hostContainerInfo,
context,
- selfDebugID
+ selfDebugID,
);
child._mountIndex = index++;
mountImages.push(mountImage);
@@ -291,8 +304,8 @@ var ReactMultiChild = {
// Remove any rendered children.
ReactChildReconciler.unmountChildren(
prevChildren,
- false, /* safely */
- false /* skipLifecycle */
+ false /* safely */,
+ false /* skipLifecycle */,
);
for (var name in prevChildren) {
if (prevChildren.hasOwnProperty(name)) {
@@ -315,8 +328,8 @@ var ReactMultiChild = {
// Remove any rendered children.
ReactChildReconciler.unmountChildren(
prevChildren,
- false, /* safely */
- false /* skipLifecycle */
+ false /* safely */,
+ false /* skipLifecycle */,
);
for (var name in prevChildren) {
if (prevChildren.hasOwnProperty(name)) {
@@ -355,7 +368,7 @@ var ReactMultiChild = {
mountImages,
removedNodes,
transaction,
- context
+ context,
);
if (!nextChildren && !prevChildren) {
return;
@@ -378,7 +391,7 @@ var ReactMultiChild = {
if (prevChild === nextChild) {
updates = enqueue(
updates,
- this.moveChild(prevChild, lastPlacedNode, nextIndex, lastIndex)
+ this.moveChild(prevChild, lastPlacedNode, nextIndex, lastIndex),
);
lastIndex = Math.max(prevChild._mountIndex, lastIndex);
prevChild._mountIndex = nextIndex;
@@ -397,8 +410,8 @@ var ReactMultiChild = {
lastPlacedNode,
nextIndex,
transaction,
- context
- )
+ context,
+ ),
);
nextMountIndex++;
}
@@ -410,7 +423,7 @@ var ReactMultiChild = {
if (removedNodes.hasOwnProperty(name)) {
updates = enqueue(
updates,
- this._unmountChild(prevChildren[name], removedNodes[name])
+ this._unmountChild(prevChildren[name], removedNodes[name]),
);
}
}
@@ -436,7 +449,7 @@ var ReactMultiChild = {
ReactChildReconciler.unmountChildren(
renderedChildren,
safely,
- skipLifecycle
+ skipLifecycle,
);
this._renderedChildren = null;
},
@@ -496,7 +509,8 @@ var ReactMultiChild = {
afterNode,
index,
transaction,
- context) {
+ context,
+ ) {
child._mountIndex = index;
return this.createChild(child, afterNode, mountImage);
},
diff --git a/src/renderers/shared/stack/reconciler/ReactMultiChildUpdateTypes.js b/src/renderers/shared/stack/reconciler/ReactMultiChildUpdateTypes.js
index acccdc4972..1319db50fa 100644
--- a/src/renderers/shared/stack/reconciler/ReactMultiChildUpdateTypes.js
+++ b/src/renderers/shared/stack/reconciler/ReactMultiChildUpdateTypes.js
@@ -18,8 +18,8 @@
* Enumerates all the possible types of update configurations.
*/
export type ReactMultiChildUpdateTypes =
- 'INSERT_MARKUP' |
- 'MOVE_EXISTING' |
- 'REMOVE_NODE' |
- 'SET_MARKUP' |
- 'TEXT_CONTENT';
+ | 'INSERT_MARKUP'
+ | 'MOVE_EXISTING'
+ | 'REMOVE_NODE'
+ | 'SET_MARKUP'
+ | 'TEXT_CONTENT';
diff --git a/src/renderers/shared/stack/reconciler/ReactOwner.js b/src/renderers/shared/stack/reconciler/ReactOwner.js
index 21165f8f1b..7d3a4c6032 100644
--- a/src/renderers/shared/stack/reconciler/ReactOwner.js
+++ b/src/renderers/shared/stack/reconciler/ReactOwner.js
@@ -12,13 +12,13 @@
'use strict';
-var { ClassComponent } = require('ReactTypeOfWork');
+var {ClassComponent} = require('ReactTypeOfWork');
var emptyObject = require('fbjs/lib/emptyObject');
var invariant = require('fbjs/lib/invariant');
-import type { Fiber } from 'ReactFiber';
-import type { ReactInstance } from 'ReactInstanceType';
+import type {Fiber} from 'ReactFiber';
+import type {ReactInstance} from 'ReactInstanceType';
/**
* @param {?object} object
@@ -26,11 +26,9 @@ import type { ReactInstance } from 'ReactInstanceType';
* @final
*/
function isValidOwner(object: any): boolean {
- return !!(
- object &&
+ return !!(object &&
typeof object.attachRef === 'function' &&
- typeof object.detachRef === 'function'
- );
+ typeof object.detachRef === 'function');
}
/**
@@ -78,19 +76,19 @@ var ReactOwner = {
ref: string,
owner: ReactInstance | Fiber,
): void {
- if (owner && (owner : any).tag === ClassComponent) {
- const inst = (owner : any).stateNode;
+ if (owner && (owner: any).tag === ClassComponent) {
+ const inst = (owner: any).stateNode;
const refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
refs[ref] = component.getPublicInstance();
} else {
invariant(
isValidOwner(owner),
'addComponentAsRefTo(...): Only a ReactOwner can have refs. You might ' +
- 'be adding a ref to a component that was not created inside a component\'s ' +
- '`render` method, or you have multiple copies of React loaded ' +
- '(details: https://fb.me/react-refs-must-have-owner).'
+ "be adding a ref to a component that was not created inside a component's " +
+ '`render` method, or you have multiple copies of React loaded ' +
+ '(details: https://fb.me/react-refs-must-have-owner).',
);
- (owner : any).attachRef(ref, component);
+ (owner: any).attachRef(ref, component);
}
},
@@ -108,8 +106,8 @@ var ReactOwner = {
ref: string,
owner: ReactInstance | Fiber,
): void {
- if (owner && (owner : any).tag === ClassComponent) {
- const inst = (owner : any).stateNode;
+ if (owner && (owner: any).tag === ClassComponent) {
+ const inst = (owner: any).stateNode;
if (inst && inst.refs[ref] === component.getPublicInstance()) {
delete inst.refs[ref];
}
@@ -117,19 +115,21 @@ var ReactOwner = {
invariant(
isValidOwner(owner),
'removeComponentAsRefFrom(...): Only a ReactOwner can have refs. You might ' +
- 'be removing a ref to a component that was not created inside a component\'s ' +
- '`render` method, or you have multiple copies of React loaded ' +
- '(details: https://fb.me/react-refs-must-have-owner).'
+ "be removing a ref to a component that was not created inside a component's " +
+ '`render` method, or you have multiple copies of React loaded ' +
+ '(details: https://fb.me/react-refs-must-have-owner).',
);
- var ownerPublicInstance = (owner : any).getPublicInstance();
+ var ownerPublicInstance = (owner: any).getPublicInstance();
// Check that `component`'s owner is still alive and that `component` is still the current ref
// because we do not want to detach the ref if another component stole it.
- if (ownerPublicInstance && ownerPublicInstance.refs[ref] === component.getPublicInstance()) {
- (owner : any).detachRef(ref);
+ if (
+ ownerPublicInstance &&
+ ownerPublicInstance.refs[ref] === component.getPublicInstance()
+ ) {
+ (owner: any).detachRef(ref);
}
}
},
-
};
module.exports = ReactOwner;
diff --git a/src/renderers/shared/stack/reconciler/ReactReconciler.js b/src/renderers/shared/stack/reconciler/ReactReconciler.js
index aafe0fbb7d..221ebd584a 100644
--- a/src/renderers/shared/stack/reconciler/ReactReconciler.js
+++ b/src/renderers/shared/stack/reconciler/ReactReconciler.js
@@ -25,7 +25,6 @@ function attachRefs() {
}
var ReactReconciler = {
-
/**
* Initializes the component, renders markup, and registers event listeners.
*
@@ -43,14 +42,14 @@ var ReactReconciler = {
hostParent,
hostContainerInfo,
context,
- parentDebugID // 0 in production and for roots
+ parentDebugID, // 0 in production and for roots
) {
if (__DEV__) {
if (internalInstance._debugID !== 0) {
ReactInstrumentation.debugTool.onBeforeMountComponent(
internalInstance._debugID,
internalInstance._currentElement,
- parentDebugID
+ parentDebugID,
);
}
}
@@ -59,16 +58,18 @@ var ReactReconciler = {
hostParent,
hostContainerInfo,
context,
- parentDebugID
+ parentDebugID,
);
- if (internalInstance._currentElement &&
- internalInstance._currentElement.ref != null) {
+ if (
+ internalInstance._currentElement &&
+ internalInstance._currentElement.ref != null
+ ) {
transaction.getReactMountReady().enqueue(attachRefs, internalInstance);
}
if (__DEV__) {
if (internalInstance._debugID !== 0) {
ReactInstrumentation.debugTool.onMountComponent(
- internalInstance._debugID
+ internalInstance._debugID,
);
}
}
@@ -93,7 +94,7 @@ var ReactReconciler = {
if (__DEV__) {
if (internalInstance._debugID !== 0) {
ReactInstrumentation.debugTool.onBeforeUnmountComponent(
- internalInstance._debugID
+ internalInstance._debugID,
);
}
}
@@ -102,7 +103,7 @@ var ReactReconciler = {
if (__DEV__) {
if (internalInstance._debugID !== 0) {
ReactInstrumentation.debugTool.onUnmountComponent(
- internalInstance._debugID
+ internalInstance._debugID,
);
}
}
@@ -118,13 +119,14 @@ var ReactReconciler = {
* @internal
*/
receiveComponent: function(
- internalInstance, nextElement, transaction, context
+ internalInstance,
+ nextElement,
+ transaction,
+ context,
) {
var prevElement = internalInstance._currentElement;
- if (nextElement === prevElement &&
- context === internalInstance._context
- ) {
+ if (nextElement === prevElement && context === internalInstance._context) {
// Since elements are immutable after the owner is rendered,
// we can do a cheap identity compare here to determine if this is a
// superfluous reconcile. It's possible for state to be mutable but such
@@ -142,15 +144,12 @@ var ReactReconciler = {
if (internalInstance._debugID !== 0) {
ReactInstrumentation.debugTool.onBeforeUpdateComponent(
internalInstance._debugID,
- nextElement
+ nextElement,
);
}
}
- var refsChanged = ReactRef.shouldUpdateRefs(
- prevElement,
- nextElement
- );
+ var refsChanged = ReactRef.shouldUpdateRefs(prevElement, nextElement);
if (refsChanged) {
ReactRef.detachRefs(internalInstance, prevElement);
@@ -158,16 +157,18 @@ var ReactReconciler = {
internalInstance.receiveComponent(nextElement, transaction, context);
- if (refsChanged &&
- internalInstance._currentElement &&
- internalInstance._currentElement.ref != null) {
+ if (
+ refsChanged &&
+ internalInstance._currentElement &&
+ internalInstance._currentElement.ref != null
+ ) {
transaction.getReactMountReady().enqueue(attachRefs, internalInstance);
}
if (__DEV__) {
if (internalInstance._debugID !== 0) {
ReactInstrumentation.debugTool.onUpdateComponent(
- internalInstance._debugID
+ internalInstance._debugID,
);
}
}
@@ -183,18 +184,18 @@ var ReactReconciler = {
performUpdateIfNecessary: function(
internalInstance,
transaction,
- updateBatchNumber
+ updateBatchNumber,
) {
if (internalInstance._updateBatchNumber !== updateBatchNumber) {
// The component's enqueued batch number should always be the current
// batch or the following one.
warning(
internalInstance._updateBatchNumber == null ||
- internalInstance._updateBatchNumber === updateBatchNumber + 1,
+ internalInstance._updateBatchNumber === updateBatchNumber + 1,
'performUpdateIfNecessary: Unexpected batch number (current %s, ' +
- 'pending %s)',
+ 'pending %s)',
updateBatchNumber,
- internalInstance._updateBatchNumber
+ internalInstance._updateBatchNumber,
);
return;
}
@@ -202,7 +203,7 @@ var ReactReconciler = {
if (internalInstance._debugID !== 0) {
ReactInstrumentation.debugTool.onBeforeUpdateComponent(
internalInstance._debugID,
- internalInstance._currentElement
+ internalInstance._currentElement,
);
}
}
@@ -210,12 +211,11 @@ var ReactReconciler = {
if (__DEV__) {
if (internalInstance._debugID !== 0) {
ReactInstrumentation.debugTool.onUpdateComponent(
- internalInstance._debugID
+ internalInstance._debugID,
);
}
}
},
-
};
module.exports = ReactReconciler;
diff --git a/src/renderers/shared/stack/reconciler/ReactRef.js b/src/renderers/shared/stack/reconciler/ReactRef.js
index 120c6dddbd..cae62c717b 100644
--- a/src/renderers/shared/stack/reconciler/ReactRef.js
+++ b/src/renderers/shared/stack/reconciler/ReactRef.js
@@ -14,8 +14,8 @@
var ReactOwner = require('ReactOwner');
-import type { ReactInstance } from 'ReactInstanceType';
-import type { ReactElement } from 'ReactElementType';
+import type {ReactInstance} from 'ReactInstanceType';
+import type {ReactElement} from 'ReactElementType';
var ReactRef = {};
@@ -29,7 +29,10 @@ if (__DEV__) {
function attachRef(ref, component, owner) {
if (__DEV__) {
- if (component._compositeType === ReactCompositeComponentTypes.StatelessFunctional) {
+ if (
+ component._compositeType ===
+ ReactCompositeComponentTypes.StatelessFunctional
+ ) {
let info = '';
let ownerName;
if (owner) {
@@ -44,16 +47,18 @@ function attachRef(ref, component, owner) {
let warningKey = ownerName || component._debugID;
let element = component._currentElement;
if (element && element._source) {
- warningKey = element._source.fileName + ':' + element._source.lineNumber;
+ warningKey = element._source.fileName +
+ ':' +
+ element._source.lineNumber;
}
if (!warnedAboutStatelessRefs[warningKey]) {
warnedAboutStatelessRefs[warningKey] = true;
warning(
false,
'Stateless function components cannot be given refs. ' +
- 'Attempts to access this ref will fail.%s%s',
+ 'Attempts to access this ref will fail.%s%s',
info,
- ReactComponentTreeHook.getStackAddendumByID(component._debugID)
+ ReactComponentTreeHook.getStackAddendumByID(component._debugID),
);
}
}
@@ -63,11 +68,7 @@ function attachRef(ref, component, owner) {
ref(component.getPublicInstance());
} else {
// Legacy ref
- ReactOwner.addComponentAsRefTo(
- component,
- ref,
- owner,
- );
+ ReactOwner.addComponentAsRefTo(component, ref, owner);
}
}
@@ -123,11 +124,9 @@ ReactRef.shouldUpdateRefs = function(
nextOwner = nextElement._owner;
}
- return (
- prevRef !== nextRef ||
+ return prevRef !== nextRef ||
// If owner changes but we have an unchanged function ref, don't update refs
- (typeof nextRef === 'string' && nextOwner !== prevOwner)
- );
+ (typeof nextRef === 'string' && nextOwner !== prevOwner);
};
ReactRef.detachRefs = function(
diff --git a/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js b/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js
index dc3c82077f..f7159ef736 100644
--- a/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js
@@ -13,7 +13,6 @@
var ReactReconciler = require('ReactReconciler');
-
var ReactSimpleEmptyComponent = function(placeholderElement, instantiate) {
this._currentElement = null;
this._renderedComponent = instantiate(placeholderElement);
@@ -24,7 +23,7 @@ Object.assign(ReactSimpleEmptyComponent.prototype, {
hostParent,
hostContainerInfo,
context,
- parentDebugID // 0 in production and for roots
+ parentDebugID, // 0 in production and for roots
) {
return ReactReconciler.mountComponent(
this._renderedComponent,
@@ -32,11 +31,10 @@ Object.assign(ReactSimpleEmptyComponent.prototype, {
hostParent,
hostContainerInfo,
context,
- parentDebugID
+ parentDebugID,
);
},
- receiveComponent: function() {
- },
+ receiveComponent: function() {},
getHostNode: function() {
return ReactReconciler.getHostNode(this._renderedComponent);
},
@@ -44,7 +42,7 @@ Object.assign(ReactSimpleEmptyComponent.prototype, {
ReactReconciler.unmountComponent(
this._renderedComponent,
safely,
- skipLifecycle
+ skipLifecycle,
);
this._renderedComponent = null;
},
diff --git a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
index 8e77b3346e..20cbb87fbb 100644
--- a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
+++ b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
@@ -18,13 +18,13 @@ var ReactUpdates = require('ReactUpdates');
if (__DEV__) {
var warning = require('fbjs/lib/warning');
- var warnOnInvalidCallback = function(callback : mixed, callerName : string) {
+ var warnOnInvalidCallback = function(callback: mixed, callerName: string) {
warning(
callback === null || typeof callback === 'function',
'%s(...): Expected the last optional `callback` argument to be a ' +
- 'function. Instead received: %s.',
+ 'function. Instead received: %s.',
callerName,
- '' + callback
+ '' + callback,
);
};
}
@@ -41,10 +41,10 @@ function getInternalInstanceReadyForUpdate(publicInstance, callerName) {
warning(
false,
'Can only update a mounted or mounting component. This usually means ' +
- 'you called setState, replaceState, or forceUpdate on an unmounted ' +
- 'component. This is a no-op.\n\nPlease check the code for the ' +
- '%s component.',
- ctor && (ctor.displayName || ctor.name) || 'ReactClass'
+ 'you called setState, replaceState, or forceUpdate on an unmounted ' +
+ 'component. This is a no-op.\n\nPlease check the code for the ' +
+ '%s component.',
+ (ctor && (ctor.displayName || ctor.name)) || 'ReactClass',
);
}
return null;
@@ -54,9 +54,9 @@ function getInternalInstanceReadyForUpdate(publicInstance, callerName) {
warning(
ReactCurrentOwner.current == null,
'Cannot update during an existing state transition (such as within ' +
- '`render` or another component\'s constructor). Render methods should ' +
- 'be a pure function of props and state; constructor side-effects are ' +
- 'an anti-pattern, but can be moved to `componentWillMount`.',
+ "`render` or another component's constructor). Render methods should " +
+ 'be a pure function of props and state; constructor side-effects are ' +
+ 'an anti-pattern, but can be moved to `componentWillMount`.',
);
}
@@ -68,7 +68,6 @@ function getInternalInstanceReadyForUpdate(publicInstance, callerName) {
* reconciliation step.
*/
var ReactUpdateQueue = {
-
/**
* Checks whether or not this composite component is mounted.
* @param {ReactClass} publicInstance The instance we want to test.
@@ -83,11 +82,11 @@ var ReactUpdateQueue = {
warning(
owner._warnedAboutRefsInRender,
'%s is accessing isMounted inside its render() function. ' +
- 'render() should be a pure function of props and state. It should ' +
- 'never access something that requires stale data from the previous ' +
- 'render, such as refs. Move this logic to componentDidMount and ' +
- 'componentDidUpdate instead.',
- owner.getName() || 'A component'
+ 'render() should be a pure function of props and state. It should ' +
+ 'never access something that requires stale data from the previous ' +
+ 'render, such as refs. Move this logic to componentDidMount and ' +
+ 'componentDidUpdate instead.',
+ owner.getName() || 'A component',
);
owner._warnedAboutRefsInRender = true;
}
@@ -164,7 +163,12 @@ var ReactUpdateQueue = {
* @param {?string} Name of the calling function in the public API.
* @internal
*/
- enqueueReplaceState: function(publicInstance, completeState, callback, callerName) {
+ enqueueReplaceState: function(
+ publicInstance,
+ completeState,
+ callback,
+ callerName,
+ ) {
var internalInstance = getInternalInstanceReadyForUpdate(publicInstance);
if (!internalInstance) {
@@ -201,13 +205,18 @@ var ReactUpdateQueue = {
* @param {?string} Name of the calling function in the public API.
* @internal
*/
- enqueueSetState: function(publicInstance, partialState, callback, callerName) {
+ enqueueSetState: function(
+ publicInstance,
+ partialState,
+ callback,
+ callerName,
+ ) {
if (__DEV__) {
ReactInstrumentation.debugTool.onSetState();
warning(
partialState != null,
'setState(...): You passed an undefined or null state object; ' +
- 'instead, use forceUpdate().'
+ 'instead, use forceUpdate().',
);
}
@@ -217,8 +226,7 @@ var ReactUpdateQueue = {
return;
}
- var queue =
- internalInstance._pendingStateQueue ||
+ var queue = internalInstance._pendingStateQueue ||
(internalInstance._pendingStateQueue = []);
queue.push(partialState);
@@ -243,7 +251,6 @@ var ReactUpdateQueue = {
internalInstance._context = nextContext;
enqueueUpdate(internalInstance);
},
-
};
module.exports = ReactUpdateQueue;
diff --git a/src/renderers/shared/stack/reconciler/ReactUpdates.js b/src/renderers/shared/stack/reconciler/ReactUpdates.js
index acf78af5f4..239b0637e1 100644
--- a/src/renderers/shared/stack/reconciler/ReactUpdates.js
+++ b/src/renderers/shared/stack/reconciler/ReactUpdates.js
@@ -27,7 +27,7 @@ function ensureInjected() {
invariant(
ReactUpdates.ReactReconcileTransaction && batchingStrategy,
'ReactUpdates: must inject a reconcile transaction class and batching ' +
- 'strategy'
+ 'strategy',
);
}
@@ -56,38 +56,34 @@ function ReactUpdatesFlushTransaction() {
this.reinitializeTransaction();
this.dirtyComponentsLength = null;
this.reconcileTransaction = ReactUpdates.ReactReconcileTransaction.getPooled(
- /* useCreateElement */ true
+ /* useCreateElement */ true,
);
}
-Object.assign(
- ReactUpdatesFlushTransaction.prototype,
- Transaction,
- {
- getTransactionWrappers: function() {
- return TRANSACTION_WRAPPERS;
- },
+Object.assign(ReactUpdatesFlushTransaction.prototype, Transaction, {
+ getTransactionWrappers: function() {
+ return TRANSACTION_WRAPPERS;
+ },
- destructor: function() {
- this.dirtyComponentsLength = null;
- ReactUpdates.ReactReconcileTransaction.release(this.reconcileTransaction);
- this.reconcileTransaction = null;
- },
+ destructor: function() {
+ this.dirtyComponentsLength = null;
+ ReactUpdates.ReactReconcileTransaction.release(this.reconcileTransaction);
+ this.reconcileTransaction = null;
+ },
- perform: function(method, scope, a) {
- // Essentially calls `this.reconcileTransaction.perform(method, scope, a)`
- // with this transaction's wrappers around it.
- return Transaction.perform.call(
- this,
- this.reconcileTransaction.perform,
- this.reconcileTransaction,
- method,
- scope,
- a
- );
- },
- }
-);
+ perform: function(method, scope, a) {
+ // Essentially calls `this.reconcileTransaction.perform(method, scope, a)`
+ // with this transaction's wrappers around it.
+ return Transaction.perform.call(
+ this,
+ this.reconcileTransaction.perform,
+ this.reconcileTransaction,
+ method,
+ scope,
+ a,
+ );
+ },
+});
PooledClass.addPoolingTo(ReactUpdatesFlushTransaction);
@@ -111,10 +107,10 @@ function runBatchedUpdates(transaction) {
var len = transaction.dirtyComponentsLength;
invariant(
len === dirtyComponents.length,
- 'Expected flush transaction\'s stored dirty-components length (%s) to ' +
- 'match dirty-components array length (%s).',
+ "Expected flush transaction's stored dirty-components length (%s) to " +
+ 'match dirty-components array length (%s).',
len,
- dirtyComponents.length
+ dirtyComponents.length,
);
// Since reconciling a component higher in the owner hierarchy usually (not
@@ -149,7 +145,7 @@ function runBatchedUpdates(transaction) {
ReactReconciler.performUpdateIfNecessary(
component,
transaction.reconcileTransaction,
- updateBatchNumber
+ updateBatchNumber,
);
if (markerName) {
@@ -198,7 +194,7 @@ var ReactUpdatesInjection = {
injectReconcileTransaction: function(ReconcileTransaction) {
invariant(
ReconcileTransaction,
- 'ReactUpdates: must provide a reconcile transaction class'
+ 'ReactUpdates: must provide a reconcile transaction class',
);
ReactUpdates.ReactReconcileTransaction = ReconcileTransaction;
},
@@ -206,15 +202,15 @@ var ReactUpdatesInjection = {
injectBatchingStrategy: function(_batchingStrategy) {
invariant(
_batchingStrategy,
- 'ReactUpdates: must provide a batching strategy'
+ 'ReactUpdates: must provide a batching strategy',
);
invariant(
typeof _batchingStrategy.batchedUpdates === 'function',
- 'ReactUpdates: must provide a batchedUpdates() function'
+ 'ReactUpdates: must provide a batchedUpdates() function',
);
invariant(
typeof _batchingStrategy.isBatchingUpdates === 'boolean',
- 'ReactUpdates: must provide an isBatchingUpdates boolean attribute'
+ 'ReactUpdates: must provide an isBatchingUpdates boolean attribute',
);
batchingStrategy = _batchingStrategy;
},
diff --git a/src/renderers/shared/stack/reconciler/Transaction.js b/src/renderers/shared/stack/reconciler/Transaction.js
index 36d9634b3c..e08f2bbd4e 100644
--- a/src/renderers/shared/stack/reconciler/Transaction.js
+++ b/src/renderers/shared/stack/reconciler/Transaction.js
@@ -124,17 +124,18 @@ var TransactionImpl = {
*
* @return {*} Return value from `method`.
*/
- perform: function<
- A, B, C, D, E, F, G,
- T: (a: A, b: B, c: C, d: D, e: E, f: F) => G // eslint-disable-line space-before-function-paren
- >(
- method: T, scope: any,
- a: A, b: B, c: C, d: D, e: E, f: F,
- ): G {
+ perform: function<A, B, C, D, E, F, G, T: (
+ a: A,
+ b: B,
+ c: C,
+ d: D,
+ e: E,
+ f: F,
+ ) => G>(method: T, scope: any, a: A, b: B, c: C, d: D, e: E, f: F): G {
invariant(
!this.isInTransaction(),
'Transaction.perform(...): Cannot initialize a transaction when there ' +
- 'is already an outstanding transaction.'
+ 'is already an outstanding transaction.',
);
var errorThrown;
var ret;
@@ -155,8 +156,7 @@ var TransactionImpl = {
// by invoking `closeAll`.
try {
this.closeAll(0);
- } catch (err) {
- }
+ } catch (err) {}
} else {
// Since `method` didn't throw, we don't want to silence the exception
// here.
@@ -179,9 +179,9 @@ var TransactionImpl = {
// of initialize -- if it's still set to OBSERVED_ERROR in the finally
// block, it means wrapper.initialize threw.
this.wrapperInitData[i] = OBSERVED_ERROR;
- this.wrapperInitData[i] = wrapper.initialize ?
- wrapper.initialize.call(this) :
- null;
+ this.wrapperInitData[i] = wrapper.initialize
+ ? wrapper.initialize.call(this)
+ : null;
} finally {
if (this.wrapperInitData[i] === OBSERVED_ERROR) {
// The initializer for wrapper i threw an error; initialize the
@@ -189,8 +189,7 @@ var TransactionImpl = {
// that the first error is the one to bubble up.
try {
this.initializeAll(i + 1);
- } catch (err) {
- }
+ } catch (err) {}
}
}
}
@@ -205,7 +204,7 @@ var TransactionImpl = {
closeAll: function(startIndex: number): void {
invariant(
this.isInTransaction(),
- 'Transaction.closeAll(): Cannot close transaction when none are open.'
+ 'Transaction.closeAll(): Cannot close transaction when none are open.',
);
var transactionWrappers = this.transactionWrappers;
for (var i = startIndex; i < transactionWrappers.length; i++) {
@@ -229,8 +228,7 @@ var TransactionImpl = {
// first error is the one to bubble up.
try {
this.closeAll(i + 1);
- } catch (e) {
- }
+ } catch (e) {}
}
}
}
diff --git a/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js b/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js
index 504ea7aafd..00d0c2d29b 100644
--- a/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js
+++ b/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js
@@ -11,10 +11,9 @@
'use strict';
-
var Transaction;
-var INIT_ERRORED = 'initErrored'; // Just a dummy value to check for.
+var INIT_ERRORED = 'initErrored'; // Just a dummy value to check for.
describe('Transaction', () => {
beforeEach(() => {
jest.resetModules();
@@ -41,9 +40,9 @@ describe('Transaction', () => {
*/
var TestTransaction = function() {
this.reinitializeTransaction();
- this.firstCloseParam = INIT_ERRORED; // WON'T be set to something else
- this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
- this.lastCloseParam = INIT_ERRORED; // WON'T be set to something else
+ this.firstCloseParam = INIT_ERRORED; // WON'T be set to something else
+ this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
+ this.lastCloseParam = INIT_ERRORED; // WON'T be set to something else
};
Object.assign(TestTransaction.prototype, Transaction);
TestTransaction.prototype.getTransactionWrappers = function() {
@@ -85,16 +84,15 @@ describe('Transaction', () => {
});
it('should invoke closers and wrapped method when inits success', () => {
-
var performSideEffect;
/**
* New test Transaction subclass.
*/
var TestTransaction = function() {
this.reinitializeTransaction();
- this.firstCloseParam = INIT_ERRORED; // WILL be set to something else
- this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
- this.lastCloseParam = INIT_ERRORED; // WILL be set to something else
+ this.firstCloseParam = INIT_ERRORED; // WILL be set to something else
+ this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
+ this.lastCloseParam = INIT_ERRORED; // WILL be set to something else
};
Object.assign(TestTransaction.prototype, Transaction);
TestTransaction.prototype.getTransactionWrappers = function() {
@@ -146,16 +144,15 @@ describe('Transaction', () => {
* encountered earlier in the operation.
*/
it('should throw when wrapped operation throws', () => {
-
var performSideEffect;
/**
* New test Transaction subclass.
*/
var TestTransaction = function() {
this.reinitializeTransaction();
- this.firstCloseParam = INIT_ERRORED; // WILL be set to something else
- this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
- this.lastCloseParam = INIT_ERRORED; // WILL be set to something else
+ this.firstCloseParam = INIT_ERRORED; // WILL be set to something else
+ this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
+ this.lastCloseParam = INIT_ERRORED; // WILL be set to something else
};
Object.assign(TestTransaction.prototype, Transaction);
// Now, none of the close/inits throw, but the operation we wrap will throw.
@@ -198,17 +195,19 @@ describe('Transaction', () => {
var transaction = new TestTransaction();
- expect(function() {
- var isTypeError = false;
- try {
- transaction.perform(function() {
- throw new TypeError('Thrown in main wrapped operation');
- });
- } catch (err) {
- isTypeError = (err instanceof TypeError);
- }
- return isTypeError;
- }()).toBe(true);
+ expect(
+ (function() {
+ var isTypeError = false;
+ try {
+ transaction.perform(function() {
+ throw new TypeError('Thrown in main wrapped operation');
+ });
+ } catch (err) {
+ isTypeError = err instanceof TypeError;
+ }
+ return isTypeError;
+ })(),
+ ).toBe(true);
expect(performSideEffect).toBe(undefined);
expect(transaction.firstCloseParam).toBe('firstResult');
diff --git a/src/renderers/shared/stack/reconciler/instantiateReactComponent.js b/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
index 4fab1a3b20..76b4343d67 100644
--- a/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
+++ b/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
@@ -42,12 +42,10 @@ function getDeclarationErrorAddendum(owner) {
* @return {boolean} Returns true if this is a valid internal type.
*/
function isInternalComponentType(type) {
- return (
- typeof type === 'function' &&
+ return typeof type === 'function' &&
typeof type.prototype !== 'undefined' &&
typeof type.prototype.mountComponent === 'function' &&
- typeof type.prototype.receiveComponent === 'function'
- );
+ typeof type.prototype.receiveComponent === 'function';
}
/**
@@ -66,28 +64,24 @@ function instantiateReactComponent(node, shouldHaveDebugID) {
} else if (typeof node === 'object') {
var element = node;
var type = element.type;
- if (
- typeof type !== 'function' &&
- typeof type !== 'string'
- ) {
+ if (typeof type !== 'function' && typeof type !== 'string') {
var info = '';
if (__DEV__) {
if (
type === undefined ||
- typeof type === 'object' &&
- type !== null &&
- Object.keys(type).length === 0
+ (typeof type === 'object' &&
+ type !== null &&
+ Object.keys(type).length === 0)
) {
- info +=
- ' You likely forgot to export your component from the file ' +
- 'it\'s defined in.';
+ info += ' You likely forgot to export your component from the file ' +
+ "it's defined in.";
}
}
info += getDeclarationErrorAddendum(element._owner);
invariant(
false,
'Element type is invalid: expected a string (for built-in components) ' +
- 'or a class/function (for composite components) but got: %s.%s',
+ 'or a class/function (for composite components) but got: %s.%s',
type == null ? type : typeof type,
info,
);
@@ -112,20 +106,16 @@ function instantiateReactComponent(node, shouldHaveDebugID) {
} else if (typeof node === 'string' || typeof node === 'number') {
instance = ReactHostComponent.createInstanceForText(node);
} else {
- invariant(
- false,
- 'Encountered invalid React node of type %s',
- typeof node
- );
+ invariant(false, 'Encountered invalid React node of type %s', typeof node);
}
if (__DEV__) {
warning(
typeof instance.mountComponent === 'function' &&
- typeof instance.receiveComponent === 'function' &&
- typeof instance.getHostNode === 'function' &&
- typeof instance.unmountComponent === 'function',
- 'Only React Components can be mounted.'
+ typeof instance.receiveComponent === 'function' &&
+ typeof instance.getHostNode === 'function' &&
+ typeof instance.unmountComponent === 'function',
+ 'Only React Components can be mounted.',
);
}
@@ -155,7 +145,7 @@ Object.assign(
ReactCompositeComponent,
{
_instantiateReactComponent: instantiateReactComponent,
- }
+ },
);
module.exports = instantiateReactComponent;
diff --git a/src/renderers/shared/utils/ReactErrorUtils.js b/src/renderers/shared/utils/ReactErrorUtils.js
index f53bdddc5a..b3910a0dd8 100644
--- a/src/renderers/shared/utils/ReactErrorUtils.js
+++ b/src/renderers/shared/utils/ReactErrorUtils.js
@@ -1,4 +1,4 @@
- /**
+/**
* Copyright 2013-present, Facebook, Inc.
* All rights reserved.
*
@@ -88,11 +88,12 @@ if (__DEV__) {
* To help development we can get better devtools integration by simulating a
* real browser event.
*/
- if (typeof window !== 'undefined' &&
- typeof window.dispatchEvent === 'function' &&
- typeof document !== 'undefined' &&
- typeof document.createEvent === 'function') {
-
+ if (
+ typeof window !== 'undefined' &&
+ typeof window.dispatchEvent === 'function' &&
+ typeof document !== 'undefined' &&
+ typeof document.createEvent === 'function'
+ ) {
const fakeNode = document.createElement('react');
let depth = 0;
@@ -105,7 +106,7 @@ if (__DEV__) {
c,
d,
e,
- f
+ f,
) {
depth++;
const thisDepth = depth;
diff --git a/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js b/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
index c540a2bb1e..ceb8c98be5 100644
--- a/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
+++ b/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
@@ -14,13 +14,15 @@
var ReactErrorUtils;
describe('ReactErrorUtils', () => {
-
beforeEach(() => {
ReactErrorUtils = require('ReactErrorUtils');
});
// Run tests in both DEV and production
- describe('invokeGuardedCallback (development)', invokeGuardedCallbackTests.bind(null, 'development'));
+ describe(
+ 'invokeGuardedCallback (development)',
+ invokeGuardedCallbackTests.bind(null, 'development'),
+ );
describe('invokeGuardedCallback (production)', () => {
let oldProcess;
beforeEach(() => {
@@ -47,35 +49,59 @@ describe('ReactErrorUtils', () => {
var callback = function() {
throw err;
};
- ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError('foo', callback, null);
+ ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
+ 'foo',
+ callback,
+ null,
+ );
expect(() => ReactErrorUtils.rethrowCaughtError()).toThrow(err);
});
it(`should call the callback the passed arguments (${environment})`, () => {
var callback = jest.fn();
- ReactErrorUtils.invokeGuardedCallback('foo', callback, null, 'arg1', 'arg2');
+ ReactErrorUtils.invokeGuardedCallback(
+ 'foo',
+ callback,
+ null,
+ 'arg1',
+ 'arg2',
+ );
expect(callback).toBeCalledWith('arg1', 'arg2');
});
it(`should call the callback with the provided context (${environment})`, () => {
- var context = { didCall: false };
- ReactErrorUtils.invokeGuardedCallback('foo', function() {
- this.didCall = true;
- }, context);
+ var context = {didCall: false};
+ ReactErrorUtils.invokeGuardedCallback(
+ 'foo',
+ function() {
+ this.didCall = true;
+ },
+ context,
+ );
expect(context.didCall).toBe(true);
});
it(`should return a caught error (${environment})`, () => {
const error = new Error();
- const returnValue = ReactErrorUtils.invokeGuardedCallback('foo', function() {
- throw error;
- }, null, 'arg1', 'arg2');
+ const returnValue = ReactErrorUtils.invokeGuardedCallback(
+ 'foo',
+ function() {
+ throw error;
+ },
+ null,
+ 'arg1',
+ 'arg2',
+ );
expect(returnValue).toBe(error);
});
it(`should return null if no error is thrown (${environment})`, () => {
var callback = jest.fn();
- const returnValue = ReactErrorUtils.invokeGuardedCallback('foo', callback, null);
+ const returnValue = ReactErrorUtils.invokeGuardedCallback(
+ 'foo',
+ callback,
+ null,
+ );
expect(returnValue).toBe(null);
});
@@ -83,12 +109,20 @@ describe('ReactErrorUtils', () => {
const err1 = new Error();
let err2;
const err3 = new Error();
- const err4 = ReactErrorUtils.invokeGuardedCallback('foo', function() {
- err2 = ReactErrorUtils.invokeGuardedCallback('foo', function() {
- throw err1;
- }, null);
- throw err3;
- }, null);
+ const err4 = ReactErrorUtils.invokeGuardedCallback(
+ 'foo',
+ function() {
+ err2 = ReactErrorUtils.invokeGuardedCallback(
+ 'foo',
+ function() {
+ throw err1;
+ },
+ null,
+ );
+ throw err3;
+ },
+ null,
+ );
expect(err2).toBe(err1);
expect(err4).toBe(err3);
@@ -97,11 +131,19 @@ describe('ReactErrorUtils', () => {
it(`does not return nested errors (${environment})`, () => {
const err1 = new Error();
let err2;
- const err3 = ReactErrorUtils.invokeGuardedCallback('foo', function() {
- err2 = ReactErrorUtils.invokeGuardedCallback('foo', function() {
- throw err1;
- }, null);
- }, null);
+ const err3 = ReactErrorUtils.invokeGuardedCallback(
+ 'foo',
+ function() {
+ err2 = ReactErrorUtils.invokeGuardedCallback(
+ 'foo',
+ function() {
+ throw err1;
+ },
+ null,
+ );
+ },
+ null,
+ );
expect(err3).toBe(null); // Returns null because inner error was already captured
expect(err2).toBe(err1);
@@ -124,7 +166,12 @@ describe('ReactErrorUtils', () => {
var callback = function() {
throw err;
};
- ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError('foo', callback, null, 'somearg');
+ ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
+ 'foo',
+ callback,
+ null,
+ 'somearg',
+ );
expect(() => ReactErrorUtils.rethrowCaughtError()).toThrow(err);
// invokeGuardedCallbackAndCatchFirstError and rethrowCaughtError close
// over ReactErrorUtils.invokeGuardedCallback so should use the
diff --git a/src/renderers/shared/utils/__tests__/accumulateInto-test.js b/src/renderers/shared/utils/__tests__/accumulateInto-test.js
index d400eb9a02..ab6ebbee59 100644
--- a/src/renderers/shared/utils/__tests__/accumulateInto-test.js
+++ b/src/renderers/shared/utils/__tests__/accumulateInto-test.js
@@ -14,7 +14,6 @@
var accumulateInto;
describe('accumulateInto', () => {
-
beforeEach(() => {
accumulateInto = require('accumulateInto');
});
@@ -23,7 +22,7 @@ describe('accumulateInto', () => {
expect(function() {
accumulateInto([], null);
}).toThrowError(
- 'accumulateInto(...): Accumulated items must not be null or undefined.'
+ 'accumulateInto(...): Accumulated items must not be null or undefined.',
);
});
diff --git a/src/renderers/shared/utils/__tests__/adler32-test.js b/src/renderers/shared/utils/__tests__/adler32-test.js
index 16be434f65..ab6c7a0287 100644
--- a/src/renderers/shared/utils/__tests__/adler32-test.js
+++ b/src/renderers/shared/utils/__tests__/adler32-test.js
@@ -26,7 +26,7 @@ describe('adler32', () => {
expect(adler32('a')).not.toBe(adler32('A'));
});
- it('doesn\'t barf on large inputs', () => {
+ it("doesn't barf on large inputs", () => {
var str = '';
for (var i = 0; i < 100000; i++) {
str += 'This will be repeated to be very large indeed. ';
@@ -34,7 +34,7 @@ describe('adler32', () => {
expect(adler32(str)).toBe(692898118);
});
- it('doesn\'t barf on international inputs', () => {
+ it("doesn't barf on international inputs", () => {
var str = 'Linux 是一個真棒操作系統!';
expect(adler32(str)).toBe(-1183804097);
});
diff --git a/src/renderers/shared/utils/accumulate.js b/src/renderers/shared/utils/accumulate.js
index 029b2bad30..ccb205298e 100644
--- a/src/renderers/shared/utils/accumulate.js
+++ b/src/renderers/shared/utils/accumulate.js
@@ -21,10 +21,13 @@ var invariant = require('fbjs/lib/invariant');
*
* @return {*|array<*>} An accumulation of items.
*/
-function accumulate<T>(current: ?(T | Array<T>), next: T | Array<T>): T | Array<T> {
+function accumulate<T>(
+ current: ?(T | Array<T>),
+ next: T | Array<T>,
+): T | Array<T> {
invariant(
next != null,
- 'accumulate(...): Accumulated items must be not be null or undefined.'
+ 'accumulate(...): Accumulated items must be not be null or undefined.',
);
if (current == null) {
diff --git a/src/renderers/shared/utils/accumulateInto.js b/src/renderers/shared/utils/accumulateInto.js
index 851cf79f14..ae7e498278 100644
--- a/src/renderers/shared/utils/accumulateInto.js
+++ b/src/renderers/shared/utils/accumulateInto.js
@@ -27,10 +27,13 @@ var invariant = require('fbjs/lib/invariant');
* @return {*|array<*>} An accumulation of items.
*/
-function accumulateInto<T>(current: ?(T | Array<T>), next: T | Array<T>): T | Array<T> {
+function accumulateInto<T>(
+ current: ?(T | Array<T>),
+ next: T | Array<T>,
+): T | Array<T> {
invariant(
next != null,
- 'accumulateInto(...): Accumulated items must not be null or undefined.'
+ 'accumulateInto(...): Accumulated items must not be null or undefined.',
);
if (current == null) {
diff --git a/src/renderers/shared/utils/adler32.js b/src/renderers/shared/utils/adler32.js
index 45d7c005b6..4899d3b7db 100644
--- a/src/renderers/shared/utils/adler32.js
+++ b/src/renderers/shared/utils/adler32.js
@@ -28,12 +28,10 @@ function adler32(data: string): number {
while (i < m) {
var n = Math.min(i + 4096, m);
for (; i < n; i += 4) {
- b += (
- (a += data.charCodeAt(i)) +
+ b += (a += data.charCodeAt(i)) +
(a += data.charCodeAt(i + 1)) +
(a += data.charCodeAt(i + 2)) +
- (a += data.charCodeAt(i + 3))
- );
+ (a += data.charCodeAt(i + 3));
}
a %= MOD;
b %= MOD;
@@ -43,7 +41,7 @@ function adler32(data: string): number {
}
a %= MOD;
b %= MOD;
- return a | (b << 16);
+ return a | b << 16;
}
module.exports = adler32;
diff --git a/src/renderers/shared/utils/forEachAccumulated.js b/src/renderers/shared/utils/forEachAccumulated.js
index 1327b046df..f7dc69f7ae 100644
--- a/src/renderers/shared/utils/forEachAccumulated.js
+++ b/src/renderers/shared/utils/forEachAccumulated.js
@@ -23,7 +23,7 @@
*/
function forEachAccumulated<T>(
arr: ?(T | Array<T>),
- cb: ((elem: T) => void),
+ cb: (elem: T) => void,
scope: ?any,
) {
if (Array.isArray(arr)) {
diff --git a/src/renderers/shared/utils/isTextInputElement.js b/src/renderers/shared/utils/isTextInputElement.js
index e464daae31..633c19ce33 100644
--- a/src/renderers/shared/utils/isTextInputElement.js
+++ b/src/renderers/shared/utils/isTextInputElement.js
@@ -16,21 +16,21 @@
* @see http://www.whatwg.org/specs/web-apps/current-work/multipage/the-input-element.html#input-type-attr-summary
*/
var supportedInputTypes: {[key: string]: true | void} = {
- 'color': true,
- 'date': true,
- 'datetime': true,
+ color: true,
+ date: true,
+ datetime: true,
'datetime-local': true,
- 'email': true,
- 'month': true,
- 'number': true,
- 'password': true,
- 'range': true,
- 'search': true,
- 'tel': true,
- 'text': true,
- 'time': true,
- 'url': true,
- 'week': true,
+ email: true,
+ month: true,
+ number: true,
+ password: true,
+ range: true,
+ search: true,
+ tel: true,
+ text: true,
+ time: true,
+ url: true,
+ week: true,
};
function isTextInputElement(elem: ?HTMLElement): boolean {
diff --git a/src/renderers/shared/utils/validateCallback.js b/src/renderers/shared/utils/validateCallback.js
index a7ed87b4c1..cf24bc8fd1 100644
--- a/src/renderers/shared/utils/validateCallback.js
+++ b/src/renderers/shared/utils/validateCallback.js
@@ -18,8 +18,8 @@ function validateCallback(callback: ?Function) {
invariant(
!callback || typeof callback === 'function',
'Invalid argument passed as callback. Expected a function. Instead ' +
- 'received: %s',
- callback
+ 'received: %s',
+ callback,
);
}
diff --git a/src/renderers/testing/ReactTestRendererFiber.js b/src/renderers/testing/ReactTestRendererFiber.js
index 5eaa94bc49..19c2fee0b2 100644
--- a/src/renderers/testing/ReactTestRendererFiber.js
+++ b/src/renderers/testing/ReactTestRendererFiber.js
@@ -26,36 +26,36 @@ var {
HostRoot,
} = ReactTypeOfWork;
-import type { TestRendererOptions } from 'ReactTestMount';
-import type { Fiber } from 'ReactFiber';
-import type { FiberRoot } from 'ReactFiberRoot';
+import type {TestRendererOptions} from 'ReactTestMount';
+import type {Fiber} from 'ReactFiber';
+import type {FiberRoot} from 'ReactFiberRoot';
type ReactTestRendererJSON = {|
- type : string,
- props : {[propName: string] : any },
- children : null | Array<ReactTestRendererNode>,
- $$typeof ?: Symbol, // Optional because we add it with defineProperty().
+ type: string,
+ props: {[propName: string]: any},
+ children: null | Array<ReactTestRendererNode>,
+ $$typeof?: Symbol, // Optional because we add it with defineProperty().
|};
type ReactTestRendererNode = ReactTestRendererJSON | string;
type Container = {|
- children : Array<Instance | TextInstance>,
- createNodeMock : Function,
- tag : 'CONTAINER',
+ children: Array<Instance | TextInstance>,
+ createNodeMock: Function,
+ tag: 'CONTAINER',
|};
type Props = Object;
type Instance = {|
- type : string,
- props : Object,
- children : Array<Instance | TextInstance>,
- rootContainerInstance : Container,
- tag : 'INSTANCE',
+ type: string,
+ props: Object,
+ children: Array<Instance | TextInstance>,
+ rootContainerInstance: Container,
+ tag: 'INSTANCE',
|};
type TextInstance = {|
- text : string,
- tag : 'TEXT',
+ text: string,
+ tag: 'TEXT',
|};
const UPDATE_SIGNAL = {};
@@ -69,21 +69,21 @@ var TestRenderer = ReactFiberReconciler({
return emptyObject;
},
- prepareForCommit() : void {
+ prepareForCommit(): void {
// noop
},
- resetAfterCommit() : void {
+ resetAfterCommit(): void {
// noop
},
createInstance(
- type : string,
- props : Props,
- rootContainerInstance : Container,
- hostContext : Object,
- internalInstanceHandle : Object,
- ) : Instance {
+ type: string,
+ props: Props,
+ rootContainerInstance: Container,
+ hostContext: Object,
+ internalInstanceHandle: Object,
+ ): Instance {
return {
type,
props,
@@ -93,7 +93,10 @@ var TestRenderer = ReactFiberReconciler({
};
},
- appendInitialChild(parentInstance : Instance, child : Instance | TextInstance) : void {
+ appendInitialChild(
+ parentInstance: Instance,
+ child: Instance | TextInstance,
+ ): void {
const index = parentInstance.children.indexOf(child);
if (index !== -1) {
parentInstance.children.splice(index, 1);
@@ -102,75 +105,82 @@ var TestRenderer = ReactFiberReconciler({
},
finalizeInitialChildren(
- testElement : Instance,
- type : string,
- props : Props,
- rootContainerInstance : Container,
- ) : boolean {
+ testElement: Instance,
+ type: string,
+ props: Props,
+ rootContainerInstance: Container,
+ ): boolean {
return false;
},
prepareUpdate(
- testElement : Instance,
- type : string,
- oldProps : Props,
- newProps : Props,
- rootContainerInstance : Container,
- hostContext : Object,
- ) : null | {} {
+ testElement: Instance,
+ type: string,
+ oldProps: Props,
+ newProps: Props,
+ rootContainerInstance: Container,
+ hostContext: Object,
+ ): null | {} {
return UPDATE_SIGNAL;
},
commitUpdate(
- instance : Instance,
- updatePayload : {},
- type : string,
- oldProps : Props,
- newProps : Props,
- internalInstanceHandle : Object,
- ) : void {
+ instance: Instance,
+ updatePayload: {},
+ type: string,
+ oldProps: Props,
+ newProps: Props,
+ internalInstanceHandle: Object,
+ ): void {
instance.type = type;
instance.props = newProps;
},
commitMount(
- instance : Instance,
- type : string,
- newProps : Props,
- internalInstanceHandle : Object
- ) : void {
+ instance: Instance,
+ type: string,
+ newProps: Props,
+ internalInstanceHandle: Object,
+ ): void {
// noop
},
- shouldSetTextContent(props : Props) : boolean {
+ shouldSetTextContent(props: Props): boolean {
return false;
},
- resetTextContent(testElement : Instance) : void {
+ resetTextContent(testElement: Instance): void {
// noop
},
- shouldDeprioritizeSubtree(type: string, props : Props) : boolean {
+ shouldDeprioritizeSubtree(type: string, props: Props): boolean {
return false;
},
createTextInstance(
- text : string,
- rootContainerInstance : Container,
- hostContext : Object,
- internalInstanceHandle : Object
- ) : TextInstance {
+ text: string,
+ rootContainerInstance: Container,
+ hostContext: Object,
+ internalInstanceHandle: Object,
+ ): TextInstance {
return {
text,
tag: 'TEXT',
};
},
- commitTextUpdate(textInstance : TextInstance, oldText : string, newText : string) : void {
+ commitTextUpdate(
+ textInstance: TextInstance,
+ oldText: string,
+ newText: string,
+ ): void {
textInstance.text = newText;
},
- appendChild(parentInstance : Instance | Container, child : Instance | TextInstance) : void {
+ appendChild(
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ ): void {
const index = parentInstance.children.indexOf(child);
if (index !== -1) {
parentInstance.children.splice(index, 1);
@@ -179,10 +189,10 @@ var TestRenderer = ReactFiberReconciler({
},
insertBefore(
- parentInstance : Instance | Container,
- child : Instance | TextInstance,
- beforeChild : Instance | TextInstance
- ) : void {
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ beforeChild: Instance | TextInstance,
+ ): void {
const index = parentInstance.children.indexOf(child);
if (index !== -1) {
parentInstance.children.splice(index, 1);
@@ -191,16 +201,19 @@ var TestRenderer = ReactFiberReconciler({
parentInstance.children.splice(beforeIndex, 0, child);
},
- removeChild(parentInstance : Instance | Container, child : Instance | TextInstance) : void {
+ removeChild(
+ parentInstance: Instance | Container,
+ child: Instance | TextInstance,
+ ): void {
const index = parentInstance.children.indexOf(child);
parentInstance.children.splice(index, 1);
},
- scheduleAnimationCallback(fn : Function) : void {
+ scheduleAnimationCallback(fn: Function): void {
setTimeout(fn);
},
- scheduleDeferredCallback(fn : Function) : void {
+ scheduleDeferredCallback(fn: Function): void {
setTimeout(fn, 0, {timeRemaining: Infinity});
},
@@ -226,7 +239,7 @@ var defaultTestOptions = {
},
};
-function toJSON(inst : Instance | TextInstance) : ReactTestRendererNode {
+function toJSON(inst: Instance | TextInstance): ReactTestRendererNode {
switch (inst.tag) {
case 'TEXT':
return inst.text;
@@ -240,12 +253,14 @@ function toJSON(inst : Instance | TextInstance) : ReactTestRendererNode {
if (inst.children && inst.children.length) {
renderedChildren = inst.children.map(toJSON);
}
- const json : ReactTestRendererJSON = {
+ const json: ReactTestRendererJSON = {
type: inst.type,
props: props,
children: renderedChildren,
};
- Object.defineProperty(json, '$$typeof', {value: Symbol.for('react.test.json')});
+ Object.defineProperty(json, '$$typeof', {
+ value: Symbol.for('react.test.json'),
+ });
return json;
default:
throw new Error(`Unexpected node type in toJSON: ${inst.tag}`);
@@ -273,7 +288,7 @@ function toTree(node: ?Fiber) {
return {
nodeType: 'component',
type: node.type,
- props: { ...node.memoizedProps },
+ props: {...node.memoizedProps},
instance: node.stateNode,
rendered: toTree(node.child),
};
@@ -281,7 +296,7 @@ function toTree(node: ?Fiber) {
return {
nodeType: 'component',
type: node.type,
- props: { ...node.memoizedProps },
+ props: {...node.memoizedProps},
instance: null,
rendered: toTree(node.child),
};
@@ -289,7 +304,7 @@ function toTree(node: ?Fiber) {
return {
nodeType: 'host',
type: node.type,
- props: { ...node.memoizedProps },
+ props: {...node.memoizedProps},
instance: null, // TODO: use createNodeMock here somehow?
rendered: nodeAndSiblingsArray(node.child).map(toTree),
};
@@ -299,13 +314,13 @@ function toTree(node: ?Fiber) {
invariant(
false,
'toTree() does not yet know how to handle nodes with tag=%s',
- node.tag
+ node.tag,
);
}
}
var ReactTestFiberRenderer = {
- create(element : ReactElement<any>, options : TestRendererOptions) {
+ create(element: ReactElement<any>, options: TestRendererOptions) {
var createNodeMock = defaultTestOptions.createNodeMock;
if (options && typeof options.createNodeMock === 'function') {
createNodeMock = options.createNodeMock;
@@ -338,7 +353,7 @@ var ReactTestFiberRenderer = {
}
return toTree(root.current);
},
- update(newElement : ReactElement<any>) {
+ update(newElement: ReactElement<any>) {
if (root == null || root.current == null) {
return;
}
diff --git a/src/renderers/testing/__tests__/ReactTestRenderer-test.js b/src/renderers/testing/__tests__/ReactTestRenderer-test.js
index 54a7c7c98b..ce64455e4a 100644
--- a/src/renderers/testing/__tests__/ReactTestRenderer-test.js
+++ b/src/renderers/testing/__tests__/ReactTestRenderer-test.js
@@ -30,7 +30,7 @@ function cleanNode(node) {
}
if (node && node.props && node.props.children) {
// eslint-disable-next-line no-unused-vars
- var { children, ...props } = node.props;
+ var {children, ...props} = node.props;
node.props = props;
}
if (Array.isArray(node.rendered)) {
@@ -57,7 +57,7 @@ describe('ReactTestRenderer', () => {
var renderer = ReactTestRenderer.create(<Link />);
expect(renderer.toJSON()).toEqual({
type: 'a',
- props: { role: 'link' },
+ props: {role: 'link'},
children: null,
});
});
@@ -104,10 +104,8 @@ describe('ReactTestRenderer', () => {
var renderer = ReactTestRenderer.create(<Component />);
expect(renderer.toJSON()).toEqual({
type: 'div',
- props: { className: 'purple' },
- children: [
- { type: 'moo', props: {}, children: null },
- ],
+ props: {className: 'purple'},
+ children: [{type: 'moo', props: {}, children: null}],
});
});
@@ -146,10 +144,10 @@ describe('ReactTestRenderer', () => {
var renderer = ReactTestRenderer.create(<Component />);
expect(renderer.toJSON()).toEqual({
type: 'div',
- props: { className: 'purple' },
+ props: {className: 'purple'},
children: [
ReactDOMFeatureFlags.useFiber ? '7' : 7,
- { type: 'moo', props: {}, children: null },
+ {type: 'moo', props: {}, children: null},
],
});
expect(renders).toBe(6);
@@ -207,7 +205,7 @@ describe('ReactTestRenderer', () => {
<span key="a">A</span>
<span key="b">B</span>
<span key="c">C</span>
- </div>
+ </div>,
);
expect(renderer.toJSON()).toEqual({
type: 'div',
@@ -224,7 +222,7 @@ describe('ReactTestRenderer', () => {
<span key="d">D</span>
<span key="c">C</span>
<span key="b">B</span>
- </div>
+ </div>,
);
expect(renderer.toJSON()).toEqual({
type: 'div',
@@ -268,7 +266,7 @@ describe('ReactTestRenderer', () => {
it('gives a ref to native components', () => {
var log = [];
- ReactTestRenderer.create(<div ref={(r) => log.push(r)} />);
+ ReactTestRenderer.create(<div ref={r => log.push(r)} />);
expect(log).toEqual([null]);
});
@@ -292,26 +290,24 @@ describe('ReactTestRenderer', () => {
expectDev(console.error.calls.count()).toBe(1);
expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
'Warning: Stateless function components cannot be given refs. Attempts ' +
- 'to access this ref will fail.\n\nCheck the render method of `Foo`.\n' +
- ' in Bar (at **)\n' +
- ' in Foo (at **)'
+ 'to access this ref will fail.\n\nCheck the render method of `Foo`.\n' +
+ ' in Bar (at **)\n' +
+ ' in Foo (at **)',
);
});
it('allows an optional createNodeMock function', () => {
- var mockDivInstance = { appendChild: () => {} };
- var mockInputInstance = { focus: () => {} };
- var mockListItemInstance = { click: () => {} };
- var mockAnchorInstance = { hover: () => {} };
+ var mockDivInstance = {appendChild: () => {}};
+ var mockInputInstance = {focus: () => {}};
+ var mockListItemInstance = {click: () => {}};
+ var mockAnchorInstance = {hover: () => {}};
var log = [];
class Foo extends React.Component {
componentDidMount() {
log.push(this.refs.bar);
}
render() {
- return (
- <a ref="bar">Hello, world</a>
- );
+ return <a ref="bar">Hello, world</a>;
}
}
function createNodeMock(element) {
@@ -328,39 +324,27 @@ describe('ReactTestRenderer', () => {
return {};
}
}
- ReactTestRenderer.create(
- <div ref={(r) => log.push(r)} />,
- {createNodeMock}
- );
- ReactTestRenderer.create(
- <input ref={(r) => log.push(r)} />,
- {createNodeMock},
- );
+ ReactTestRenderer.create(<div ref={r => log.push(r)} />, {createNodeMock});
+ ReactTestRenderer.create(<input ref={r => log.push(r)} />, {
+ createNodeMock,
+ });
ReactTestRenderer.create(
<div>
<span>
<ul>
- <li ref={(r) => log.push(r)} />
+ <li ref={r => log.push(r)} />
</ul>
<ul>
- <li ref={(r) => log.push(r)} />
- <li ref={(r) => log.push(r)} />
+ <li ref={r => log.push(r)} />
+ <li ref={r => log.push(r)} />
</ul>
</span>
</div>,
{createNodeMock, foobar: true},
);
- ReactTestRenderer.create(
- <Foo />,
- {createNodeMock},
- );
- ReactTestRenderer.create(
- <div ref={(r) => log.push(r)} />,
- );
- ReactTestRenderer.create(
- <div ref={(r) => log.push(r)} />,
- {}
- );
+ ReactTestRenderer.create(<Foo />, {createNodeMock});
+ ReactTestRenderer.create(<div ref={r => log.push(r)} />);
+ ReactTestRenderer.create(<div ref={r => log.push(r)} />, {});
expect(log).toEqual([
mockDivInstance,
mockInputInstance,
@@ -379,10 +363,9 @@ describe('ReactTestRenderer', () => {
return <div ref="foo" />;
}
}
- const inst = ReactTestRenderer.create(
- <Foo />,
- {createNodeMock: () => 'foo'}
- );
+ const inst = ReactTestRenderer.create(<Foo />, {
+ createNodeMock: () => 'foo',
+ });
expect(() => inst.unmount()).not.toThrow();
});
@@ -396,10 +379,9 @@ describe('ReactTestRenderer', () => {
return <div />;
}
}
- const inst = ReactTestRenderer.create(
- <div><Foo /></div>,
- {createNodeMock: () => 'foo'}
- );
+ const inst = ReactTestRenderer.create(<div><Foo /></div>, {
+ createNodeMock: () => 'foo',
+ });
expect(() => inst.unmount()).not.toThrow();
expect(count).toEqual(1);
});
@@ -412,15 +394,12 @@ describe('ReactTestRenderer', () => {
};
class Foo extends React.Component {
render() {
- return this.props.useDiv
- ? <div ref="foo" />
- : <span ref="foo" />;
+ return this.props.useDiv ? <div ref="foo" /> : <span ref="foo" />;
}
}
- const inst = ReactTestRenderer.create(
- <Foo useDiv={true} />,
- {createNodeMock}
- );
+ const inst = ReactTestRenderer.create(<Foo useDiv={true} />, {
+ createNodeMock,
+ });
inst.update(<Foo useDiv={false} />);
expect(log).toEqual(['div', 'span']);
});
@@ -524,48 +503,46 @@ describe('ReactTestRenderer', () => {
renderer.update(<Component>{42}</Component>);
expect(renderer.toJSON()).toEqual({
type: 'div',
- children: [
- ReactDOMFeatureFlags.useFiber ? '42' : 42,
- ],
+ children: [ReactDOMFeatureFlags.useFiber ? '42' : 42],
props: {},
});
renderer.update(<Component><div /></Component>);
expect(renderer.toJSON()).toEqual({
type: 'div',
- children: [{
- type: 'div',
- children: null,
- props: {},
- }],
+ children: [
+ {
+ type: 'div',
+ children: null,
+ props: {},
+ },
+ ],
props: {},
});
});
it('toTree() renders simple components returning host components', () => {
-
- var Qoo = () => (
- <span className="Qoo">Hello World!</span>
- );
+ var Qoo = () => <span className="Qoo">Hello World!</span>;
var renderer = ReactTestRenderer.create(<Qoo />);
var tree = renderer.toTree();
cleanNode(tree);
- expect(prettyFormat(tree)).toEqual(prettyFormat({
- nodeType: 'component',
- type: Qoo,
- props: {},
- instance: null,
- rendered: {
- nodeType: 'host',
- type: 'span',
- props: { className: 'Qoo' },
+ expect(prettyFormat(tree)).toEqual(
+ prettyFormat({
+ nodeType: 'component',
+ type: Qoo,
+ props: {},
instance: null,
- rendered: ['Hello World!'],
- },
- }));
-
+ rendered: {
+ nodeType: 'host',
+ type: 'span',
+ props: {className: 'Qoo'},
+ instance: null,
+ rendered: ['Hello World!'],
+ },
+ }),
+ );
});
it('toTree() handles null rendering components', () => {
@@ -585,21 +562,18 @@ describe('ReactTestRenderer', () => {
expect(tree).toEqual({
type: Foo,
nodeType: 'component',
- props: { },
+ props: {},
instance: null,
rendered: null,
});
-
});
it('toTree() renders complicated trees of composites and hosts', () => {
// SFC returning host. no children props.
- var Qoo = () => (
- <span className="Qoo">Hello World!</span>
- );
+ var Qoo = () => <span className="Qoo">Hello World!</span>;
// SFC returning host. passes through children.
- var Foo = ({ className, children }) => (
+ var Foo = ({className, children}) => (
<div className={'Foo ' + className}>
<span className="Foo2">Literal</span>
{children}
@@ -609,7 +583,7 @@ describe('ReactTestRenderer', () => {
// class composite returning composite. passes through children.
class Bar extends React.Component {
render() {
- const { special, children } = this.props;
+ const {special, children} = this.props;
return (
<Foo className={special ? 'special' : 'normal'}>
{children}
@@ -638,53 +612,54 @@ describe('ReactTestRenderer', () => {
cleanNode(tree);
- expect(prettyFormat(tree)).toEqual(prettyFormat({
- type: Bam,
- nodeType: 'component',
- props: {},
- instance: null,
- rendered: {
- type: Bar,
+ expect(prettyFormat(tree)).toEqual(
+ prettyFormat({
+ type: Bam,
nodeType: 'component',
- props: { special: true },
+ props: {},
instance: null,
rendered: {
- type: Foo,
+ type: Bar,
nodeType: 'component',
- props: { className: 'special' },
+ props: {special: true},
instance: null,
rendered: {
- type: 'div',
- nodeType: 'host',
- props: { className: 'Foo special' },
+ type: Foo,
+ nodeType: 'component',
+ props: {className: 'special'},
instance: null,
- rendered: [
- {
- type: 'span',
- nodeType: 'host',
- props: { className: 'Foo2' },
- instance: null,
- rendered: ['Literal'],
- },
- {
- type: Qoo,
- nodeType: 'component',
- props: {},
- instance: null,
- rendered: {
+ rendered: {
+ type: 'div',
+ nodeType: 'host',
+ props: {className: 'Foo special'},
+ instance: null,
+ rendered: [
+ {
type: 'span',
nodeType: 'host',
- props: { className: 'Qoo' },
+ props: {className: 'Foo2'},
instance: null,
- rendered: ['Hello World!'],
+ rendered: ['Literal'],
},
- },
- ],
+ {
+ type: Qoo,
+ nodeType: 'component',
+ props: {},
+ instance: null,
+ rendered: {
+ type: 'span',
+ nodeType: 'host',
+ props: {className: 'Qoo'},
+ instance: null,
+ rendered: ['Hello World!'],
+ },
+ },
+ ],
+ },
},
},
- },
- }));
-
+ }),
+ );
});
if (ReactDOMFeatureFlags.useFiber) {
@@ -698,7 +673,7 @@ describe('ReactTestRenderer', () => {
});
it('can render and update root fragments', () => {
- var Component = (props) => props.children;
+ var Component = props => props.children;
var renderer = ReactTestRenderer.create([
<Component>Hi</Component>,
@@ -715,9 +690,7 @@ describe('ReactTestRenderer', () => {
expect(renderer.toJSON()).toEqual([
{
type: 'div',
- children: [
- 'goodbye',
- ],
+ children: ['goodbye'],
props: {},
},
'world',
diff --git a/src/renderers/testing/stack/ReactTestMount.js b/src/renderers/testing/stack/ReactTestMount.js
index cd14ada51e..3b57ead3e1 100644
--- a/src/renderers/testing/stack/ReactTestMount.js
+++ b/src/renderers/testing/stack/ReactTestMount.js
@@ -54,17 +54,17 @@ TopLevelWrapper.isReactTopLevelWrapper = true;
* @param {Object} hostContainerInfo
*/
function mountComponentIntoNode(
- componentInstance,
- transaction,
- hostParent,
- hostContainerInfo
- ) {
+ componentInstance,
+ transaction,
+ hostParent,
+ hostContainerInfo,
+) {
var image = ReactReconciler.mountComponent(
componentInstance,
transaction,
null,
hostContainerInfo,
- emptyObject
+ emptyObject,
);
componentInstance._renderedComponent._topLevelWrapper = componentInstance;
return image;
@@ -77,10 +77,7 @@ function mountComponentIntoNode(
* @param {number} rootID ID of the root node.
* @param {number} containerTag container element to mount into.
*/
-function batchedMountComponentIntoNode(
- componentInstance,
- options,
- ) {
+function batchedMountComponentIntoNode(componentInstance, options) {
var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(true);
var image = transaction.perform(
mountComponentIntoNode,
@@ -88,7 +85,7 @@ function batchedMountComponentIntoNode(
componentInstance,
transaction,
null,
- options
+ options,
);
ReactUpdates.ReactReconcileTransaction.release(transaction);
return image;
@@ -103,12 +100,11 @@ ReactTestInstance.prototype.getInstance = function() {
ReactTestInstance.prototype.update = function(nextElement) {
invariant(
this._component,
- "ReactTestRenderer: .update() can't be called after unmount."
- );
- var nextWrappedElement = React.createElement(
- TopLevelWrapper,
- { child: nextElement }
+ "ReactTestRenderer: .update() can't be called after unmount.",
);
+ var nextWrappedElement = React.createElement(TopLevelWrapper, {
+ child: nextElement,
+ });
var component = this._component;
ReactUpdates.batchedUpdates(function() {
var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(true);
@@ -117,7 +113,7 @@ ReactTestInstance.prototype.update = function(nextElement) {
component,
nextWrappedElement,
transaction,
- emptyObject
+ emptyObject,
);
});
ReactUpdates.ReactReconcileTransaction.release(transaction);
@@ -130,8 +126,8 @@ ReactTestInstance.prototype.unmount = function(nextElement) {
transaction.perform(function() {
ReactReconciler.unmountComponent(
component,
- false, /* safely */
- false /* skipLifecycle */
+ false /* safely */,
+ false /* skipLifecycle */,
);
});
ReactUpdates.ReactReconcileTransaction.release(transaction);
@@ -167,7 +163,7 @@ function toTree(component) {
return {
nodeType: 'host',
type: element.type,
- props: { ...element.props },
+ props: {...element.props},
instance: component._nodeMock,
rendered: rendered,
};
@@ -175,7 +171,7 @@ function toTree(component) {
return {
nodeType: 'component',
type: element.type,
- props: { ...element.props },
+ props: {...element.props},
instance: component._instance,
rendered: toTree(component._renderedComponent),
};
@@ -187,15 +183,13 @@ function toTree(component) {
* code between the two. For now, we'll hard code the ID logic.
*/
var ReactTestMount = {
-
render: function(
nextElement: ReactElement<any>,
options?: TestRendererOptions,
): ReactTestInstance {
- var nextWrappedElement = React.createElement(
- TopLevelWrapper,
- {child: nextElement},
- );
+ var nextWrappedElement = React.createElement(TopLevelWrapper, {
+ child: nextElement,
+ });
var instance = instantiateReactComponent(nextWrappedElement, false);
@@ -209,7 +203,6 @@ var ReactTestMount = {
);
return new ReactTestInstance(instance);
},
-
};
module.exports = ReactTestMount;
diff --git a/src/renderers/testing/stack/ReactTestReconcileTransaction.js b/src/renderers/testing/stack/ReactTestReconcileTransaction.js
index 50585e08be..379be398eb 100644
--- a/src/renderers/testing/stack/ReactTestReconcileTransaction.js
+++ b/src/renderers/testing/stack/ReactTestReconcileTransaction.js
@@ -16,7 +16,7 @@ var PooledClass = require('PooledClass');
var Transaction = require('Transaction');
var ReactUpdateQueue = require('ReactUpdateQueue');
-import type { TestRendererOptions } from 'ReactTestMount';
+import type {TestRendererOptions} from 'ReactTestMount';
/**
* Provides a `CallbackQueue` queue for collecting `onDOMReady` callbacks during
@@ -126,7 +126,7 @@ Object.assign(
ReactTestReconcileTransaction.prototype,
Transaction,
ReactTestReconcileTransaction,
- Mixin
+ Mixin,
);
PooledClass.addPoolingTo(ReactTestReconcileTransaction);
diff --git a/src/renderers/testing/stack/ReactTestRendererStack.js b/src/renderers/testing/stack/ReactTestRendererStack.js
index ce61abb80a..f87b0383bd 100644
--- a/src/renderers/testing/stack/ReactTestRendererStack.js
+++ b/src/renderers/testing/stack/ReactTestRendererStack.js
@@ -25,16 +25,16 @@ var ReactTestTextComponent = require('ReactTestTextComponent');
var ReactTestEmptyComponent = require('ReactTestEmptyComponent');
var invariant = require('fbjs/lib/invariant');
-import type { ReactElement } from 'ReactElementType';
-import type { ReactInstance } from 'ReactInstanceType';
-import type { ReactText } from 'ReactTypes';
+import type {ReactElement} from 'ReactElementType';
+import type {ReactInstance} from 'ReactInstanceType';
+import type {ReactText} from 'ReactTypes';
type ReactTestRendererJSON = {
type: string,
- props: { [propName: string]: any },
+ props: {[propName: string]: any},
children: null | Array<ReactText | ReactTestRendererJSON>,
- $$typeof?: any
-}
+ $$typeof?: any,
+};
/**
* Drill down (through composites and empty components) until we get a native or
@@ -94,7 +94,7 @@ class ReactTestComponent {
getPublicInstance(): Object {
invariant(
this._nodeMock !== UNSET,
- 'getPublicInstance should not be called before component is mounted.'
+ 'getPublicInstance should not be called before component is mounted.',
);
return this._nodeMock;
}
@@ -135,7 +135,7 @@ Object.assign(ReactTestComponent.prototype, ReactMultiChild);
// =============================================================================
ReactUpdates.injection.injectReconcileTransaction(
- ReactTestReconcileTransaction
+ ReactTestReconcileTransaction,
);
ReactUpdates.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy);
diff --git a/src/renderers/testing/stack/ReactTestTextComponent.js b/src/renderers/testing/stack/ReactTestTextComponent.js
index e87e1bd4b7..5baa7469f3 100644
--- a/src/renderers/testing/stack/ReactTestTextComponent.js
+++ b/src/renderers/testing/stack/ReactTestTextComponent.js
@@ -13,7 +13,7 @@
'use strict';
-import type { ReactText } from 'ReactTypes';
+import type {ReactText} from 'ReactTypes';
class ReactTestTextComponent {
_currentElement: ReactText;
diff --git a/src/shared/ReactFiberComponentTreeHook.js b/src/shared/ReactFiberComponentTreeHook.js
index df24a78b0d..30a4e83656 100644
--- a/src/shared/ReactFiberComponentTreeHook.js
+++ b/src/shared/ReactFiberComponentTreeHook.js
@@ -21,20 +21,21 @@ var {
} = ReactTypeOfWork;
var getComponentName = require('getComponentName');
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
function describeComponentFrame(name, source: any, ownerName) {
- return '\n in ' + (name || 'Unknown') + (
- source ?
- ' (at ' + source.fileName.replace(/^.*[\\\/]/, '') + ':' +
- source.lineNumber + ')' :
- ownerName ?
- ' (created by ' + ownerName + ')' :
- ''
- );
+ return '\n in ' +
+ (name || 'Unknown') +
+ (source
+ ? ' (at ' +
+ source.fileName.replace(/^.*[\\\/]/, '') +
+ ':' +
+ source.lineNumber +
+ ')'
+ : ownerName ? ' (created by ' + ownerName + ')' : '');
}
-function describeFiber(fiber : Fiber) : string {
+function describeFiber(fiber: Fiber): string {
switch (fiber.tag) {
case IndeterminateComponent:
case FunctionalComponent:
@@ -56,7 +57,7 @@ function describeFiber(fiber : Fiber) : string {
// This function can only be called with a work-in-progress fiber and
// only during begin or complete phase. Do not call it under any other
// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress : Fiber) : string {
+function getStackAddendumByWorkInProgressFiber(workInProgress: Fiber): string {
var info = '';
var node = workInProgress;
do {
diff --git a/src/shared/types/checkReactTypeSpec.js b/src/shared/types/checkReactTypeSpec.js
index b115ee3f70..131e23e1a5 100644
--- a/src/shared/types/checkReactTypeSpec.js
+++ b/src/shared/types/checkReactTypeSpec.js
@@ -12,21 +12,15 @@
'use strict';
var checkPropTypes = require('react/lib/checkPropTypes');
-var { getStackAddendum } = require('react/lib/ReactDebugCurrentFrame');
+var {getStackAddendum} = require('react/lib/ReactDebugCurrentFrame');
function checkReactTypeSpec(
typeSpecs,
values,
location: string,
- componentName
+ componentName,
) {
- checkPropTypes(
- typeSpecs,
- values,
- location,
- componentName,
- getStackAddendum
- );
+ checkPropTypes(typeSpecs, values, location, componentName, getStackAddendum);
}
module.exports = checkReactTypeSpec;
diff --git a/src/shared/utils/KeyEscapeUtils.js b/src/shared/utils/KeyEscapeUtils.js
index 223b2c6b67..b7ed7a00b2 100644
--- a/src/shared/utils/KeyEscapeUtils.js
+++ b/src/shared/utils/KeyEscapeUtils.js
@@ -24,12 +24,9 @@ function escape(key: string): string {
'=': '=0',
':': '=2',
};
- var escapedString = ('' + key).replace(
- escapeRegex,
- function(match) {
- return escaperLookup[match];
- }
- );
+ var escapedString = ('' + key).replace(escapeRegex, function(match) {
+ return escaperLookup[match];
+ });
return '$' + escapedString;
}
@@ -46,15 +43,13 @@ function unescape(key: string): string {
'=0': '=',
'=2': ':',
};
- var keySubstring = (key[0] === '.' && key[1] === '$')
- ? key.substring(2) : key.substring(1);
+ var keySubstring = key[0] === '.' && key[1] === '$'
+ ? key.substring(2)
+ : key.substring(1);
- return ('' + keySubstring).replace(
- unescapeRegex,
- function(match) {
- return unescaperLookup[match];
- }
- );
+ return ('' + keySubstring).replace(unescapeRegex, function(match) {
+ return unescaperLookup[match];
+ });
}
var KeyEscapeUtils = {
diff --git a/src/shared/utils/PooledClass.js b/src/shared/utils/PooledClass.js
index c2a6fa5322..15e00789e3 100644
--- a/src/shared/utils/PooledClass.js
+++ b/src/shared/utils/PooledClass.js
@@ -69,7 +69,7 @@ var standardReleaser = function(instance) {
var Klass = this;
invariant(
instance instanceof Klass,
- 'Trying to release an instance into a pool of a different type.'
+ 'Trying to release an instance into a pool of a different type.',
);
instance.destructor();
if (Klass.instancePool.length < Klass.poolSize) {
@@ -95,7 +95,7 @@ var addPoolingTo = function<T>(
CopyConstructor: Class<T>,
pooler: Pooler,
): Class<T> & {
- getPooled(/* arguments of the constructor */): T,
+ getPooled /* arguments of the constructor */(): T,
release(): void,
} {
// Casting as any so that flow ignores the actual implementation and trusts
diff --git a/src/shared/utils/ReactElementSymbol.js b/src/shared/utils/ReactElementSymbol.js
index 9d59d505e7..2596b6817f 100644
--- a/src/shared/utils/ReactElementSymbol.js
+++ b/src/shared/utils/ReactElementSymbol.js
@@ -14,8 +14,9 @@
// The Symbol used to tag the ReactElement type. If there is no native Symbol
// nor polyfill, then a plain number is used for performance.
-var REACT_ELEMENT_TYPE =
- (typeof Symbol === 'function' && Symbol.for && Symbol.for('react.element')) ||
+var REACT_ELEMENT_TYPE = (typeof Symbol === 'function' &&
+ Symbol.for &&
+ Symbol.for('react.element')) ||
0xeac7;
module.exports = REACT_ELEMENT_TYPE;
diff --git a/src/shared/utils/__tests__/PooledClass-test.js b/src/shared/utils/__tests__/PooledClass-test.js
index 43ead312db..3c206b74ae 100644
--- a/src/shared/utils/__tests__/PooledClass-test.js
+++ b/src/shared/utils/__tests__/PooledClass-test.js
@@ -31,14 +31,12 @@ describe('Pooled class', () => {
expect(instance instanceof PoolableClass).toBe(true);
});
- it('should return the instance back into the pool when it gets released',
- () => {
- var instance = PoolableClass.getPooled();
- PoolableClass.release(instance);
- expect(PoolableClass.instancePool.length).toBe(1);
- expect(PoolableClass.instancePool[0]).toBe(instance);
- }
- );
+ it('should return the instance back into the pool when it gets released', () => {
+ var instance = PoolableClass.getPooled();
+ PoolableClass.release(instance);
+ expect(PoolableClass.instancePool.length).toBe(1);
+ expect(PoolableClass.instancePool[0]).toBe(instance);
+ });
it('should return an old instance if available in the pool', () => {
var instance = PoolableClass.getPooled();
@@ -67,7 +65,7 @@ describe('Pooled class', () => {
PoolableClassWithMultiArguments.prototype.destructor = function() {};
PooledClass.addPoolingTo(
PoolableClassWithMultiArguments,
- PooledClass.twoArgumentPooler
+ PooledClass.twoArgumentPooler,
);
PoolableClassWithMultiArguments.getPooled('a', 'b', 'c');
expect(log).toEqual(['a', 'b']);
@@ -79,9 +77,7 @@ describe('Pooled class', () => {
log.push(a);
};
PoolableClassWithOneArgument.prototype.destructor = function() {};
- PooledClass.addPoolingTo(
- PoolableClassWithOneArgument
- );
+ PooledClass.addPoolingTo(PoolableClassWithOneArgument);
PoolableClassWithOneArgument.getPooled('new');
expect(log).toEqual(['new']);
});
@@ -92,29 +88,25 @@ describe('Pooled class', () => {
log.push(a);
};
PoolableClassWithOneArgument.prototype.destructor = function() {};
- PooledClass.addPoolingTo(
- PoolableClassWithOneArgument
- );
+ PooledClass.addPoolingTo(PoolableClassWithOneArgument);
var instance = PoolableClassWithOneArgument.getPooled('new');
PoolableClassWithOneArgument.release(instance);
PoolableClassWithOneArgument.getPooled('old');
expect(log).toEqual(['new', 'old']);
});
- it('should throw when the class releases an instance of a different type',
- () => {
- var RandomClass = function() {};
- RandomClass.prototype.destructor = function() {};
- PooledClass.addPoolingTo(RandomClass);
- var randomInstance = RandomClass.getPooled();
- PoolableClass.getPooled();
- expect(function() {
- PoolableClass.release(randomInstance);
- }).toThrowError(
- 'Trying to release an instance into a pool of a different type.'
- );
- }
- );
+ it('should throw when the class releases an instance of a different type', () => {
+ var RandomClass = function() {};
+ RandomClass.prototype.destructor = function() {};
+ PooledClass.addPoolingTo(RandomClass);
+ var randomInstance = RandomClass.getPooled();
+ PoolableClass.getPooled();
+ expect(function() {
+ PoolableClass.release(randomInstance);
+ }).toThrowError(
+ 'Trying to release an instance into a pool of a different type.',
+ );
+ });
it('should throw if no destructor is defined', () => {
var ImmortalClass = function() {};
diff --git a/src/shared/utils/__tests__/reactProdInvariant-test.js b/src/shared/utils/__tests__/reactProdInvariant-test.js
index 7f60f08e25..59180917a5 100644
--- a/src/shared/utils/__tests__/reactProdInvariant-test.js
+++ b/src/shared/utils/__tests__/reactProdInvariant-test.js
@@ -23,27 +23,27 @@ describe('reactProdInvariant', () => {
reactProdInvariant(124, 'foo', 'bar');
}).toThrowError(
'Minified React error #124; visit ' +
- 'http://facebook.github.io/react/docs/error-decoder.html?invariant=124&args[]=foo&args[]=bar' +
- ' for the full message or use the non-minified dev environment' +
- ' for full errors and additional helpful warnings.'
+ 'http://facebook.github.io/react/docs/error-decoder.html?invariant=124&args[]=foo&args[]=bar' +
+ ' for the full message or use the non-minified dev environment' +
+ ' for full errors and additional helpful warnings.',
);
expect(function() {
reactProdInvariant(20);
}).toThrowError(
'Minified React error #20; visit ' +
- 'http://facebook.github.io/react/docs/error-decoder.html?invariant=20' +
- ' for the full message or use the non-minified dev environment' +
- ' for full errors and additional helpful warnings.'
+ 'http://facebook.github.io/react/docs/error-decoder.html?invariant=20' +
+ ' for the full message or use the non-minified dev environment' +
+ ' for full errors and additional helpful warnings.',
);
expect(function() {
reactProdInvariant(77, '<div>', '&?bar');
}).toThrowError(
'Minified React error #77; visit ' +
- 'http://facebook.github.io/react/docs/error-decoder.html?invariant=77&args[]=%3Cdiv%3E&args[]=%26%3Fbar' +
- ' for the full message or use the non-minified dev environment' +
- ' for full errors and additional helpful warnings.'
+ 'http://facebook.github.io/react/docs/error-decoder.html?invariant=77&args[]=%3Cdiv%3E&args[]=%26%3Fbar' +
+ ' for the full message or use the non-minified dev environment' +
+ ' for full errors and additional helpful warnings.',
);
});
});
diff --git a/src/shared/utils/deprecated.js b/src/shared/utils/deprecated.js
index c723831081..1ed8bb2019 100644
--- a/src/shared/utils/deprecated.js
+++ b/src/shared/utils/deprecated.js
@@ -41,12 +41,13 @@ function deprecated<T: Function>(
// Require examples in this string must be split to prevent React's
// build tools from mistaking them for real requires.
// Otherwise the build tools will attempt to build a '%s' module.
- 'React.%s is deprecated. Please use %s.%s from require' + '(\'%s\') ' +
- 'instead.',
+ 'React.%s is deprecated. Please use %s.%s from require' +
+ "('%s') " +
+ 'instead.',
fnName,
newModule,
fnName,
- newPackage
+ newPackage,
);
/* eslint-enable no-useless-concat */
warned = true;
diff --git a/src/shared/utils/flattenChildren.js b/src/shared/utils/flattenChildren.js
index d07630580f..21a5da7140 100644
--- a/src/shared/utils/flattenChildren.js
+++ b/src/shared/utils/flattenChildren.js
@@ -46,7 +46,7 @@ function flattenSingleChildIntoContext(
// We found a component instance.
if (traverseContext && typeof traverseContext === 'object') {
const result = traverseContext;
- const keyUnique = (result[name] === undefined);
+ const keyUnique = result[name] === undefined;
if (__DEV__) {
if (!ReactComponentTreeHook) {
ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
@@ -55,10 +55,10 @@ function flattenSingleChildIntoContext(
warning(
false,
'flattenChildren(...): Encountered two children with the same key, ' +
- '`%s`. Child keys must be unique; when two children share a key, only ' +
- 'the first child will be used.%s',
+ '`%s`. Child keys must be unique; when two children share a key, only ' +
+ 'the first child will be used.%s',
KeyEscapeUtils.unescape(name),
- ReactComponentTreeHook.getStackAddendumByID(selfDebugID)
+ ReactComponentTreeHook.getStackAddendumByID(selfDebugID),
);
}
}
@@ -76,7 +76,7 @@ function flattenSingleChildIntoContext(
function flattenChildren(
children: ReactElement<any>,
selfDebugID?: number,
-): ?{ [name: string]: ReactElement<any> } {
+): ?{[name: string]: ReactElement<any>} {
if (children == null) {
return children;
}
@@ -85,13 +85,14 @@ function flattenChildren(
if (__DEV__) {
traverseAllChildren(
children,
- (traverseContext, child, name) => flattenSingleChildIntoContext(
- traverseContext,
- child,
- name,
- selfDebugID
- ),
- result
+ (traverseContext, child, name) =>
+ flattenSingleChildIntoContext(
+ traverseContext,
+ child,
+ name,
+ selfDebugID,
+ ),
+ result,
);
} else {
traverseAllChildren(children, flattenSingleChildIntoContext, result);
diff --git a/src/shared/utils/getComponentName.js b/src/shared/utils/getComponentName.js
index bce8814db6..76ee7278e1 100644
--- a/src/shared/utils/getComponentName.js
+++ b/src/shared/utils/getComponentName.js
@@ -12,18 +12,20 @@
'use strict';
-import type { ReactInstance } from 'ReactInstanceType';
-import type { Fiber } from 'ReactFiber';
+import type {ReactInstance} from 'ReactInstanceType';
+import type {Fiber} from 'ReactFiber';
-function getComponentName(instanceOrFiber : ReactInstance | Fiber) : string | null {
+function getComponentName(
+ instanceOrFiber: ReactInstance | Fiber,
+): string | null {
if (typeof instanceOrFiber.getName === 'function') {
// Stack reconciler
- const instance = ((instanceOrFiber : any) : ReactInstance);
+ const instance = ((instanceOrFiber: any): ReactInstance);
return instance.getName();
}
if (typeof instanceOrFiber.tag === 'number') {
// Fiber reconciler
- const fiber = ((instanceOrFiber : any) : Fiber);
+ const fiber = ((instanceOrFiber: any): Fiber);
const {type} = fiber;
if (typeof type === 'string') {
return type;
diff --git a/src/shared/utils/getIteratorFn.js b/src/shared/utils/getIteratorFn.js
index 8958e63c4a..ffde8ff3b9 100644
--- a/src/shared/utils/getIteratorFn.js
+++ b/src/shared/utils/getIteratorFn.js
@@ -30,11 +30,10 @@ var FAUX_ITERATOR_SYMBOL = '@@iterator'; // Before Symbol spec.
* @param {?object} maybeIterable
* @return {?function}
*/
-function getIteratorFn(maybeIterable: ?any): ?(() => ?Iterator<*>) {
- var iteratorFn = maybeIterable && (
- (ITERATOR_SYMBOL && maybeIterable[ITERATOR_SYMBOL]) ||
- maybeIterable[FAUX_ITERATOR_SYMBOL]
- );
+function getIteratorFn(maybeIterable: ?any): ?() => ?Iterator<*> {
+ var iteratorFn = maybeIterable &&
+ ((ITERATOR_SYMBOL && maybeIterable[ITERATOR_SYMBOL]) ||
+ maybeIterable[FAUX_ITERATOR_SYMBOL]);
if (typeof iteratorFn === 'function') {
return iteratorFn;
}
diff --git a/src/shared/utils/reactProdInvariant.js b/src/shared/utils/reactProdInvariant.js
index ed61b59585..b52766eb20 100644
--- a/src/shared/utils/reactProdInvariant.js
+++ b/src/shared/utils/reactProdInvariant.js
@@ -20,21 +20,20 @@
function reactProdInvariant(code: string): void {
var argCount = arguments.length - 1;
- var message = (
- 'Minified React error #' + code + '; visit ' +
- 'http://facebook.github.io/react/docs/error-decoder.html?invariant=' + code
- );
+ var message = 'Minified React error #' +
+ code +
+ '; visit ' +
+ 'http://facebook.github.io/react/docs/error-decoder.html?invariant=' +
+ code;
for (var argIdx = 0; argIdx < argCount; argIdx++) {
message += '&args[]=' + encodeURIComponent(arguments[argIdx + 1]);
}
- message += (
- ' for the full message or use the non-minified dev environment' +
- ' for full errors and additional helpful warnings.'
- );
+ message += ' for the full message or use the non-minified dev environment' +
+ ' for full errors and additional helpful warnings.';
- var error: Error & { framesToPop?: number } = new Error(message);
+ var error: Error & {framesToPop?: number} = new Error(message);
error.name = 'Invariant Violation';
error.framesToPop = 1; // we don't care about reactProdInvariant's own frame
diff --git a/src/shared/utils/traverseAllChildren.js b/src/shared/utils/traverseAllChildren.js
index 1c47359e88..933c1e5d9b 100644
--- a/src/shared/utils/traverseAllChildren.js
+++ b/src/shared/utils/traverseAllChildren.js
@@ -65,7 +65,7 @@ function traverseAllChildrenImpl(
children,
nameSoFar,
callback,
- traverseContext
+ traverseContext,
) {
var type = typeof children;
@@ -74,18 +74,20 @@ function traverseAllChildrenImpl(
children = null;
}
- if (children === null ||
- type === 'string' ||
- type === 'number' ||
- // The following is inlined from ReactElement. This means we can optimize
- // some checks. React Fiber also inlines this logic for similar purposes.
- (type === 'object' && children.$$typeof === REACT_ELEMENT_TYPE)) {
+ if (
+ children === null ||
+ type === 'string' ||
+ type === 'number' ||
+ // The following is inlined from ReactElement. This means we can optimize
+ // some checks. React Fiber also inlines this logic for similar purposes.
+ (type === 'object' && children.$$typeof === REACT_ELEMENT_TYPE)
+ ) {
callback(
traverseContext,
children,
// If it's the only child, treat the name as if it was wrapped in an array
// so that it's consistent if the number of children grows.
- nameSoFar === '' ? SEPARATOR + getComponentKey(children, 0) : nameSoFar
+ nameSoFar === '' ? SEPARATOR + getComponentKey(children, 0) : nameSoFar,
);
return 1;
}
@@ -103,7 +105,7 @@ function traverseAllChildrenImpl(
child,
nextName,
callback,
- traverseContext
+ traverseContext,
);
}
} else {
@@ -116,15 +118,17 @@ function traverseAllChildrenImpl(
if (ReactCurrentOwner.current) {
var mapsAsChildrenOwnerName = ReactCurrentOwner.current.getName();
if (mapsAsChildrenOwnerName) {
- mapsAsChildrenAddendum = '\n\nCheck the render method of `' + mapsAsChildrenOwnerName + '`.';
+ mapsAsChildrenAddendum = '\n\nCheck the render method of `' +
+ mapsAsChildrenOwnerName +
+ '`.';
}
}
warning(
didWarnAboutMaps,
'Using Maps as children is unsupported and will likely yield ' +
- 'unexpected results. Convert it to a sequence/iterable of keyed ' +
- 'ReactElements instead.%s',
- mapsAsChildrenAddendum
+ 'unexpected results. Convert it to a sequence/iterable of keyed ' +
+ 'ReactElements instead.%s',
+ mapsAsChildrenAddendum,
);
didWarnAboutMaps = true;
}
@@ -140,14 +144,13 @@ function traverseAllChildrenImpl(
child,
nextName,
callback,
- traverseContext
+ traverseContext,
);
}
} else if (type === 'object') {
var addendum = '';
if (__DEV__) {
- addendum =
- ' If you meant to render a collection of children, use an array ' +
+ addendum = ' If you meant to render a collection of children, use an array ' +
'instead or wrap the object using createFragment(object) from the ' +
'React add-ons.';
if (ReactCurrentOwner.current) {
@@ -161,10 +164,10 @@ function traverseAllChildrenImpl(
invariant(
false,
'Objects are not valid as a React child (found: %s).%s',
- childrenString === '[object Object]' ?
- 'object with keys {' + Object.keys(children).join(', ') + '}' :
- childrenString,
- addendum
+ childrenString === '[object Object]'
+ ? 'object with keys {' + Object.keys(children).join(', ') + '}'
+ : childrenString,
+ addendum,
);
}
}
diff --git a/src/test/ReactComponentTreeTestUtils.js b/src/test/ReactComponentTreeTestUtils.js
index 60afbb4b15..91f4e36b8a 100644
--- a/src/test/ReactComponentTreeTestUtils.js
+++ b/src/test/ReactComponentTreeTestUtils.js
@@ -14,13 +14,15 @@
var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
function getRootDisplayNames() {
- return ReactComponentTreeHook.getRootIDs()
- .map(ReactComponentTreeHook.getDisplayName);
+ return ReactComponentTreeHook.getRootIDs().map(
+ ReactComponentTreeHook.getDisplayName,
+ );
}
function getRegisteredDisplayNames() {
- return ReactComponentTreeHook.getRegisteredIDs()
- .map(ReactComponentTreeHook.getDisplayName);
+ return ReactComponentTreeHook.getRegisteredIDs().map(
+ ReactComponentTreeHook.getDisplayName,
+ );
}
function expectTree(rootID, expectedTree, parentPath) {
@@ -48,14 +50,14 @@ function expectTree(rootID, expectedTree, parentPath) {
expectEqual(
ReactComponentTreeHook.getDisplayName(parentID),
expectedTree.parentDisplayName,
- 'parentDisplayName'
+ 'parentDisplayName',
);
}
if (expectedTree.ownerDisplayName !== undefined) {
expectEqual(
ReactComponentTreeHook.getDisplayName(ownerID),
expectedTree.ownerDisplayName,
- 'ownerDisplayName'
+ 'ownerDisplayName',
);
}
if (expectedTree.parentID !== undefined) {
@@ -73,7 +75,7 @@ function expectTree(rootID, expectedTree, parentPath) {
expectEqual(
element && element.type,
expectedTree.element && expectedTree.element.type,
- 'element.type'
+ 'element.type',
);
} else if (text == null) {
expectEqual(typeof element, 'object', 'typeof element');
@@ -82,13 +84,13 @@ function expectTree(rootID, expectedTree, parentPath) {
expectEqual(
childIDs.length,
expectedTree.children.length,
- 'children.length'
+ 'children.length',
);
for (var i = 0; i < childIDs.length; i++) {
expectTree(
childIDs[i],
{parentID: rootID, ...expectedTree.children[i]},
- path
+ path,
);
}
} else {
diff --git a/src/test/ReactShallowRenderer.js b/src/test/ReactShallowRenderer.js
index 6e70f9b99d..2606448439 100644
--- a/src/test/ReactShallowRenderer.js
+++ b/src/test/ReactShallowRenderer.js
@@ -54,20 +54,14 @@ var ShallowComponentWrapper = function(element) {
this.construct(element);
};
-Object.assign(
- ShallowComponentWrapper.prototype,
- ReactCompositeComponent, {
- _constructComponent:
- ReactCompositeComponent._constructComponentWithoutOwner,
- _instantiateReactComponent: function(element) {
- return new NoopInternalComponent(element);
- },
- _replaceNodeWithMarkup: function() {},
- _renderValidatedComponent:
- ReactCompositeComponent
- ._renderValidatedComponentWithoutOwnerOrContext,
- }
-);
+Object.assign(ShallowComponentWrapper.prototype, ReactCompositeComponent, {
+ _constructComponent: ReactCompositeComponent._constructComponentWithoutOwner,
+ _instantiateReactComponent: function(element) {
+ return new NoopInternalComponent(element);
+ },
+ _replaceNodeWithMarkup: function() {},
+ _renderValidatedComponent: ReactCompositeComponent._renderValidatedComponentWithoutOwnerOrContext,
+});
function _batchedRender(renderer, element, context) {
var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(true);
@@ -90,17 +84,17 @@ class ReactShallowRenderer {
invariant(
React.isValidElement(element),
'ReactShallowRenderer render(): Invalid component element.%s',
- typeof element === 'function' ?
- ' Instead of passing a component class, make sure to instantiate ' +
- 'it by passing it to React.createElement.' :
- ''
+ typeof element === 'function'
+ ? ' Instead of passing a component class, make sure to instantiate ' +
+ 'it by passing it to React.createElement.'
+ : '',
);
invariant(
typeof element.type !== 'string',
'ReactShallowRenderer render(): Shallow rendering works only with custom ' +
- 'components, not primitives (%s). Instead of calling `.render(el)` and ' +
- 'inspecting the rendered output, look at `el.props` directly instead.',
- element.type
+ 'components, not primitives (%s). Instead of calling `.render(el)` and ' +
+ 'inspecting the rendered output, look at `el.props` directly instead.',
+ element.type,
);
if (!context) {
@@ -111,18 +105,17 @@ class ReactShallowRenderer {
return this.getRenderOutput();
}
getRenderOutput() {
- return (
- (this._instance && this._instance._renderedComponent &&
- this._instance._renderedComponent._renderedOutput)
- || null
- );
+ return (this._instance &&
+ this._instance._renderedComponent &&
+ this._instance._renderedComponent._renderedOutput) ||
+ null;
}
unmount() {
if (this._instance) {
ReactReconciler.unmountComponent(
this._instance,
- false, /* safely */
- false /* skipLifecycle */
+ false /* safely */,
+ false /* skipLifecycle */,
);
}
}
@@ -132,11 +125,18 @@ class ReactShallowRenderer {
this._instance,
element,
transaction,
- context
+ context,
);
} else {
var instance = new ShallowComponentWrapper(element);
- ReactReconciler.mountComponent(instance, transaction, null, null, context, 0);
+ ReactReconciler.mountComponent(
+ instance,
+ transaction,
+ null,
+ null,
+ context,
+ 0,
+ );
this._instance = instance;
}
}
diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js
index 308f74f5fe..d3190de877 100644
--- a/src/test/ReactTestUtils.js
+++ b/src/test/ReactTestUtils.js
@@ -59,10 +59,7 @@ function findAllInRenderedStackTreeInternal(inst, test) {
continue;
}
ret = ret.concat(
- findAllInRenderedStackTreeInternal(
- renderedChildren[key],
- test
- )
+ findAllInRenderedStackTreeInternal(renderedChildren[key], test),
);
}
} else if (
@@ -70,7 +67,7 @@ function findAllInRenderedStackTreeInternal(inst, test) {
typeof currentElement.type === 'function'
) {
ret = ret.concat(
- findAllInRenderedStackTreeInternal(inst._renderedComponent, test)
+ findAllInRenderedStackTreeInternal(inst._renderedComponent, test),
);
}
return ret;
@@ -81,7 +78,7 @@ function findAllInRenderedFiberTreeInternal(fiber, test) {
return [];
}
var currentParent = ReactFiberTreeReflection.findCurrentFiberUsingSlowPath(
- fiber
+ fiber,
);
if (!currentParent) {
return [];
@@ -89,8 +86,12 @@ function findAllInRenderedFiberTreeInternal(fiber, test) {
let node = currentParent;
let ret = [];
while (true) {
- if (node.tag === HostComponent || node.tag === HostText ||
- node.tag === ClassComponent || node.tag === FunctionalComponent) {
+ if (
+ node.tag === HostComponent ||
+ node.tag === HostText ||
+ node.tag === ClassComponent ||
+ node.tag === FunctionalComponent
+ ) {
var publicInst = node.stateNode;
if (test(publicInst)) {
ret.push(publicInst);
@@ -140,10 +141,7 @@ var ReactTestUtils = {
},
isElementOfType: function(inst, convenienceConstructor) {
- return (
- React.isValidElement(inst) &&
- inst.type === convenienceConstructor
- );
+ return React.isValidElement(inst) && inst.type === convenienceConstructor;
},
isDOMComponent: function(inst) {
@@ -151,9 +149,7 @@ var ReactTestUtils = {
},
isDOMComponentElement: function(inst) {
- return !!(inst &&
- React.isValidElement(inst) &&
- !!inst.tagName);
+ return !!(inst && React.isValidElement(inst) && !!inst.tagName);
},
isCompositeComponent: function(inst) {
@@ -163,8 +159,8 @@ var ReactTestUtils = {
return false;
}
return inst != null &&
- typeof inst.render === 'function' &&
- typeof inst.setState === 'function';
+ typeof inst.render === 'function' &&
+ typeof inst.setState === 'function';
},
isCompositeComponentWithType: function(inst, type) {
@@ -172,11 +168,11 @@ var ReactTestUtils = {
return false;
}
var internalInstance = ReactInstanceMap.get(inst);
- var constructor = typeof internalInstance.tag === 'number' ?
- internalInstance.type : // Fiber reconciler
- internalInstance._currentElement.type; // Stack reconciler
+ var constructor = typeof internalInstance.tag === 'number'
+ ? internalInstance.type // Fiber reconciler
+ : internalInstance._currentElement.type; // Stack reconciler
- return (constructor === type);
+ return constructor === type;
},
// TODO: deprecate? It's undocumented and unused.
@@ -187,21 +183,17 @@ var ReactTestUtils = {
// We check the prototype of the type that will get mounted, not the
// instance itself. This is a future proof way of duck typing.
var prototype = inst.type.prototype;
- return (
- typeof prototype.render === 'function' &&
- typeof prototype.setState === 'function'
- );
+ return typeof prototype.render === 'function' &&
+ typeof prototype.setState === 'function';
},
// TODO: deprecate? It's undocumented and unused.
isCompositeComponentElementWithType: function(inst, type) {
var internalInstance = ReactInstanceMap.get(inst);
- var constructor = internalInstance
- ._currentElement
- .type;
+ var constructor = internalInstance._currentElement.type;
return !!(ReactTestUtils.isCompositeComponentElement(inst) &&
- (constructor === type));
+ constructor === type);
},
// TODO: deprecate? It's undocumented and unused.
@@ -219,7 +211,7 @@ var ReactTestUtils = {
}
invariant(
ReactTestUtils.isCompositeComponent(inst),
- 'findAllInRenderedTree(...): instance must be a composite component'
+ 'findAllInRenderedTree(...): instance must be a composite component',
);
var internalInstance = ReactInstanceMap.get(inst);
if (internalInstance && typeof internalInstance.tag === 'number') {
@@ -248,7 +240,7 @@ var ReactTestUtils = {
invariant(
classNames !== undefined,
'TestUtils.scryRenderedDOMComponentsWithClass expects a ' +
- 'className as a second argument.'
+ 'className as a second argument.',
);
classNames = classNames.split(/\s+/);
}
@@ -267,18 +259,22 @@ var ReactTestUtils = {
* @return {!ReactDOMComponent} The one match.
*/
findRenderedDOMComponentWithClass: function(root, className) {
- var all =
- ReactTestUtils.scryRenderedDOMComponentsWithClass(root, className);
+ var all = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+ root,
+ className,
+ );
if (all.length !== 1) {
throw new Error(
- 'Did not find exactly one match (found: ' + all.length + ') ' +
- 'for class:' + className
+ 'Did not find exactly one match (found: ' +
+ all.length +
+ ') ' +
+ 'for class:' +
+ className,
);
}
return all[0];
},
-
/**
* Finds all instance of components in the rendered tree that are DOM
* components with the tag name matching `tagName`.
@@ -287,7 +283,7 @@ var ReactTestUtils = {
scryRenderedDOMComponentsWithTag: function(root, tagName) {
return ReactTestUtils.findAllInRenderedTree(root, function(inst) {
return ReactTestUtils.isDOMComponent(inst) &&
- inst.tagName.toUpperCase() === tagName.toUpperCase();
+ inst.tagName.toUpperCase() === tagName.toUpperCase();
});
},
@@ -301,24 +297,23 @@ var ReactTestUtils = {
var all = ReactTestUtils.scryRenderedDOMComponentsWithTag(root, tagName);
if (all.length !== 1) {
throw new Error(
- 'Did not find exactly one match (found: ' + all.length + ') ' +
- 'for tag:' + tagName
+ 'Did not find exactly one match (found: ' +
+ all.length +
+ ') ' +
+ 'for tag:' +
+ tagName,
);
}
return all[0];
},
-
/**
* Finds all instances of components with type equal to `componentType`.
* @return {array} an array of all the matches.
*/
scryRenderedComponentsWithType: function(root, componentType) {
return ReactTestUtils.findAllInRenderedTree(root, function(inst) {
- return ReactTestUtils.isCompositeComponentWithType(
- inst,
- componentType
- );
+ return ReactTestUtils.isCompositeComponentWithType(inst, componentType);
});
},
@@ -331,12 +326,15 @@ var ReactTestUtils = {
findRenderedComponentWithType: function(root, componentType) {
var all = ReactTestUtils.scryRenderedComponentsWithType(
root,
- componentType
+ componentType,
);
if (all.length !== 1) {
throw new Error(
- 'Did not find exactly one match (found: ' + all.length + ') ' +
- 'for componentType:' + componentType
+ 'Did not find exactly one match (found: ' +
+ all.length +
+ ') ' +
+ 'for componentType:' +
+ componentType,
);
}
return all[0];
@@ -359,11 +357,7 @@ var ReactTestUtils = {
mockTagName = mockTagName || module.mockTagName || 'div';
module.prototype.render.mockImplementation(function() {
- return React.createElement(
- mockTagName,
- null,
- this.props.children
- );
+ return React.createElement(mockTagName, null, this.props.children);
});
return this;
@@ -380,7 +374,7 @@ var ReactTestUtils = {
fakeNativeEvent.target = node;
ReactBrowserEventEmitter.ReactEventListener.dispatchEvent(
topLevelType,
- fakeNativeEvent
+ fakeNativeEvent,
);
},
@@ -392,21 +386,20 @@ var ReactTestUtils = {
* @param {?Event} fakeNativeEvent Fake native event to use in SyntheticEvent.
*/
simulateNativeEventOnDOMComponent: function(
- topLevelType,
- comp,
- fakeNativeEvent) {
+ topLevelType,
+ comp,
+ fakeNativeEvent,
+ ) {
ReactTestUtils.simulateNativeEventOnNode(
topLevelType,
findDOMNode(comp),
- fakeNativeEvent
+ fakeNativeEvent,
);
},
nativeTouchData: function(x, y) {
return {
- touches: [
- {pageX: x, pageY: y},
- ],
+ touches: [{pageX: x, pageY: y}],
};
},
@@ -432,7 +425,7 @@ function makeSimulator(eventType) {
invariant(
!React.isValidElement(domComponentOrNode),
'TestUtils.Simulate expects a component instance and not a ReactElement.' +
- 'TestUtils.Simulate will not work if you are using shallow rendering.'
+ 'TestUtils.Simulate will not work if you are using shallow rendering.',
);
if (ReactTestUtils.isDOMComponent(domComponentOrNode)) {
node = findDOMNode(domComponentOrNode);
@@ -440,8 +433,9 @@ function makeSimulator(eventType) {
node = domComponentOrNode;
}
- var dispatchConfig =
- EventPluginRegistry.eventNameDispatchConfigs[eventType];
+ var dispatchConfig = EventPluginRegistry.eventNameDispatchConfigs[
+ eventType
+ ];
var fakeNativeEvent = new Event();
fakeNativeEvent.target = node;
@@ -454,7 +448,7 @@ function makeSimulator(eventType) {
dispatchConfig,
targetInst,
fakeNativeEvent,
- node
+ node,
);
// Since we aren't using pooling, always persist the event. This will make
@@ -530,14 +524,14 @@ function makeNativeSimulator(eventType) {
ReactTestUtils.simulateNativeEventOnDOMComponent(
eventType,
domComponentOrNode,
- fakeNativeEvent
+ fakeNativeEvent,
);
} else if (domComponentOrNode.tagName) {
// Will allow on actual dom nodes.
ReactTestUtils.simulateNativeEventOnNode(
eventType,
domComponentOrNode,
- fakeNativeEvent
+ fakeNativeEvent,
);
}
};
@@ -545,14 +539,16 @@ function makeNativeSimulator(eventType) {
Object.keys(topLevelTypes).forEach(function(eventType) {
// Event type is stored as 'topClick' - we transform that to 'click'
- var convenienceName = eventType.indexOf('top') === 0 ?
- eventType.charAt(3).toLowerCase() + eventType.substr(4) : eventType;
+ var convenienceName = eventType.indexOf('top') === 0
+ ? eventType.charAt(3).toLowerCase() + eventType.substr(4)
+ : eventType;
/**
* @param {!Element|ReactDOMComponent} domComponentOrNode
* @param {?Event} nativeEventData Fake native event to use in SyntheticEvent.
*/
- ReactTestUtils.SimulateNative[convenienceName] =
- makeNativeSimulator(eventType);
+ ReactTestUtils.SimulateNative[convenienceName] = makeNativeSimulator(
+ eventType,
+ );
});
module.exports = ReactTestUtils;
diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js
index 4afb19af5b..a196a0b116 100644
--- a/src/test/__tests__/ReactTestUtils-test.js
+++ b/src/test/__tests__/ReactTestUtils-test.js
@@ -17,7 +17,6 @@ var ReactDOMServer;
var ReactTestUtils;
describe('ReactTestUtils', () => {
-
beforeEach(() => {
React = require('react');
ReactDOM = require('react-dom');
@@ -77,14 +76,14 @@ describe('ReactTestUtils', () => {
var shallowRenderer = ReactTestUtils.createRenderer();
expect(() => shallowRenderer.render(SomeComponent)).toThrowError(
'ReactShallowRenderer render(): Invalid component element. Instead of ' +
- 'passing a component class, make sure to instantiate it by passing it ' +
- 'to React.createElement.'
+ 'passing a component class, make sure to instantiate it by passing it ' +
+ 'to React.createElement.',
);
expect(() => shallowRenderer.render(<div />)).toThrowError(
'ReactShallowRenderer render(): Shallow rendering works only with ' +
- 'custom components, not primitives (div). Instead of calling ' +
- '`.render(el)` and inspecting the rendered output, look at `el.props` ' +
- 'directly instead.'
+ 'custom components, not primitives (div). Instead of calling ' +
+ '`.render(el)` and inspecting the rendered output, look at `el.props` ' +
+ 'directly instead.',
);
});
@@ -143,10 +142,7 @@ describe('ReactTestUtils', () => {
if (this.props.aNew === 'prop') {
return (
- <a
- href="#"
- onClick={this.onClick}
- className={className}>
+ <a href="#" onClick={this.onClick} className={className}>
Test link
</a>
);
@@ -217,7 +213,7 @@ describe('ReactTestUtils', () => {
state = {clicked: false};
handleUserClick = () => {
- this.setState({ clicked: true });
+ this.setState({clicked: true});
};
render() {
@@ -294,11 +290,11 @@ describe('ReactTestUtils', () => {
shallowRenderer.render(<SimpleComponent />);
expectDev(console.error.calls.count()).toBe(1);
expect(
- console.error.calls.argsFor(0)[0].replace(/\(at .+?:\d+\)/g, '(at **)')
+ console.error.calls.argsFor(0)[0].replace(/\(at .+?:\d+\)/g, '(at **)'),
).toBe(
'Warning: Failed context type: The context `name` is marked as ' +
- 'required in `SimpleComponent`, but its value is `undefined`.\n' +
- ' in SimpleComponent (at **)'
+ 'required in `SimpleComponent`, but its value is `undefined`.\n' +
+ ' in SimpleComponent (at **)',
);
});
@@ -312,7 +308,7 @@ describe('ReactTestUtils', () => {
var renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass(
renderedComponent,
- 'NonExistentClass'
+ 'NonExistentClass',
);
expect(scryResults.length).toBe(0);
});
@@ -327,7 +323,7 @@ describe('ReactTestUtils', () => {
var renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass(
renderedComponent,
- 'x'
+ 'x',
);
expect(scryResults.length).toBe(1);
});
@@ -342,19 +338,19 @@ describe('ReactTestUtils', () => {
var renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
var scryResults1 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
renderedComponent,
- 'x y'
+ 'x y',
);
expect(scryResults1.length).toBe(1);
var scryResults2 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
renderedComponent,
- 'x z'
+ 'x z',
);
expect(scryResults2.length).toBe(1);
var scryResults3 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
renderedComponent,
- ['x', 'y']
+ ['x', 'y'],
);
expect(scryResults3.length).toBe(1);
@@ -363,13 +359,13 @@ describe('ReactTestUtils', () => {
var scryResults4 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
renderedComponent,
- ['x', 'a']
+ ['x', 'a'],
);
expect(scryResults4.length).toBe(0);
var scryResults5 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
renderedComponent,
- ['x a']
+ ['x a'],
);
expect(scryResults5.length).toBe(0);
});
@@ -387,14 +383,14 @@ describe('ReactTestUtils', () => {
{null}
<div>purple</div>
</Wrapper>,
- container
+ container,
);
var tree = ReactDOM.render(
<Wrapper>
<div>orange</div>
<div>purple</div>
</Wrapper>,
- container
+ container,
);
var log = [];
@@ -424,7 +420,7 @@ describe('ReactTestUtils', () => {
injectedDOMComponents.forEach(function(type) {
var testComponent = ReactTestUtils.renderIntoDocument(
- React.createElement(type)
+ React.createElement(type),
);
expect(testComponent.tagName).toBe(type.toUpperCase());
expect(ReactTestUtils.isDOMComponent(testComponent)).toBe(true);
@@ -467,13 +463,18 @@ describe('ReactTestUtils', () => {
};
spyOn(obj, 'handler').and.callThrough();
var container = document.createElement('div');
- var instance = ReactDOM.render(<input type="text" onChange={obj.handler} />, container);
+ var instance = ReactDOM.render(
+ <input type="text" onChange={obj.handler} />,
+ container,
+ );
var node = ReactDOM.findDOMNode(instance);
node.value = 'giraffe';
ReactTestUtils.Simulate.change(node);
- expect(obj.handler).toHaveBeenCalledWith(jasmine.objectContaining({target: node}));
+ expect(obj.handler).toHaveBeenCalledWith(
+ jasmine.objectContaining({target: node}),
+ );
});
it('should change the value of an input field in a component', () => {
@@ -494,13 +495,18 @@ describe('ReactTestUtils', () => {
};
spyOn(obj, 'handler').and.callThrough();
var container = document.createElement('div');
- var instance = ReactDOM.render(<SomeComponent handleChange={obj.handler} />, container);
+ var instance = ReactDOM.render(
+ <SomeComponent handleChange={obj.handler} />,
+ container,
+ );
var node = ReactDOM.findDOMNode(instance.refs.input);
node.value = 'zebra';
ReactTestUtils.Simulate.change(node);
- expect(obj.handler).toHaveBeenCalledWith(jasmine.objectContaining({target: node}));
+ expect(obj.handler).toHaveBeenCalledWith(
+ jasmine.objectContaining({target: node}),
+ );
});
it('should throw when attempting to use ReactTestUtils.Simulate with shallow rendering', () => {
@@ -516,11 +522,13 @@ describe('ReactTestUtils', () => {
var handler = jasmine.createSpy('spy');
var shallowRenderer = ReactTestUtils.createRenderer();
- var result = shallowRenderer.render(<SomeComponent handleClick={handler} />);
+ var result = shallowRenderer.render(
+ <SomeComponent handleClick={handler} />,
+ );
expect(() => ReactTestUtils.Simulate.click(result)).toThrowError(
'TestUtils.Simulate expects a component instance and not a ReactElement.' +
- 'TestUtils.Simulate will not work if you are using shallow rendering.'
+ 'TestUtils.Simulate will not work if you are using shallow rendering.',
);
expect(handler).not.toHaveBeenCalled();
});
@@ -531,7 +539,7 @@ describe('ReactTestUtils', () => {
var CLIENT_X = 100;
class Component extends React.Component {
- handleClick = (e) => {
+ handleClick = e => {
expect(e.clientX).toBe(CLIENT_X);
};
@@ -542,10 +550,9 @@ describe('ReactTestUtils', () => {
var element = document.createElement('div');
var instance = ReactDOM.render(<Component />, element);
- ReactTestUtils.Simulate.click(
- ReactDOM.findDOMNode(instance),
- {clientX: CLIENT_X}
- );
+ ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance), {
+ clientX: CLIENT_X,
+ });
expectDev(console.error.calls.count()).toBe(0);
});
@@ -571,7 +578,7 @@ describe('ReactTestUtils', () => {
describe('Simulate', () => {
it('should set the type of the event', () => {
let event;
- const stub = jest.genMockFn().mockImplementation((e) => {
+ const stub = jest.genMockFn().mockImplementation(e => {
e.persist();
event = e;
});
@@ -586,5 +593,4 @@ describe('ReactTestUtils', () => {
expect(event.nativeEvent.type).toBe('keydown');
});
});
-
});
diff --git a/src/test/__tests__/reactComponentExpect-test.js b/src/test/__tests__/reactComponentExpect-test.js
index 02d4dd32ee..f1e844a54f 100644
--- a/src/test/__tests__/reactComponentExpect-test.js
+++ b/src/test/__tests__/reactComponentExpect-test.js
@@ -16,7 +16,6 @@ var ReactTestUtils;
var reactComponentExpect;
describe('reactComponentExpect', () => {
-
beforeEach(() => {
React = require('react');
ReactTestUtils = require('ReactTestUtils');
@@ -27,9 +26,7 @@ describe('reactComponentExpect', () => {
class SomeComponent extends React.Component {
state = {y: 2};
render() {
- return (
- <div className="Hello" />
- );
+ return <div className="Hello" />;
}
}
@@ -46,9 +43,7 @@ describe('reactComponentExpect', () => {
it('should match empty DOM components', () => {
class SomeComponent extends React.Component {
render() {
- return (
- <div className="Hello" />
- );
+ return <div className="Hello" />;
}
}
diff --git a/src/test/getTestDocument.js b/src/test/getTestDocument.js
index 8f681cd428..bd0c0e9cba 100644
--- a/src/test/getTestDocument.js
+++ b/src/test/getTestDocument.js
@@ -14,7 +14,8 @@
function getTestDocument(markup) {
document.open();
document.write(
- markup || '<!doctype html><html><meta charset=utf-8><title>test doc'
+ markup ||
+ 'test doc',
);
document.close();
return document;
diff --git a/src/test/reactComponentExpect.js b/src/test/reactComponentExpect.js
index 619bd1d9a2..ddf013ab92 100644
--- a/src/test/reactComponentExpect.js
+++ b/src/test/reactComponentExpect.js
@@ -44,7 +44,7 @@ function reactComponentExpect(instance) {
invariant(
ReactTestUtils.isCompositeComponent(instance),
- 'reactComponentExpect(...): instance must be a composite component'
+ 'reactComponentExpect(...): instance must be a composite component',
);
var internalInstance = ReactInstanceMap.get(instance);
@@ -124,8 +124,7 @@ Object.assign(reactComponentExpectInternal.prototype, {
}
} else {
// Stack reconciler
- var renderedChildren =
- this._instance._renderedChildren || {};
+ var renderedChildren = this._instance._renderedChildren || {};
for (var name in renderedChildren) {
if (!renderedChildren.hasOwnProperty(name)) {
continue;
@@ -174,14 +173,10 @@ Object.assign(reactComponentExpectInternal.prototype, {
toBeComponentOfType: function(constructor) {
if (typeof this._instance.tag === 'number') {
// Fiber reconciler
- expect(
- this._instance.type === constructor
- ).toBe(true);
+ expect(this._instance.type === constructor).toBe(true);
} else {
// Stack reconciler
- expect(
- this._instance._currentElement.type === constructor
- ).toBe(true);
+ expect(this._instance._currentElement.type === constructor).toBe(true);
}
return this;
},
@@ -195,7 +190,7 @@ Object.assign(reactComponentExpectInternal.prototype, {
// and doesn't work with them.
expect(
typeof this.instance() === 'object' &&
- typeof this.instance().render === 'function'
+ typeof this.instance().render === 'function',
).toBe(true);
return this;
},
@@ -211,7 +206,9 @@ Object.assign(reactComponentExpectInternal.prototype, {
// Fiber reconciler
expect(this._instance.tag === HostText).toBe(true);
var actualVal = this._instance.memoizedProps;
- expect(typeof actualVal === 'string' || typeof actualVal === 'number').toBe(true);
+ expect(
+ typeof actualVal === 'string' || typeof actualVal === 'number',
+ ).toBe(true);
expect('' + actualVal).toBe(val);
} else {
// Fiber reconciler
@@ -256,8 +253,9 @@ Object.assign(reactComponentExpectInternal.prototype, {
if (!stateNameToExpectedValue.hasOwnProperty(stateName)) {
continue;
}
- expect(this.instance().state[stateName])
- .toEqual(stateNameToExpectedValue[stateName]);
+ expect(this.instance().state[stateName]).toEqual(
+ stateNameToExpectedValue[stateName],
+ );
}
return this;
},
@@ -272,8 +270,9 @@ Object.assign(reactComponentExpectInternal.prototype, {
if (!propNameToExpectedValue.hasOwnProperty(propName)) {
continue;
}
- expect(this.instance().props[propName])
- .toEqual(propNameToExpectedValue[propName]);
+ expect(this.instance().props[propName]).toEqual(
+ propNameToExpectedValue[propName],
+ );
}
return this;
},
@@ -288,8 +287,9 @@ Object.assign(reactComponentExpectInternal.prototype, {
if (!contextNameToExpectedValue.hasOwnProperty(contextName)) {
continue;
}
- expect(this.instance().context[contextName])
- .toEqual(contextNameToExpectedValue[contextName]);
+ expect(this.instance().context[contextName]).toEqual(
+ contextNameToExpectedValue[contextName],
+ );
}
return this;
},
diff --git a/src/umd/ReactUMDEntry.js b/src/umd/ReactUMDEntry.js
index ab926354a6..fd08211201 100644
--- a/src/umd/ReactUMDEntry.js
+++ b/src/umd/ReactUMDEntry.js
@@ -14,11 +14,14 @@
var React = require('React');
// `version` will be added here by the React module.
-var ReactUMDEntry = Object.assign({
- __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
- ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),
+var ReactUMDEntry = Object.assign(
+ {
+ __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+ ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),
+ },
},
-}, React);
+ React,
+);
if (__DEV__) {
Object.assign(
@@ -26,7 +29,7 @@ if (__DEV__) {
{
// ReactComponentTreeHook should not be included in production.
ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
- }
+ },
);
}
diff --git a/src/umd/ReactWithAddonsUMDEntry.js b/src/umd/ReactWithAddonsUMDEntry.js
index c36ade28a9..3e02225990 100644
--- a/src/umd/ReactWithAddonsUMDEntry.js
+++ b/src/umd/ReactWithAddonsUMDEntry.js
@@ -14,12 +14,15 @@
var ReactWithAddons = require('ReactWithAddons');
// `version` will be added here by the React module.
-var ReactWithAddonsUMDEntry = Object.assign({
- __SECRET_INJECTED_REACT_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: null, // Will be injected by ReactDOM UMD build.
- __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
- ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),
+var ReactWithAddonsUMDEntry = Object.assign(
+ {
+ __SECRET_INJECTED_REACT_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: null, // Will be injected by ReactDOM UMD build.
+ __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+ ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),
+ },
},
-}, ReactWithAddons);
+ ReactWithAddons,
+);
if (__DEV__) {
Object.assign(
@@ -27,7 +30,7 @@ if (__DEV__) {
{
// ReactComponentTreeHook should not be included in production.
ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
- }
+ },
);
}
diff --git a/yarn.lock b/yarn.lock
index 34e1cbb6c3..10791445ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -246,6 +246,14 @@ ast-types@0.8.12:
version "0.8.12"
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
+ast-types@0.8.18:
+ version "0.8.18"
+ resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.18.tgz#c8b98574898e8914e9d8de74b947564a9fe929af"
+
+ast-types@0.9.4:
+ version "0.9.4"
+ resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.4.tgz#410d1f81890aeb8e0a38621558ba5869ae53c91b"
+
ast-types@0.9.5:
version "0.9.5"
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.5.tgz#1a660a09945dbceb1f9c9cbb715002617424e04a"
@@ -311,7 +319,7 @@ babel-cli@^6.6.5:
optionalDependencies:
chokidar "^1.6.1"
-babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
+babel-code-frame@6.22.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
dependencies:
@@ -1270,7 +1278,7 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"
-chalk@*, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@*, chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
dependencies:
@@ -1377,7 +1385,7 @@ color-name@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
-colors@~0.6.2:
+colors@>=0.6.2, colors@~0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
@@ -2036,7 +2044,7 @@ estree-walker@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
-esutils@^2.0.0, esutils@^2.0.2:
+esutils@^2.0.0, esutils@^2.0.2, esutils@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -2302,6 +2310,14 @@ flow-bin@^0.37.0:
version "0.37.4"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.37.4.tgz#3d8da2ef746e80e730d166e09040f4198969b76b"
+flow-parser@0.40.0:
+ version "0.40.0"
+ resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.40.0.tgz#b3444742189093323c4319c4fe9d35391f46bcbc"
+ dependencies:
+ ast-types "0.8.18"
+ colors ">=0.6.2"
+ minimist ">=0.2.0"
+
for-in@^0.1.5:
version "0.1.6"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"
@@ -2405,6 +2421,10 @@ get-caller-file@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+get-stdin@5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+
get-stdin@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -2477,6 +2497,17 @@ glob2base@^0.0.12:
dependencies:
find-index "^0.1.1"
+glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1:
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.0.2"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
glob@^4.3.1:
version "4.5.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
@@ -2506,17 +2537,6 @@ glob@^6.0.4:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.0.2"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
glob@~3.1.21:
version "3.1.21"
resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
@@ -3460,7 +3480,7 @@ jest-util@^19.0.1:
leven "^2.0.0"
mkdirp "^0.5.1"
-jest-validate@^19.0.0:
+jest-validate@19.0.0, jest-validate@^19.0.0:
version "19.0.0"
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.0.tgz#8c6318a20ecfeaba0ba5378bfbb8277abded4173"
dependencies:
@@ -3947,7 +3967,7 @@ minimist@0.0.8, minimist@~0.0.1:
version "0.0.8"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
+minimist@1.2.0, minimist@>=0.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
@@ -4352,6 +4372,21 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+prettier@^0.22.0:
+ version "0.22.0"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-0.22.0.tgz#7b37c4480d0858180407e5a8e13f0f47da7385d2"
+ dependencies:
+ ast-types "0.9.4"
+ babel-code-frame "6.22.0"
+ babylon "6.15.0"
+ chalk "1.1.3"
+ esutils "2.0.2"
+ flow-parser "0.40.0"
+ get-stdin "5.0.1"
+ glob "7.1.1"
+ jest-validate "19.0.0"
+ minimist "1.2.0"
+
pretty-format@^19.0.0:
version "19.0.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84"