Skip to content

Commit 2433ef3

Browse files
GordyDGordyD
authored
Merge branch 'master' into ReactDOMComponentTree-test
2 parents ddb7fb7 + c932885 commit 2433ef3

File tree

170 files changed

+2746
-1821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+2746
-1821
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Starting with 16.1.0, we will no longer be publishing new releases on Bower. You
3333
* Fix a crash rendering into shadow root. ([@gaearon](https://github.com/gaearon) in [#11037](https://github.com/facebook/react/pull/11037))
3434
* Fix false positive warning about hydrating mixed case SVG tags. ([@gaearon](http://github.com/gaearon) in [#11174](https://github.com/facebook/react/pull/11174))
3535
* Suppress the new unknown tag warning for `<dialog>` element. ([@gaearon](http://github.com/gaearon) in [#11035](https://github.com/facebook/react/pull/11035))
36+
* Warn when defining a non-existent `componentDidReceiveProps` method. ([@iamtommcc](https://github.com/iamtommcc) in [#11479](https://github.com/facebook/react/pull/11479))
3637
* Warn about function child no more than once. ([@andreysaleba](https://github.com/andreysaleba) in [#11120](https://github.com/facebook/react/pull/11120))
3738
* Warn about nested updates no more than once. ([@anushreesubramani](https://github.com/anushreesubramani) in [#11113](https://github.com/facebook/react/pull/11113))
3839
* Deduplicate other warnings about updates. ([@anushreesubramani](https://github.com/anushreesubramani) in [#11216](https://github.com/facebook/react/pull/11216))

‎fixtures/art/VectorWidget.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ var RING_TWO_PATH =
137137
var RING_THREE_PATH =
138138
'M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121';
139139
var RING_TWO_ROTATE = new Transform()
140-
.translate(84.000000, 89.000000)
141-
.rotate(-240.000000)
142-
.translate(-84.000000, -89.000000);
140+
.translate(84.0, 89.0)
141+
.rotate(-240.0)
142+
.translate(-84.0, -89.0);
143143
var RING_THREE_ROTATE = new Transform()
144-
.translate(84.000000, 89.000000)
145-
.rotate(-300.000000)
146-
.translate(-84.000000, -89.000000);
144+
.translate(84.0, 89.0)
145+
.rotate(-300.0)
146+
.translate(-84.0, -89.0);
147147

148148
module.exports = VectorWidget;

‎fixtures/attribute-behavior/src/App.js

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ function getCanonicalizedValue(value) {
185185
if (typeof value.length === 'number') {
186186
return (
187187
'[' +
188-
Array.from(value).map(v => getCanonicalizedValue(v)).join(', ') +
188+
Array.from(value)
189+
.map(v => getCanonicalizedValue(v))
190+
.join(', ') +
189191
']'
190192
);
191193
}
@@ -459,7 +461,9 @@ function prepareState(initGlobals) {
459461
hasSameBehaviorForAll,
460462
rowPatternHash,
461463
// "Good enough" id that we can store in localStorage
462-
rowIdHash: `${attribute.name} ${attribute.tagName} ${attribute.overrideStringValue}`,
464+
rowIdHash: `${attribute.name} ${attribute.tagName} ${
465+
attribute.overrideStringValue
466+
}`,
463467
};
464468
const rowGroup = rowPatternHashes.get(rowPatternHash) || new Set();
465469
rowGroup.add(row);
@@ -677,9 +681,11 @@ function CellContent(props) {
677681
<RowHeader
678682
checked={completedHashes.has(rowPatternHash)}
679683
onChange={() => toggleAttribute(rowPatternHash)}>
680-
{row.hasSameBehaviorForAll
681-
? attribute.name
682-
: <b css={{color: 'purple'}}>{attribute.name}</b>}
684+
{row.hasSameBehaviorForAll ? (
685+
attribute.name
686+
) : (
687+
<b css={{color: 'purple'}}>{attribute.name}</b>
688+
)}
683689
</RowHeader>
684690
);
685691
}
@@ -754,8 +760,10 @@ class App extends React.Component {
754760
async componentDidMount() {
755761
const sources = {
756762
ReactStable: 'https://unpkg.com/react@latest/umd/react.development.js',
757-
ReactDOMStable: 'https://unpkg.com/react-dom@latest/umd/react-dom.development.js',
758-
ReactDOMServerStable: 'https://unpkg.com/react-dom@latest/umd/react-dom-server.browser.development.js',
763+
ReactDOMStable:
764+
'https://unpkg.com/react-dom@latest/umd/react-dom.development.js',
765+
ReactDOMServerStable:
766+
'https://unpkg.com/react-dom@latest/umd/react-dom-server.browser.development.js',
759767
ReactNext: '/react.development.js',
760768
ReactDOMNext: '/react-dom.development.js',
761769
ReactDOMServerNext: '/react-dom-server.browser.development.js',
@@ -860,12 +868,12 @@ class App extends React.Component {
860868
case ALPHABETICAL:
861869
return filteredAttributes.sort(
862870
(attr1, attr2) =>
863-
(attr1.name.toLowerCase() < attr2.name.toLowerCase() ? -1 : 1)
871+
attr1.name.toLowerCase() < attr2.name.toLowerCase() ? -1 : 1
864872
);
865873
case REV_ALPHABETICAL:
866874
return filteredAttributes.sort(
867875
(attr1, attr2) =>
868-
(attr1.name.toLowerCase() < attr2.name.toLowerCase() ? 1 : -1)
876+
attr1.name.toLowerCase() < attr2.name.toLowerCase() ? 1 : -1
869877
);
870878
case GROUPED_BY_ROW_PATTERN: {
871879
return filteredAttributes.sort((attr1, attr2) => {
@@ -895,7 +903,8 @@ class App extends React.Component {
895903

896904
let log = '';
897905
for (let attribute of attributes) {
898-
log += `## \`${attribute.name}\` (on \`<${attribute.tagName || 'div'}>\` inside \`<${attribute.containerTagName || 'div'}>\`)\n`;
906+
log += `## \`${attribute.name}\` (on \`<${attribute.tagName ||
907+
'div'}>\` inside \`<${attribute.containerTagName || 'div'}>\`)\n`;
899908
log += '| Test Case | Flags | Result |\n';
900909
log += '| --- | --- | --- |\n';
901910

@@ -950,40 +959,32 @@ class App extends React.Component {
950959
return (
951960
<div>
952961
<h1>Loading...</h1>
953-
{!useFastMode &&
954-
<h3>The progress is reported in the window title.</h3>}
962+
{!useFastMode && (
963+
<h3>The progress is reported in the window title.</h3>
964+
)}
955965
</div>
956966
);
957967
}
958968
return (
959969
<div>
960970
<div>
961971
<select value={this.state.sortOrder} onChange={this.onUpdateSort}>
962-
<option value={ALPHABETICAL}>
963-
alphabetical
964-
</option>
965-
<option value={REV_ALPHABETICAL}>
966-
reverse alphabetical
967-
</option>
972+
<option value={ALPHABETICAL}>alphabetical</option>
973+
<option value={REV_ALPHABETICAL}>reverse alphabetical</option>
968974
<option value={GROUPED_BY_ROW_PATTERN}>
969975
grouped by row pattern :)
970976
</option>
971977
</select>
972978
<select value={this.state.filter} onChange={this.onUpdateFilter}>
973-
<option value={ALL}>
974-
all
975-
</option>
976-
<option value={INCOMPLETE}>
977-
incomplete
978-
</option>
979-
<option value={COMPLETE}>
980-
complete
981-
</option>
979+
<option value={ALL}>all</option>
980+
<option value={INCOMPLETE}>incomplete</option>
981+
<option value={COMPLETE}>complete</option>
982982
</select>
983983
<button style={{marginLeft: '10px'}} onClick={this.handleSaveClick}>
984-
Save latest results to a file
985-
{' '}
986-
<span role="img" aria-label="Save">💾</span>
984+
Save latest results to a file{' '}
985+
<span role="img" aria-label="Save">
986+
💾
987+
</span>
987988
</button>
988989
</div>
989990
<AutoSizer disableHeight={true}>

‎fixtures/attribute-behavior/src/attributes.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,8 @@ const attributes = [
843843
name: 'gradientTransform',
844844
read: getSVGProperty('gradientTransform'),
845845
containerTagName: 'svg',
846-
overrideStringValue: 'translate(-10,-20) scale(2) rotate(45) translate(5,10)',
846+
overrideStringValue:
847+
'translate(-10,-20) scale(2) rotate(45) translate(5,10)',
847848
tagName: 'linearGradient',
848849
},
849850
{
@@ -1353,7 +1354,8 @@ const attributes = [
13531354
read: getSVGProperty('patternTransform'),
13541355
containerTagName: 'svg',
13551356
tagName: 'pattern',
1356-
overrideStringValue: 'translate(-10,-20) scale(2) rotate(45) translate(5,10)',
1357+
overrideStringValue:
1358+
'translate(-10,-20) scale(2) rotate(45) translate(5,10)',
13571359
},
13581360
{
13591361
name: 'patternUnits',
@@ -1940,7 +1942,8 @@ const attributes = [
19401942
read: getSVGProperty('transform'),
19411943
containerTagName: 'svg',
19421944
tagName: 'a',
1943-
overrideStringValue: 'translate(-10,-20) scale(2) rotate(45) translate(5,10)',
1945+
overrideStringValue:
1946+
'translate(-10,-20) scale(2) rotate(45) translate(5,10)',
19441947
},
19451948
{name: 'type', tagName: 'button', overrideStringValue: 'reset'},
19461949
{

‎fixtures/dom/src/components/Fixture.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ class Fixture extends React.Component {
99
render() {
1010
const {children} = this.props;
1111

12-
return (
13-
<div className="test-fixture">
14-
{children}
15-
</div>
16-
);
12+
return <div className="test-fixture">{children}</div>;
1713
}
1814
}
1915

‎fixtures/dom/src/components/Header.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ class Header extends React.Component {
7171
value={this.state.version}
7272
onChange={this.handleVersionChange}>
7373
{this.state.versions.map(version => (
74-
<option key={version} value={version}>{version}</option>
74+
<option key={version} value={version}>
75+
{version}
76+
</option>
7577
))}
7678
</select>
7779
</label>

‎fixtures/dom/src/components/TestCase.js

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -59,60 +59,65 @@ class TestCase extends React.Component {
5959
type="checkbox"
6060
checked={complete}
6161
onChange={this.handleChange}
62-
/>
63-
{' '}{title}
62+
/>{' '}
63+
{title}
6464
</label>
6565
</h2>
6666

6767
<dl className="test-case__details">
6868
{introducedIn && <dt>First broken in: </dt>}
69-
{introducedIn &&
69+
{introducedIn && (
7070
<dd>
7171
<a
7272
href={'https://github.com/facebook/react/tag/v' + introducedIn}>
7373
<code>{introducedIn}</code>
7474
</a>
75-
</dd>}
75+
</dd>
76+
)}
7677

7778
{resolvedIn && <dt>First supported in: </dt>}
78-
{resolvedIn &&
79+
{resolvedIn && (
7980
<dd>
8081
<a href={'https://github.com/facebook/react/tag/v' + resolvedIn}>
8182
<code>{resolvedIn}</code>
8283
</a>
83-
</dd>}
84+
</dd>
85+
)}
8486

8587
{resolvedBy && <dt>Fixed by: </dt>}
86-
{resolvedBy &&
88+
{resolvedBy && (
8789
<dd>
8890
<a
8991
href={
9092
'https://github.com/facebook/react/pull/' +
91-
resolvedBy.slice(1)
93+
resolvedBy.slice(1)
9294
}>
9395
<code>{resolvedBy}</code>
9496
</a>
95-
</dd>}
97+
</dd>
98+
)}
9699

97100
{affectedBrowsers && <dt>Affected browsers: </dt>}
98101
{affectedBrowsers && <dd>{affectedBrowsers}</dd>}
99102

100103
{relatedIssues && <dt>Related Issues: </dt>}
101-
{relatedIssues && <dd><IssueList issues={relatedIssues} /></dd>}
104+
{relatedIssues && (
105+
<dd>
106+
<IssueList issues={relatedIssues} />
107+
</dd>
108+
)}
102109
</dl>
103110

104-
<p className="test-case__desc">
105-
{description}
106-
</p>
111+
<p className="test-case__desc">{description}</p>
107112

108113
<div className="test-case__body">
109-
{!isTestFixed &&
114+
{!isTestFixed && (
110115
<p className="test-case__invalid-version">
111-
<strong>Note:</strong>
112-
{' '}
113-
This test case was fixed in a later version of React.
114-
This test is not expected to pass for the selected version, and that's ok!
115-
</p>}
116+
<strong>Note:</strong> This test case was fixed in a later version
117+
of React. This test is not expected to pass for the selected
118+
version, and that's ok!
119+
</p>
120+
)}
116121

117122
{children}
118123
</div>
@@ -129,9 +134,7 @@ TestCase.Steps = class extends React.Component {
129134
return (
130135
<div>
131136
<h3>Steps to reproduce:</h3>
132-
<ol>
133-
{children}
134-
</ol>
137+
<ol>{children}</ol>
135138
</div>
136139
);
137140
}
@@ -143,9 +146,7 @@ TestCase.ExpectedResult = class extends React.Component {
143146
return (
144147
<div>
145148
<h3>Expected Result:</h3>
146-
<p>
147-
{children}
148-
</p>
149+
<p>{children}</p>
149150
</div>
150151
);
151152
}

‎fixtures/dom/src/components/fixtures/buttons/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ export default class ButtonTestCases extends React.Component {
2020
<TestCase.ExpectedResult>
2121
Nothing should happen
2222
</TestCase.ExpectedResult>
23-
<button disabled onClick={onButtonClick}>Click Me</button>
23+
<button disabled onClick={onButtonClick}>
24+
Click Me
25+
</button>
2426
</TestCase>
2527
<TestCase
2628
title="onClick with disabled buttons containing other elements"

‎fixtures/dom/src/components/fixtures/custom-elements/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ export default class ButtonTestCases extends React.Component {
4242
<TestCase.ExpectedResult>
4343
You should see "Hello, World" printed below.{' '}
4444
</TestCase.ExpectedResult>
45-
{supportsCustomElements
46-
? <my-element />
47-
: <div>
48-
This browser does not support custom elements.
49-
</div>}
45+
{supportsCustomElements ? (
46+
<my-element />
47+
) : (
48+
<div>This browser does not support custom elements.</div>
49+
)}
5050
</TestCase>
5151
</FixtureSet>
5252
);

‎fixtures/dom/src/components/fixtures/date-inputs/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ class DateInputFixtures extends React.Component {
1616
</TestCase.Steps>
1717

1818
<TestCase.ExpectedResult>
19-
The month, day, and year values should correctly
20-
transfer. The hours/minutes/seconds should not be
21-
discarded.
19+
The month, day, and year values should correctly transfer. The
20+
hours/minutes/seconds should not be discarded.
2221
</TestCase.ExpectedResult>
2322

2423
<Fixture>

0 commit comments

Comments
 (0)