Skip to content

Commit 66ad2e6

Browse files
committed
Merge branch 'master' into rh-ff-update-lane-2
# Conflicts: # packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js # packages/react-dom/src/events/ReactDOMEventListener.js
2 parents caceeca + e67a6b1 commit 66ad2e6

File tree

164 files changed

+7582
-15427
lines changed

Some content is hidden

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

164 files changed

+7582
-15427
lines changed

.mailmap

+2
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ Rainer Oviir <roviir@gmail.com> <raineroviir@rainers-MacBook-Pro.local>
127127
Ray <ray@tomo.im>
128128
Richard Feldman <richard.t.feldman@gmail.com> <richard@noredink.com>
129129
Richard Livesey <Livesey7@hotmail.co.uk>
130+
Rick Hanlon <rickhanlonii@gmail.com>
131+
Rick Hanlon <rickhanlonii@gmail.com> <rickhanlonii@fb.com>
130132
Rob Arnold <robarnold@cs.cmu.edu>
131133
Robert Binna <rbinna@gmail.com> <speedskater@users.noreply.github.com>
132134
Robin Frischmann <robin@rofrischmann.de>

fixtures/art/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"devDependencies": {
3-
"babel-core": "^6.24.0",
4-
"babel-loader": "^6.4.1",
5-
"babel-plugin-transform-class-properties": "^6.24.1",
6-
"babel-preset-es2015": "^6.6.0",
7-
"babel-preset-react": "^6.5.0",
3+
"@babel/core": "^7.10.5",
4+
"@babel/plugin-proposal-class-properties": "^7.10.4",
5+
"@babel/preset-env": "^7.10.4",
6+
"@babel/preset-react": "^7.10.4",
7+
"babel-loader": "^8.1.0",
88
"react": "link:../../build/node_modules/react",
99
"react-art": "link:../../build/node_modules/react-art/",
1010
"react-dom": "link:../../build/node_modules/react-dom",

fixtures/art/webpack.config.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
var webpack = require('webpack');
2-
var path = require('path');
32

43
module.exports = {
54
context: __dirname,
@@ -12,10 +11,10 @@ module.exports = {
1211
exclude: /node_modules/,
1312
query: {
1413
presets: [
15-
require.resolve('babel-preset-es2015'),
16-
require.resolve('babel-preset-react'),
14+
require.resolve('@babel/preset-env'),
15+
require.resolve('@babel/preset-react'),
1716
],
18-
plugins: [require.resolve('babel-plugin-transform-class-properties')],
17+
plugins: [require.resolve('@babel/plugin-proposal-class-properties')],
1918
},
2019
},
2120
],

fixtures/art/yarn.lock

+1,388-800
Large diffs are not rendered by default.

fixtures/attribute-behavior/AttributeTableSnapshot.md

+25
Original file line numberDiff line numberDiff line change
@@ -3223,6 +3223,31 @@
32233223
| `end=(null)`| (initial)| `<null>` |
32243224
| `end=(undefined)`| (initial)| `<null>` |
32253225

3226+
## `enterKeyHint` (on `<input>` inside `<div>`)
3227+
| Test Case | Flags | Result |
3228+
| --- | --- | --- |
3229+
| `enterKeyHint=(string)`| (initial)| `<empty string>` |
3230+
| `enterKeyHint=(empty string)`| (initial)| `<empty string>` |
3231+
| `enterKeyHint=(array with string)`| (initial)| `<empty string>` |
3232+
| `enterKeyHint=(empty array)`| (initial)| `<empty string>` |
3233+
| `enterKeyHint=(object)`| (initial)| `<empty string>` |
3234+
| `enterKeyHint=(numeric string)`| (initial)| `<empty string>` |
3235+
| `enterKeyHint=(-1)`| (initial)| `<empty string>` |
3236+
| `enterKeyHint=(0)`| (initial)| `<empty string>` |
3237+
| `enterKeyHint=(integer)`| (initial)| `<empty string>` |
3238+
| `enterKeyHint=(NaN)`| (initial, warning)| `<empty string>` |
3239+
| `enterKeyHint=(float)`| (initial)| `<empty string>` |
3240+
| `enterKeyHint=(true)`| (initial, warning)| `<empty string>` |
3241+
| `enterKeyHint=(false)`| (initial, warning)| `<empty string>` |
3242+
| `enterKeyHint=(string 'true')`| (initial)| `<empty string>` |
3243+
| `enterKeyHint=(string 'false')`| (initial)| `<empty string>` |
3244+
| `enterKeyHint=(string 'on')`| (initial)| `<empty string>` |
3245+
| `enterKeyHint=(string 'off')`| (initial)| `<empty string>` |
3246+
| `enterKeyHint=(symbol)`| (initial, warning)| `<empty string>` |
3247+
| `enterKeyHint=(function)`| (initial, warning)| `<empty string>` |
3248+
| `enterKeyHint=(null)`| (initial)| `<empty string>` |
3249+
| `enterKeyHint=(undefined)`| (initial)| `<empty string>` |
3250+
32263251
## `exponent` (on `<feFuncA>` inside `<svg>`)
32273252
| Test Case | Flags | Result |
32283253
| --- | --- | --- |

fixtures/attribute-behavior/src/attributes.js

+5
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,11 @@ const attributes = [
556556
tagName: 'animate',
557557
read: getSVGAttribute('end'),
558558
},
559+
{
560+
name: 'enterKeyHint',
561+
tagName: 'input',
562+
read: getProperty('enterKeyHint'),
563+
},
559564
{
560565
name: 'exponent',
561566
read: getSVGProperty('exponent'),

packages/react-art/src/ReactARTHostConfig.js

-20
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ import Mode from 'art/modes/current';
1010
import invariant from 'shared/invariant';
1111

1212
import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
13-
import type {
14-
ReactEventResponder,
15-
ReactEventResponderInstance,
16-
} from 'shared/ReactTypes';
1713

1814
const pooledTransform = new Transform();
1915

@@ -429,22 +425,6 @@ export function clearContainer(container) {
429425
// TODO Implement this
430426
}
431427

432-
export function DEPRECATED_mountResponderInstance(
433-
responder: ReactEventResponder<any, any>,
434-
responderInstance: ReactEventResponderInstance<any, any>,
435-
props: Object,
436-
state: Object,
437-
instance: Object,
438-
) {
439-
throw new Error('Not yet implemented.');
440-
}
441-
442-
export function DEPRECATED_unmountResponderInstance(
443-
responderInstance: ReactEventResponderInstance<any, any>,
444-
): void {
445-
throw new Error('Not yet implemented.');
446-
}
447-
448428
export function getFundamentalComponentInstance(fundamentalInstance) {
449429
throw new Error('Not yet implemented.');
450430
}

packages/react-debug-tools/src/ReactDebugHooks.js

-29
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import type {
1313
MutableSourceSubscribeFn,
1414
ReactContext,
1515
ReactProviderType,
16-
ReactEventResponder,
17-
ReactEventResponderListener,
1816
} from 'shared/ReactTypes';
1917
import type {
2018
Fiber,
@@ -86,16 +84,6 @@ function getPrimitiveStackCache(): Map<string, Array<any>> {
8684
Dispatcher.useDebugValue(null);
8785
Dispatcher.useCallback(() => {});
8886
Dispatcher.useMemo(() => null);
89-
Dispatcher.useMutableSource(
90-
{
91-
_source: {},
92-
_getVersion: () => 1,
93-
_workInProgressVersionPrimary: null,
94-
_workInProgressVersionSecondary: null,
95-
},
96-
() => null,
97-
() => () => {},
98-
);
9987
} finally {
10088
readHookLog = hookLog;
10189
hookLog = [];
@@ -270,22 +258,6 @@ function useMutableSource<Source, Snapshot>(
270258
return value;
271259
}
272260

273-
function useResponder(
274-
responder: ReactEventResponder<any, any>,
275-
listenerProps: Object,
276-
): ReactEventResponderListener<any, any> {
277-
// Don't put the actual event responder object in, just its displayName
278-
const value = {
279-
responder: responder.displayName || 'EventResponder',
280-
props: listenerProps,
281-
};
282-
hookLog.push({primitive: 'Responder', stackError: new Error(), value});
283-
return {
284-
responder,
285-
props: listenerProps,
286-
};
287-
}
288-
289261
function useTransition(
290262
config: SuspenseConfig | null | void,
291263
): [(() => void) => void, boolean] {
@@ -345,7 +317,6 @@ const Dispatcher: DispatcherType = {
345317
useReducer,
346318
useRef,
347319
useState,
348-
useResponder,
349320
useTransition,
350321
useMutableSource,
351322
useDeferredValue,

packages/react-debug-tools/src/__tests__/ReactHooksInspection-test.internal.js

-46
This file was deleted.

packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -848,9 +848,9 @@ describe('ReactHooksInspectionIntegration', () => {
848848

849849
if (__EXPERIMENTAL__) {
850850
it('should support composite useMutableSource hook', () => {
851-
const mutableSource = React.createMutableSource({}, () => 1);
851+
const mutableSource = React.unstable_createMutableSource({}, () => 1);
852852
function Foo(props) {
853-
React.useMutableSource(
853+
React.unstable_useMutableSource(
854854
mutableSource,
855855
() => 'snapshot',
856856
() => {},

packages/react-devtools-shared/src/backend/ReactSymbols.js

-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ export const PROFILER_SYMBOL_STRING = 'Symbol(react.profiler)';
5858
export const PROVIDER_NUMBER = 0xeacd;
5959
export const PROVIDER_SYMBOL_STRING = 'Symbol(react.provider)';
6060

61-
export const RESPONDER_NUMBER = 0xead6;
62-
export const RESPONDER_SYMBOL_STRING = 'Symbol(react.responder)';
63-
6461
export const SCOPE_NUMBER = 0xead7;
6562
export const SCOPE_SYMBOL_STRING = 'Symbol(react.scope)';
6663

0 commit comments

Comments
 (0)