Skip to content

[Flare] Move createEvent back to React object #15943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trueadm merged 3 commits into from
Jun 21, 2019
Merged

[Flare] Move createEvent back to React object #15943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa68cb4
[Flare] Move createEvent back to React object
trueadm Jun 21, 2019
aa7bc1c
Update bundles
trueadm Jun 21, 2019
d2dea53
Fix conflicts
trueadm Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions packages/react-dom/src/client/ReactDOM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import {
} from 'react-reconciler/inline.dom';
import {createPortal as createPortalImpl} from 'shared/ReactPortal';
import {canUseDOM} from 'shared/ExecutionEnvironment';
import createEvent from 'shared/createEventComponent';
import {setBatchingImplementation} from 'events/ReactGenericBatching';
import {
setRestoreImplementation,
Expand All @@ -64,10 +63,7 @@ import getComponentName from 'shared/getComponentName';
import invariant from 'shared/invariant';
import lowPriorityWarning from 'shared/lowPriorityWarning';
import warningWithoutStack from 'shared/warningWithoutStack';
import {
enableStableConcurrentModeAPIs,
enableEventAPI,
} from 'shared/ReactFeatureFlags';
import {enableStableConcurrentModeAPIs} from 'shared/ReactFeatureFlags';

import {
getInstanceFromNode,
Expand Down Expand Up @@ -881,10 +877,6 @@ if (enableStableConcurrentModeAPIs) {
ReactDOM.createSyncRoot = createSyncRoot;
}

if (enableEventAPI) {
ReactDOM.unstable_createEvent = createEvent;
}

const foundDevTools = injectIntoDevTools({
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: __DEV__ ? 1 : 0,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-dom/src/events/__tests__/DOMEventResponderSystem-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function createReactEventComponent({
allowEventHooks: allowEventHooks || true,
};

return ReactDOM.unstable_createEvent(testEventResponder);
return React.unstable_createEvent(testEventResponder);
}

const createEvent = (type, data) => {
Expand Down
6 changes: 0 additions & 6 deletions packages/react-dom/src/fire/ReactFire.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ 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,
Expand All @@ -87,7 +86,6 @@ import {
DOCUMENT_FRAGMENT_NODE,
} from '../shared/HTMLNodeType';
import {ROOT_ATTRIBUTE_NAME} from '../shared/DOMProperty';
import {enableEventAPI} from 'shared/ReactFeatureFlags';

const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;

Expand Down Expand Up @@ -885,10 +883,6 @@ if (enableStableConcurrentModeAPIs) {
ReactDOM.createSyncRoot = createSyncRoot;
}

if (enableEventAPI) {
ReactDOM.unstable_createEvent = createEvent;
}

const foundDevTools = injectIntoDevTools({
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: __DEV__ ? 1 : 0,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-events/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ can be found [here](./docs).

## EventComponent

An Event Component is defined using `ReactDOM.unstable_createEvent`:
An Event Component is defined using `React.unstable_createEvent`:

```js
const EventComponent = ReactDOM.unstable_createEvent(
const EventComponent = React.unstable_createEvent(
responder: EventResponder,
displayName: string
);
Expand Down
4 changes: 2 additions & 2 deletions packages/react-events/src/Drag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
} from 'shared/ReactDOMTypes';
import type {EventPriority} from 'shared/ReactTypes';

import ReactDOM from 'react-dom';
import React from 'react';
import {DiscreteEvent, UserBlockingEvent} from 'shared/ReactTypes';

const targetEventTypes = ['pointerdown'];
Expand Down Expand Up @@ -261,4 +261,4 @@ const DragResponder = {
},
};

export default ReactDOM.unstable_createEvent(DragResponder);
export default React.unstable_createEvent(DragResponder);
4 changes: 2 additions & 2 deletions packages/react-events/src/Focus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
PointerType,
} from 'shared/ReactDOMTypes';

import ReactDOM from 'react-dom';
import React from 'react';
import {DiscreteEvent} from 'shared/ReactTypes';

type FocusProps = {
Expand Down Expand Up @@ -338,4 +338,4 @@ const FocusResponder = {
},
};

export default ReactDOM.unstable_createEvent(FocusResponder);
export default React.unstable_createEvent(FocusResponder);
4 changes: 2 additions & 2 deletions packages/react-events/src/FocusScope.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type {
ReactDOMResponderContext,
} from 'shared/ReactDOMTypes';

import ReactDOM from 'react-dom';
import React from 'react';

type FocusScopeProps = {
autoFocus: Boolean,
Expand Down Expand Up @@ -159,4 +159,4 @@ const FocusScopeResponder = {
},
};

export default ReactDOM.unstable_createEvent(FocusScopeResponder);
export default React.unstable_createEvent(FocusScopeResponder);
4 changes: 2 additions & 2 deletions packages/react-events/src/Hover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {
ReactDOMResponderContext,
} from 'shared/ReactDOMTypes';

import ReactDOM from 'react-dom';
import React from 'react';
import {UserBlockingEvent} from 'shared/ReactTypes';

type HoverProps = {
Expand Down Expand Up @@ -408,4 +408,4 @@ const HoverResponder = {
},
};

export default ReactDOM.unstable_createEvent(HoverResponder);
export default React.unstable_createEvent(HoverResponder);
4 changes: 2 additions & 2 deletions packages/react-events/src/Press.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type {
} from 'shared/ReactDOMTypes';
import type {EventPriority} from 'shared/ReactTypes';

import ReactDOM from 'react-dom';
import React from 'react';
import {DiscreteEvent, UserBlockingEvent} from 'shared/ReactTypes';

type PressProps = {
Expand Down Expand Up @@ -981,4 +981,4 @@ const PressResponder = {
},
};

export default ReactDOM.unstable_createEvent(PressResponder);
export default React.unstable_createEvent(PressResponder);
4 changes: 2 additions & 2 deletions packages/react-events/src/Scroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import type {
import {UserBlockingEvent} from 'shared/ReactTypes';
import type {EventPriority} from 'shared/ReactTypes';

import ReactDOM from 'react-dom';
import React from 'react';

type ScrollProps = {
disabled: boolean,
Expand Down Expand Up @@ -213,4 +213,4 @@ const ScrollResponder = {
},
};

export default ReactDOM.unstable_createEvent(ScrollResponder);
export default React.unstable_createEvent(ScrollResponder);
4 changes: 2 additions & 2 deletions packages/react-events/src/Swipe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
} from 'shared/ReactDOMTypes';
import type {EventPriority} from 'shared/ReactTypes';

import ReactDOM from 'react-dom';
import React from 'react';
import {UserBlockingEvent, DiscreteEvent} from 'shared/ReactTypes';

const targetEventTypes = ['pointerdown'];
Expand Down Expand Up @@ -264,4 +264,4 @@ const SwipeResponder = {
},
};

export default ReactDOM.unstable_createEvent(SwipeResponder);
export default React.unstable_createEvent(SwipeResponder);
10 changes: 6 additions & 4 deletions packages/react/src/React.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import {
} from './ReactElementValidator';
import ReactSharedInternals from './ReactSharedInternals';
import {error, warn} from './withComponentStack';
import createEvent from 'shared/createEventComponent';
import {enableJSXTransformAPI, enableEventAPI} from 'shared/ReactFeatureFlags';
const React = {
Children: {
Expand Down Expand Up @@ -103,6 +104,11 @@ const React = {
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: ReactSharedInternals,
};

if (enableEventAPI) {
React.unstable_createEvent = createEvent;
React.unstable_useEvent = useEvent;
}

// Note: some APIs are added with feature flags.
// Make sure that stable builds for open source
// don't modify the React object to avoid deopts.
Expand All @@ -121,8 +127,4 @@ if (enableJSXTransformAPI) {
}
}

if (enableEventAPI) {
React.unstable_useEvent = useEvent;
}

export default React;
14 changes: 7 additions & 7 deletions scripts/rollup/bundles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ const bundles = [
moduleType: NON_FIBER_RENDERER,
entry: 'react-events/press',
global: 'ReactEventsPress',
externals: ['react-dom'],
externals: ['react'],
},

{
Expand All @@ -480,7 +480,7 @@ const bundles = [
moduleType: NON_FIBER_RENDERER,
entry: 'react-events/hover',
global: 'ReactEventsHover',
externals: ['react-dom'],
externals: ['react'],
},

{
Expand All @@ -495,7 +495,7 @@ const bundles = [
moduleType: NON_FIBER_RENDERER,
entry: 'react-events/focus',
global: 'ReactEventsFocus',
externals: ['react-dom'],
externals: ['react'],
},

{
Expand All @@ -510,7 +510,7 @@ const bundles = [
moduleType: NON_FIBER_RENDERER,
entry: 'react-events/focus-scope',
global: 'ReactEventsFocusScope',
externals: ['react-dom'],
externals: ['react'],
},

{
Expand All @@ -525,7 +525,7 @@ const bundles = [
moduleType: NON_FIBER_RENDERER,
entry: 'react-events/swipe',
global: 'ReactEventsSwipe',
externals: ['react-dom'],
externals: ['react'],
},

{
Expand All @@ -540,7 +540,7 @@ const bundles = [
moduleType: NON_FIBER_RENDERER,
entry: 'react-events/drag',
global: 'ReactEventsDrag',
externals: ['react-dom'],
externals: ['react'],
},

{
Expand All @@ -555,7 +555,7 @@ const bundles = [
moduleType: NON_FIBER_RENDERER,
entry: 'react-events/scroll',
global: 'ReactEventsScroll',
externals: ['react-dom'],
externals: ['react'],
},
];

Expand Down