Skip to content

Commit

Permalink
Merge branch 'master' into rh-ff-update-lane-2
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js
#	packages/react-dom/src/events/ReactDOMEventListener.js
  • Loading branch information
rickhanlonii committed Aug 6, 2020
2 parents caceeca + e67a6b1 commit 66ad2e6
Show file tree
Hide file tree
Showing 164 changed files with 7,582 additions and 15,427 deletions.
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ Rainer Oviir <roviir@gmail.com> <raineroviir@rainers-MacBook-Pro.local>
Ray <ray@tomo.im>
Richard Feldman <richard.t.feldman@gmail.com> <richard@noredink.com>
Richard Livesey <Livesey7@hotmail.co.uk>
Rick Hanlon <rickhanlonii@gmail.com>
Rick Hanlon <rickhanlonii@gmail.com> <rickhanlonii@fb.com>
Rob Arnold <robarnold@cs.cmu.edu>
Robert Binna <rbinna@gmail.com> <speedskater@users.noreply.github.com>
Robin Frischmann <robin@rofrischmann.de>
Expand Down
10 changes: 5 additions & 5 deletions fixtures/art/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"devDependencies": {
"babel-core": "^6.24.0",
"babel-loader": "^6.4.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"@babel/core": "^7.10.5",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"@babel/preset-react": "^7.10.4",
"babel-loader": "^8.1.0",
"react": "link:../../build/node_modules/react",
"react-art": "link:../../build/node_modules/react-art/",
"react-dom": "link:../../build/node_modules/react-dom",
Expand Down
7 changes: 3 additions & 4 deletions fixtures/art/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var webpack = require('webpack');
var path = require('path');

module.exports = {
context: __dirname,
Expand All @@ -12,10 +11,10 @@ module.exports = {
exclude: /node_modules/,
query: {
presets: [
require.resolve('babel-preset-es2015'),
require.resolve('babel-preset-react'),
require.resolve('@babel/preset-env'),
require.resolve('@babel/preset-react'),
],
plugins: [require.resolve('babel-plugin-transform-class-properties')],
plugins: [require.resolve('@babel/plugin-proposal-class-properties')],
},
},
],
Expand Down
2,188 changes: 1,388 additions & 800 deletions fixtures/art/yarn.lock

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions fixtures/attribute-behavior/AttributeTableSnapshot.md
Original file line number Diff line number Diff line change
Expand Up @@ -3223,6 +3223,31 @@
| `end=(null)`| (initial)| `<null>` |
| `end=(undefined)`| (initial)| `<null>` |

## `enterKeyHint` (on `<input>` inside `<div>`)
| Test Case | Flags | Result |
| --- | --- | --- |
| `enterKeyHint=(string)`| (initial)| `<empty string>` |
| `enterKeyHint=(empty string)`| (initial)| `<empty string>` |
| `enterKeyHint=(array with string)`| (initial)| `<empty string>` |
| `enterKeyHint=(empty array)`| (initial)| `<empty string>` |
| `enterKeyHint=(object)`| (initial)| `<empty string>` |
| `enterKeyHint=(numeric string)`| (initial)| `<empty string>` |
| `enterKeyHint=(-1)`| (initial)| `<empty string>` |
| `enterKeyHint=(0)`| (initial)| `<empty string>` |
| `enterKeyHint=(integer)`| (initial)| `<empty string>` |
| `enterKeyHint=(NaN)`| (initial, warning)| `<empty string>` |
| `enterKeyHint=(float)`| (initial)| `<empty string>` |
| `enterKeyHint=(true)`| (initial, warning)| `<empty string>` |
| `enterKeyHint=(false)`| (initial, warning)| `<empty string>` |
| `enterKeyHint=(string 'true')`| (initial)| `<empty string>` |
| `enterKeyHint=(string 'false')`| (initial)| `<empty string>` |
| `enterKeyHint=(string 'on')`| (initial)| `<empty string>` |
| `enterKeyHint=(string 'off')`| (initial)| `<empty string>` |
| `enterKeyHint=(symbol)`| (initial, warning)| `<empty string>` |
| `enterKeyHint=(function)`| (initial, warning)| `<empty string>` |
| `enterKeyHint=(null)`| (initial)| `<empty string>` |
| `enterKeyHint=(undefined)`| (initial)| `<empty string>` |

## `exponent` (on `<feFuncA>` inside `<svg>`)
| Test Case | Flags | Result |
| --- | --- | --- |
Expand Down
5 changes: 5 additions & 0 deletions fixtures/attribute-behavior/src/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,11 @@ const attributes = [
tagName: 'animate',
read: getSVGAttribute('end'),
},
{
name: 'enterKeyHint',
tagName: 'input',
read: getProperty('enterKeyHint'),
},
{
name: 'exponent',
read: getSVGProperty('exponent'),
Expand Down
20 changes: 0 additions & 20 deletions packages/react-art/src/ReactARTHostConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import Mode from 'art/modes/current';
import invariant from 'shared/invariant';

import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
import type {
ReactEventResponder,
ReactEventResponderInstance,
} from 'shared/ReactTypes';

const pooledTransform = new Transform();

Expand Down Expand Up @@ -429,22 +425,6 @@ export function clearContainer(container) {
// TODO Implement this
}

export function DEPRECATED_mountResponderInstance(
responder: ReactEventResponder<any, any>,
responderInstance: ReactEventResponderInstance<any, any>,
props: Object,
state: Object,
instance: Object,
) {
throw new Error('Not yet implemented.');
}

export function DEPRECATED_unmountResponderInstance(
responderInstance: ReactEventResponderInstance<any, any>,
): void {
throw new Error('Not yet implemented.');
}

export function getFundamentalComponentInstance(fundamentalInstance) {
throw new Error('Not yet implemented.');
}
Expand Down
29 changes: 0 additions & 29 deletions packages/react-debug-tools/src/ReactDebugHooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import type {
MutableSourceSubscribeFn,
ReactContext,
ReactProviderType,
ReactEventResponder,
ReactEventResponderListener,
} from 'shared/ReactTypes';
import type {
Fiber,
Expand Down Expand Up @@ -86,16 +84,6 @@ function getPrimitiveStackCache(): Map<string, Array<any>> {
Dispatcher.useDebugValue(null);
Dispatcher.useCallback(() => {});
Dispatcher.useMemo(() => null);
Dispatcher.useMutableSource(
{
_source: {},
_getVersion: () => 1,
_workInProgressVersionPrimary: null,
_workInProgressVersionSecondary: null,
},
() => null,
() => () => {},
);
} finally {
readHookLog = hookLog;
hookLog = [];
Expand Down Expand Up @@ -270,22 +258,6 @@ function useMutableSource<Source, Snapshot>(
return value;
}

function useResponder(
responder: ReactEventResponder<any, any>,
listenerProps: Object,
): ReactEventResponderListener<any, any> {
// Don't put the actual event responder object in, just its displayName
const value = {
responder: responder.displayName || 'EventResponder',
props: listenerProps,
};
hookLog.push({primitive: 'Responder', stackError: new Error(), value});
return {
responder,
props: listenerProps,
};
}

function useTransition(
config: SuspenseConfig | null | void,
): [(() => void) => void, boolean] {
Expand Down Expand Up @@ -345,7 +317,6 @@ const Dispatcher: DispatcherType = {
useReducer,
useRef,
useState,
useResponder,
useTransition,
useMutableSource,
useDeferredValue,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -848,9 +848,9 @@ describe('ReactHooksInspectionIntegration', () => {

if (__EXPERIMENTAL__) {
it('should support composite useMutableSource hook', () => {
const mutableSource = React.createMutableSource({}, () => 1);
const mutableSource = React.unstable_createMutableSource({}, () => 1);
function Foo(props) {
React.useMutableSource(
React.unstable_useMutableSource(
mutableSource,
() => 'snapshot',
() => {},
Expand Down
3 changes: 0 additions & 3 deletions packages/react-devtools-shared/src/backend/ReactSymbols.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ export const PROFILER_SYMBOL_STRING = 'Symbol(react.profiler)';
export const PROVIDER_NUMBER = 0xeacd;
export const PROVIDER_SYMBOL_STRING = 'Symbol(react.provider)';

export const RESPONDER_NUMBER = 0xead6;
export const RESPONDER_SYMBOL_STRING = 'Symbol(react.responder)';

export const SCOPE_NUMBER = 0xead7;
export const SCOPE_SYMBOL_STRING = 'Symbol(react.scope)';

Expand Down
Loading

0 comments on commit 66ad2e6

Please sign in to comment.