From 182521966b2112b0d2a460e326f6376b121c04e4 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Wed, 19 Jun 2019 20:13:06 +0100 Subject: [PATCH 1/2] [Flare] Rename createEventComponent -> createEvent --- packages/react-dom/src/client/ReactDOM.js | 4 ++-- .../__tests__/DOMEventResponderSystem-test.internal.js | 10 ++++------ packages/react-events/README.md | 4 ++-- packages/react-events/src/Drag.js | 2 +- packages/react-events/src/Focus.js | 2 +- packages/react-events/src/FocusScope.js | 5 +---- packages/react-events/src/Hover.js | 2 +- packages/react-events/src/Press.js | 2 +- packages/react-events/src/Scroll.js | 5 +---- packages/react-events/src/Swipe.js | 2 +- 10 files changed, 15 insertions(+), 23 deletions(-) diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index 3bda0cd4825f..85816bb300c2 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -42,7 +42,7 @@ import { } from 'react-reconciler/inline.dom'; import {createPortal as createPortalImpl} from 'shared/ReactPortal'; import {canUseDOM} from 'shared/ExecutionEnvironment'; -import createEventComponent from 'shared/createEventComponent'; +import createEvent from 'shared/createEventComponent'; import {setBatchingImplementation} from 'events/ReactGenericBatching'; import { setRestoreImplementation, @@ -882,7 +882,7 @@ if (enableStableConcurrentModeAPIs) { } if (enableEventAPI) { - ReactDOM.unstable_createEventComponent = createEventComponent; + ReactDOM.unstable_createEvent = createEvent; } const foundDevTools = injectIntoDevTools({ diff --git a/packages/react-dom/src/events/__tests__/DOMEventResponderSystem-test.internal.js b/packages/react-dom/src/events/__tests__/DOMEventResponderSystem-test.internal.js index 07f8828b5375..a26cb243c39d 100644 --- a/packages/react-dom/src/events/__tests__/DOMEventResponderSystem-test.internal.js +++ b/packages/react-dom/src/events/__tests__/DOMEventResponderSystem-test.internal.js @@ -42,12 +42,10 @@ function createReactEventComponent({ allowMultipleHostChildren: allowMultipleHostChildren || false, }; - return { - $$typeof: Symbol.for('react.event_component'), - displayName: 'TestEventComponent', - props: null, - responder: testEventResponder, - }; + return ReactDOM.unstable_createEvent( + testEventResponder, + 'TestEventComponent', + ); } function dispatchEvent(element, type) { diff --git a/packages/react-events/README.md b/packages/react-events/README.md index a56ba0a264a1..0e02720951c4 100644 --- a/packages/react-events/README.md +++ b/packages/react-events/README.md @@ -12,10 +12,10 @@ can be found [here](./docs). ## EventComponent -An Event Component is defined using `React.unstable_createEventComponent`: +An Event Component is defined using `ReactDOM.unstable_createEvent`: ```js -const EventComponent = React.unstable_createEventComponent( +const EventComponent = ReactDOM.unstable_createEvent( responder: EventResponder, displayName: string ); diff --git a/packages/react-events/src/Drag.js b/packages/react-events/src/Drag.js index 68e8be181d41..032e8efc17d5 100644 --- a/packages/react-events/src/Drag.js +++ b/packages/react-events/src/Drag.js @@ -259,4 +259,4 @@ const DragResponder = { }, }; -export default ReactDOM.unstable_createEventComponent(DragResponder, 'Drag'); +export default ReactDOM.unstable_createEvent(DragResponder, 'Drag'); diff --git a/packages/react-events/src/Focus.js b/packages/react-events/src/Focus.js index a0a013e12133..3992ded6a07d 100644 --- a/packages/react-events/src/Focus.js +++ b/packages/react-events/src/Focus.js @@ -336,4 +336,4 @@ const FocusResponder = { }, }; -export default ReactDOM.unstable_createEventComponent(FocusResponder, 'Focus'); +export default ReactDOM.unstable_createEvent(FocusResponder, 'Focus'); diff --git a/packages/react-events/src/FocusScope.js b/packages/react-events/src/FocusScope.js index 668371c110ea..dd9209f2afdf 100644 --- a/packages/react-events/src/FocusScope.js +++ b/packages/react-events/src/FocusScope.js @@ -157,7 +157,4 @@ const FocusScopeResponder = { }, }; -export default ReactDOM.unstable_createEventComponent( - FocusScopeResponder, - 'FocusScope', -); +export default ReactDOM.unstable_createEvent(FocusScopeResponder, 'FocusScope'); diff --git a/packages/react-events/src/Hover.js b/packages/react-events/src/Hover.js index 490061755790..3efab72d13ac 100644 --- a/packages/react-events/src/Hover.js +++ b/packages/react-events/src/Hover.js @@ -406,4 +406,4 @@ const HoverResponder = { }, }; -export default ReactDOM.unstable_createEventComponent(HoverResponder, 'Hover'); +export default ReactDOM.unstable_createEvent(HoverResponder, 'Hover'); diff --git a/packages/react-events/src/Press.js b/packages/react-events/src/Press.js index 4af1a798a76e..1e7431e4340d 100644 --- a/packages/react-events/src/Press.js +++ b/packages/react-events/src/Press.js @@ -956,4 +956,4 @@ const PressResponder = { }, }; -export default ReactDOM.unstable_createEventComponent(PressResponder, 'Press'); +export default ReactDOM.unstable_createEvent(PressResponder, 'Press'); diff --git a/packages/react-events/src/Scroll.js b/packages/react-events/src/Scroll.js index 9d5d53795e3d..27114ba51b8e 100644 --- a/packages/react-events/src/Scroll.js +++ b/packages/react-events/src/Scroll.js @@ -211,7 +211,4 @@ const ScrollResponder = { }, }; -export default ReactDOM.unstable_createEventComponent( - ScrollResponder, - 'Scroll', -); +export default ReactDOM.unstable_createEvent(ScrollResponder, 'Scroll'); diff --git a/packages/react-events/src/Swipe.js b/packages/react-events/src/Swipe.js index 44917e218692..9b6e74370d94 100644 --- a/packages/react-events/src/Swipe.js +++ b/packages/react-events/src/Swipe.js @@ -262,4 +262,4 @@ const SwipeResponder = { }, }; -export default ReactDOM.unstable_createEventComponent(SwipeResponder, 'Swipe'); +export default ReactDOM.unstable_createEvent(SwipeResponder, 'Swipe'); From c262905059db83de3afb560ca38af3d9653b585b Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Wed, 19 Jun 2019 20:19:05 +0100 Subject: [PATCH 2/2] Support Fire build --- packages/react-dom/src/fire/ReactFire.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/react-dom/src/fire/ReactFire.js b/packages/react-dom/src/fire/ReactFire.js index bb74931fdc3e..d0af74edb2ac 100644 --- a/packages/react-dom/src/fire/ReactFire.js +++ b/packages/react-dom/src/fire/ReactFire.js @@ -70,6 +70,7 @@ import invariant from 'shared/invariant'; import lowPriorityWarning from 'shared/lowPriorityWarning'; import warningWithoutStack from 'shared/warningWithoutStack'; import {enableStableConcurrentModeAPIs} from 'shared/ReactFeatureFlags'; +import createEvent from 'shared/createEventComponent'; import { getInstanceFromNode, @@ -86,6 +87,7 @@ import { DOCUMENT_FRAGMENT_NODE, } from '../shared/HTMLNodeType'; import {ROOT_ATTRIBUTE_NAME} from '../shared/DOMProperty'; +import {enableEventAPI} from 'shared/ReactFeatureFlags'; const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner; @@ -883,6 +885,10 @@ if (enableStableConcurrentModeAPIs) { ReactDOM.createSyncRoot = createSyncRoot; } +if (enableEventAPI) { + ReactDOM.unstable_createEvent = createEvent; +} + const foundDevTools = injectIntoDevTools({ findFiberByHostInstance: getClosestInstanceFromNode, bundleType: __DEV__ ? 1 : 0,