Skip to content

Commit 9548c1c

Browse files
Merge remote-tracking branch 'origin/master' into pointer-events
# Conflicts: # scripts/rollup/results.json
2 parents da440d7 + 5dfbfe9 commit 9548c1c

File tree

58 files changed

+1114
-1033
lines changed

Some content is hidden

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

58 files changed

+1114
-1033
lines changed

dangerfile.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,12 @@ function git(args) {
117117
previousBuildResults
118118
);
119119

120-
const percentToWarrentShowing = 1;
121120
const packagesToShow = results
122121
.filter(
123122
r =>
124-
Math.abs(r.prevFileSizeChange) >= percentToWarrentShowing ||
125-
Math.abs(r.prevGzipSizeChange) >= percentToWarrentShowing
123+
Math.abs(r.prevFileSizeAbsoluteChange) >= 300 || // bytes
124+
Math.abs(r.prevGzipSizeAbsoluteChange) >= 100 // bytes
126125
)
127-
128126
.map(r => r.packageName);
129127

130128
if (packagesToShow.length) {

packages/react-dom/src/__tests__/findDOMNode-test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ describe('findDOMNode', () => {
6565
it('findDOMNode should reject random objects', () => {
6666
expect(function() {
6767
ReactDOM.findDOMNode({foo: 'bar'});
68-
}).toThrowError(
69-
'Element appears to be neither ReactComponent nor DOMNode. Keys: foo',
70-
);
68+
}).toThrowError('Argument appears to not be a ReactComponent. Keys: foo');
7169
});
7270

7371
it('findDOMNode should reject unmounted objects with render func', () => {

packages/react-dom/src/client/ReactDOM.js

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,20 +1147,7 @@ const ReactDOM: Object = {
11471147
return (componentOrElement: any);
11481148
}
11491149

1150-
const inst = ReactInstanceMap.get(componentOrElement);
1151-
if (inst) {
1152-
return DOMRenderer.findHostInstance(inst);
1153-
}
1154-
1155-
if (typeof componentOrElement.render === 'function') {
1156-
invariant(false, 'Unable to find node on an unmounted component.');
1157-
} else {
1158-
invariant(
1159-
false,
1160-
'Element appears to be neither ReactComponent nor DOMNode. Keys: %s',
1161-
Object.keys(componentOrElement),
1162-
);
1163-
}
1150+
return DOMRenderer.findHostInstance(componentOrElement);
11641151
},
11651152

11661153
hydrate(element: React$Node, container: DOMContainer, callback: ?Function) {

0 commit comments

Comments
 (0)