[Flare] Move createEvent back to React object (#15943)
Dominic Gannaway committed
Jun 21, 2019 at 10:12 UTC
4f92fbce5cc409436ec7625ac08d3a709a4d8f31
13 files changed
+31
-43
packages/react-dom/src/client/ReactDOM.js
+1
-9
@@ -42,7 +42,6 @@ import {
42
} from 'react-reconciler/inline.dom';
43
import {createPortal as createPortalImpl} from 'shared/ReactPortal';
44
import {canUseDOM} from 'shared/ExecutionEnvironment';
45
-import createEvent from 'shared/createEventComponent';
45
import {setBatchingImplementation} from 'events/ReactGenericBatching';
46
import {
47
setRestoreImplementation,
@@ -64,10 +63,7 @@ import getComponentName from 'shared/getComponentName';
63
import invariant from 'shared/invariant';
64
import lowPriorityWarning from 'shared/lowPriorityWarning';
65
import warningWithoutStack from 'shared/warningWithoutStack';
67
-import {
68
- enableStableConcurrentModeAPIs,
69
- enableEventAPI,
70
-} from 'shared/ReactFeatureFlags';
66
+import {enableStableConcurrentModeAPIs} from 'shared/ReactFeatureFlags';
67
68
import {
69
getInstanceFromNode,
@@ -881,10 +877,6 @@ if (enableStableConcurrentModeAPIs) {
877
ReactDOM.createSyncRoot = createSyncRoot;
878
}
879
884
-if (enableEventAPI) {
885
- ReactDOM.unstable_createEvent = createEvent;
886
-}
887
-
880
const foundDevTools = injectIntoDevTools({
881
findFiberByHostInstance: getClosestInstanceFromNode,
882
bundleType: __DEV__ ? 1 : 0,
packages/react-dom/src/events/__tests__/DOMEventResponderSystem-test.internal.js
+1
-1
@@ -45,7 +45,7 @@ function createReactEventComponent({
45
allowEventHooks: allowEventHooks || true,
46
};
47
48
- return ReactDOM.unstable_createEvent(testEventResponder);
48
+ return React.unstable_createEvent(testEventResponder);
49
}
50
51
const createEvent = (type, data) => {
packages/react-dom/src/fire/ReactFire.js
-6
@@ -70,7 +70,6 @@ import invariant from 'shared/invariant';
70
import lowPriorityWarning from 'shared/lowPriorityWarning';
71
import warningWithoutStack from 'shared/warningWithoutStack';
72
import {enableStableConcurrentModeAPIs} from 'shared/ReactFeatureFlags';
73
-import createEvent from 'shared/createEventComponent';
73
74
import {
75
getInstanceFromNode,
@@ -87,7 +86,6 @@ import {
86
DOCUMENT_FRAGMENT_NODE,
87
} from '../shared/HTMLNodeType';
88
import {ROOT_ATTRIBUTE_NAME} from '../shared/DOMProperty';
90
-import {enableEventAPI} from 'shared/ReactFeatureFlags';
89
90
const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
91
@@ -885,10 +883,6 @@ if (enableStableConcurrentModeAPIs) {
883
ReactDOM.createSyncRoot = createSyncRoot;
884
}
885
888
-if (enableEventAPI) {
889
- ReactDOM.unstable_createEvent = createEvent;
890
-}
891
-
886
const foundDevTools = injectIntoDevTools({
887
findFiberByHostInstance: getClosestInstanceFromNode,
888
bundleType: __DEV__ ? 1 : 0,
packages/react-events/README.md
+2
-2
@@ -12,10 +12,10 @@ can be found [here](./docs).
12
13
## EventComponent
14
15
-An Event Component is defined using `ReactDOM.unstable_createEvent`:
15
+An Event Component is defined using `React.unstable_createEvent`:
16
17
```js
18
-const EventComponent = ReactDOM.unstable_createEvent(
18
+const EventComponent = React.unstable_createEvent(
19
responder: EventResponder,
20
displayName: string
21
);
packages/react-events/src/Drag.js
+2
-2
@@ -13,7 +13,7 @@ import type {
13
} from 'shared/ReactDOMTypes';
14
import type {EventPriority} from 'shared/ReactTypes';
15
16
-import ReactDOM from 'react-dom';
16
+import React from 'react';
17
import {DiscreteEvent, UserBlockingEvent} from 'shared/ReactTypes';
18
19
const targetEventTypes = ['pointerdown'];
@@ -261,4 +261,4 @@ const DragResponder = {
261
},
262
};
263
264
-export default ReactDOM.unstable_createEvent(DragResponder);
264
+export default React.unstable_createEvent(DragResponder);
packages/react-events/src/Focus.js
+2
-2
@@ -13,7 +13,7 @@ import type {
13
PointerType,
14
} from 'shared/ReactDOMTypes';
15
16
-import ReactDOM from 'react-dom';
16
+import React from 'react';
17
import {DiscreteEvent} from 'shared/ReactTypes';
18
19
type FocusProps = {
@@ -338,4 +338,4 @@ const FocusResponder = {
338
},
339
};
340
341
-export default ReactDOM.unstable_createEvent(FocusResponder);
341
+export default React.unstable_createEvent(FocusResponder);
packages/react-events/src/FocusScope.js
+2
-2
@@ -11,7 +11,7 @@ import type {
11
ReactDOMResponderContext,
12
} from 'shared/ReactDOMTypes';
13
14
-import ReactDOM from 'react-dom';
14
+import React from 'react';
15
16
type FocusScopeProps = {
17
autoFocus: Boolean,
@@ -159,4 +159,4 @@ const FocusScopeResponder = {
159
},
160
};
161
162
-export default ReactDOM.unstable_createEvent(FocusScopeResponder);
162
+export default React.unstable_createEvent(FocusScopeResponder);
packages/react-events/src/Hover.js
+2
-2
@@ -12,7 +12,7 @@ import type {
12
ReactDOMResponderContext,
13
} from 'shared/ReactDOMTypes';
14
15
-import ReactDOM from 'react-dom';
15
+import React from 'react';
16
import {UserBlockingEvent} from 'shared/ReactTypes';
17
18
type HoverProps = {
@@ -408,4 +408,4 @@ const HoverResponder = {
408
},
409
};
410
411
-export default ReactDOM.unstable_createEvent(HoverResponder);
411
+export default React.unstable_createEvent(HoverResponder);
packages/react-events/src/Press.js
+2
-2
@@ -14,7 +14,7 @@ import type {
14
} from 'shared/ReactDOMTypes';
15
import type {EventPriority} from 'shared/ReactTypes';
16
17
-import ReactDOM from 'react-dom';
17
+import React from 'react';
18
import {DiscreteEvent, UserBlockingEvent} from 'shared/ReactTypes';
19
20
type PressProps = {
@@ -981,4 +981,4 @@ const PressResponder = {
981
},
982
};
983
984
-export default ReactDOM.unstable_createEvent(PressResponder);
984
+export default React.unstable_createEvent(PressResponder);
packages/react-events/src/Scroll.js
+2
-2
@@ -15,7 +15,7 @@ import type {
15
import {UserBlockingEvent} from 'shared/ReactTypes';
16
import type {EventPriority} from 'shared/ReactTypes';
17
18
-import ReactDOM from 'react-dom';
18
+import React from 'react';
19
20
type ScrollProps = {
21
disabled: boolean,
@@ -213,4 +213,4 @@ const ScrollResponder = {
213
},
214
};
215
216
-export default ReactDOM.unstable_createEvent(ScrollResponder);
216
+export default React.unstable_createEvent(ScrollResponder);
packages/react-events/src/Swipe.js
+2
-2
@@ -13,7 +13,7 @@ import type {
13
} from 'shared/ReactDOMTypes';
14
import type {EventPriority} from 'shared/ReactTypes';
15
16
-import ReactDOM from 'react-dom';
16
+import React from 'react';
17
import {UserBlockingEvent, DiscreteEvent} from 'shared/ReactTypes';
18
19
const targetEventTypes = ['pointerdown'];
@@ -264,4 +264,4 @@ const SwipeResponder = {
264
},
265
};
266
267
-export default ReactDOM.unstable_createEvent(SwipeResponder);
267
+export default React.unstable_createEvent(SwipeResponder);
packages/react/src/React.js
+6
-4
@@ -52,6 +52,7 @@ import {
52
} from './ReactElementValidator';
53
import ReactSharedInternals from './ReactSharedInternals';
54
import {error, warn} from './withComponentStack';
55
+import createEvent from 'shared/createEventComponent';
56
import {enableJSXTransformAPI, enableEventAPI} from 'shared/ReactFeatureFlags';
57
const React = {
58
Children: {
@@ -103,6 +104,11 @@ const React = {
104
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: ReactSharedInternals,
105
};
106
107
+if (enableEventAPI) {
108
+ React.unstable_createEvent = createEvent;
109
+ React.unstable_useEvent = useEvent;
110
+}
111
+
112
// Note: some APIs are added with feature flags.
113
// Make sure that stable builds for open source
114
// don't modify the React object to avoid deopts.
@@ -121,8 +127,4 @@ if (enableJSXTransformAPI) {
127
}
128
}
129
124
-if (enableEventAPI) {
125
- React.unstable_useEvent = useEvent;
126
-}
127
-
130
export default React;
scripts/rollup/bundles.js
+7
-7
@@ -465,7 +465,7 @@ const bundles = [
465
moduleType: NON_FIBER_RENDERER,
466
entry: 'react-events/press',
467
global: 'ReactEventsPress',
468
- externals: ['react-dom'],
468
+ externals: ['react'],
469
},
470
471
{
@@ -480,7 +480,7 @@ const bundles = [
480
moduleType: NON_FIBER_RENDERER,
481
entry: 'react-events/hover',
482
global: 'ReactEventsHover',
483
- externals: ['react-dom'],
483
+ externals: ['react'],
484
},
485
486
{
@@ -495,7 +495,7 @@ const bundles = [
495
moduleType: NON_FIBER_RENDERER,
496
entry: 'react-events/focus',
497
global: 'ReactEventsFocus',
498
- externals: ['react-dom'],
498
+ externals: ['react'],
499
},
500
501
{
@@ -510,7 +510,7 @@ const bundles = [
510
moduleType: NON_FIBER_RENDERER,
511
entry: 'react-events/focus-scope',
512
global: 'ReactEventsFocusScope',
513
- externals: ['react-dom'],
513
+ externals: ['react'],
514
},
515
516
{
@@ -525,7 +525,7 @@ const bundles = [
525
moduleType: NON_FIBER_RENDERER,
526
entry: 'react-events/swipe',
527
global: 'ReactEventsSwipe',
528
- externals: ['react-dom'],
528
+ externals: ['react'],
529
},
530
531
{
@@ -540,7 +540,7 @@ const bundles = [
540
moduleType: NON_FIBER_RENDERER,
541
entry: 'react-events/drag',
542
global: 'ReactEventsDrag',
543
- externals: ['react-dom'],
543
+ externals: ['react'],
544
},
545
546
{
@@ -555,7 +555,7 @@ const bundles = [
555
moduleType: NON_FIBER_RENDERER,
556
entry: 'react-events/scroll',
557
global: 'ReactEventsScroll',
558
- externals: ['react-dom'],
558
+ externals: ['react'],
559
},
560
];
561