{"body":"","parents":["039ad34a059981b1ba972e205cea8347462cf492"],"files":[{"status":"M","path":"packages\/react-art\/src\/ReactARTHostConfig.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOMComponentTree.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOMHostConfig.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/DOMEventProperties.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/EventSystemFlags.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js"},{"status":"M","path":"packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js"},{"status":"M","path":"packages\/react-dom\/src\/shared\/ReactDOMTypes.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactFabricHostConfig.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeHostConfig.js"},{"status":"M","path":"packages\/react-noop-renderer\/src\/createReactNoop.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberCommitWork.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberCommitWork.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHostConfigWithNoScopes.js"},{"status":"M","path":"packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js"},{"status":"M","path":"packages\/react-test-renderer\/src\/ReactTestHostConfig.js"},{"status":"M","path":"packages\/shared\/ReactFeatureFlags.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.testing.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.testing.www.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.www.js"}],"patch":"diff --git a\/packages\/react-art\/src\/ReactARTHostConfig.js b\/packages\/react-art\/src\/ReactARTHostConfig.js\nindex ed2922d5c2..d8864397b7 100644\n--- a\/packages\/react-art\/src\/ReactARTHostConfig.js\n+++ b\/packages\/react-art\/src\/ReactARTHostConfig.js\n@@ -473,7 +473,7 @@ export function getInstanceFromNode(node) {\n throw new Error('Not yet implemented.');\n }\n \n-export function beforeRemoveInstance(instance) {\n+export function removeInstanceEventHandles(instance) {\n \/\/ noop\n }\n \ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js b\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\nindex c458093a83..bb841b7856 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMComponentTree.js\n@@ -9,6 +9,7 @@\n \n import type {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n import type {ReactScopeInstance} from 'shared\/ReactTypes';\n+import type {ReactDOMEventHandleListener} from '..\/shared\/ReactDOMTypes';\n import type {\n Container,\n TextInstance,\n@@ -37,6 +38,7 @@ const internalInstanceKey = '__reactFiber$' + randomKey;\n const internalPropsKey = '__reactProps$' + randomKey;\n const internalContainerInstanceKey = '__reactContainer$' + randomKey;\n const internalEventHandlersKey = '__reactEvents$' + randomKey;\n+const internalEventHandlerListenersKey = '__reactListeners$' + randomKey;\n \n export type ElementListenerMap = Map<\n DOMTopLevelEventType | string,\n@@ -217,3 +219,16 @@ export function getFiberFromScopeInstance(\n }\n return null;\n }\n+\n+export function setEventHandlerListeners(\n+ scope: EventTarget | ReactScopeInstance,\n+ listeners: Set,\n+): void {\n+ (scope: any)[internalEventHandlerListenersKey] = listeners;\n+}\n+\n+export function getEventHandlerListeners(\n+ scope: EventTarget | ReactScopeInstance,\n+): null | Set {\n+ return (scope: any)[internalEventHandlerListenersKey] || null;\n+}\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\nindex 73291003e5..9ce395eb36 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMHostConfig.js\n@@ -77,6 +77,7 @@ import {\n enableFundamentalAPI,\n enableModernEventSystem,\n enableScopeAPI,\n+ enableCreateEventHandleAPI,\n } from 'shared\/ReactFeatureFlags';\n import {HostComponent, HostText} from 'react-reconciler\/src\/ReactWorkTags';\n import {TOP_BEFORE_BLUR, TOP_AFTER_BLUR} from '..\/events\/DOMTopLevelEventTypes';\n@@ -233,7 +234,7 @@ export function prepareForCommit(containerInfo: Container): Object | null {\n eventsEnabled = ReactBrowserEventEmitterIsEnabled();\n selectionInformation = getSelectionInformation();\n let activeInstance = null;\n- if (enableDeprecatedFlareAPI) {\n+ if (enableDeprecatedFlareAPI || enableCreateEventHandleAPI) {\n const focusedElem = selectionInformation.focusedElem;\n if (focusedElem !== null) {\n activeInstance = getClosestInstanceFromNode(focusedElem);\n@@ -244,7 +245,7 @@ export function prepareForCommit(containerInfo: Container): Object | null {\n }\n \n export function beforeActiveInstanceBlur(): void {\n- if (enableDeprecatedFlareAPI) {\n+ if (enableDeprecatedFlareAPI || enableCreateEventHandleAPI) {\n ReactBrowserEventEmitterSetEnabled(true);\n dispatchBeforeDetachedBlur((selectionInformation: any).focusedElem);\n ReactBrowserEventEmitterSetEnabled(false);\n@@ -252,7 +253,7 @@ export function beforeActiveInstanceBlur(): void {\n }\n \n export function afterActiveInstanceBlur(): void {\n- if (enableDeprecatedFlareAPI) {\n+ if (enableDeprecatedFlareAPI || enableCreateEventHandleAPI) {\n ReactBrowserEventEmitterSetEnabled(true);\n dispatchAfterDetachedBlur((selectionInformation: any).focusedElem);\n ReactBrowserEventEmitterSetEnabled(false);\n@@ -515,7 +516,7 @@ function createEvent(type: TopLevelType): Event {\n }\n \n function dispatchBeforeDetachedBlur(target: HTMLElement): void {\n- if (enableDeprecatedFlareAPI) {\n+ if (enableDeprecatedFlareAPI || enableCreateEventHandleAPI) {\n const event = createEvent(TOP_BEFORE_BLUR);\n \/\/ Dispatch \"beforeblur\" directly on the target,\n \/\/ so it gets picked up by the event system and\n@@ -525,7 +526,7 @@ function dispatchBeforeDetachedBlur(target: HTMLElement): void {\n }\n \n function dispatchAfterDetachedBlur(target: HTMLElement): void {\n- if (enableDeprecatedFlareAPI) {\n+ if (enableDeprecatedFlareAPI || enableCreateEventHandleAPI) {\n const event = createEvent(TOP_AFTER_BLUR);\n \/\/ So we know what was detached, make the relatedTarget the\n \/\/ detached target on the \"afterblur\" event.\n@@ -535,7 +536,7 @@ function dispatchAfterDetachedBlur(target: HTMLElement): void {\n }\n }\n \n-export function beforeRemoveInstance(\n+export function removeInstanceEventHandles(\n instance: Instance | TextInstance | SuspenseInstance,\n ) {\n \/\/ TODO for ReactDOM.createEventInstance\n@@ -1135,7 +1136,7 @@ export function prepareScopeUpdate(\n }\n }\n \n-export function prepareScopeUnmount(scopeInstance: Object): void {\n+export function removeScopeEventHandles(scopeInstance: Object): void {\n \/\/ TODO when we add createEventHandle\n }\n \ndiff --git a\/packages\/react-dom\/src\/events\/DOMEventProperties.js b\/packages\/react-dom\/src\/events\/DOMEventProperties.js\nindex 6a3b0e68fb..8fda91636e 100644\n--- a\/packages\/react-dom\/src\/events\/DOMEventProperties.js\n+++ b\/packages\/react-dom\/src\/events\/DOMEventProperties.js\n@@ -24,6 +24,8 @@ import {\n ContinuousEvent,\n } from 'shared\/ReactTypes';\n \n+import {enableCreateEventHandleAPI} from 'shared\/ReactFeatureFlags';\n+\n \/\/ Needed for SimpleEventPlugin, rather than\n \/\/ do it in two places, which duplicates logic\n \/\/ and increases the bundle size, we do it all\n@@ -95,6 +97,13 @@ const otherDiscreteEvents = [\n DOMTopLevelEventTypes.TOP_COMPOSITION_UPDATE,\n ];\n \n+if (enableCreateEventHandleAPI) {\n+ otherDiscreteEvents.push(\n+ DOMTopLevelEventTypes.TOP_BEFORE_BLUR,\n+ DOMTopLevelEventTypes.TOP_AFTER_BLUR,\n+ );\n+}\n+\n \/\/ prettier-ignore\n const userBlockingPairsForSimpleEventPlugin = [\n DOMTopLevelEventTypes.TOP_DRAG, 'drag',\n@@ -236,7 +245,7 @@ export function getEventPriorityForListenerSystem(\n }\n if (__DEV__) {\n console.warn(\n- 'The event \"type\" provided to useEvent() does not have a known priority type.' +\n+ 'The event \"type\" provided to createEventHandle() does not have a known priority type.' +\n ' It is recommended to provide a \"priority\" option to specify a priority.',\n );\n }\ndiff --git a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\nindex 03ecd50ade..3dce7bde12 100644\n--- a\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMModernPluginEventSystem.js\n@@ -32,7 +32,6 @@ import {\n LEGACY_FB_SUPPORT,\n IS_REPLAYED,\n IS_TARGET_PHASE_ONLY,\n- USE_EVENT_SYSTEM,\n } from '.\/EventSystemFlags';\n \n import {\n@@ -78,6 +77,8 @@ import {\n TOP_PLAYING,\n TOP_CLICK,\n TOP_SELECTION_CHANGE,\n+ TOP_BEFORE_BLUR,\n+ TOP_AFTER_BLUR,\n getRawEventName,\n } from '.\/DOMTopLevelEventTypes';\n import {\n@@ -89,7 +90,10 @@ import {batchedEventUpdates} from '.\/ReactDOMUpdateBatching';\n import getListener from '.\/getListener';\n import {passiveBrowserEventsSupported} from '.\/checkPassiveEvents';\n \n-import {enableLegacyFBSupport} from 'shared\/ReactFeatureFlags';\n+import {\n+ enableLegacyFBSupport,\n+ enableCreateEventHandleAPI,\n+} from 'shared\/ReactFeatureFlags';\n import {\n invokeGuardedCallbackAndCatchFirstError,\n rethrowCaughtError,\n@@ -99,9 +103,11 @@ import {\n removeEventListener,\n addEventCaptureListener,\n addEventBubbleListener,\n+ addEventBubbleListenerWithPassiveFlag,\n+ addEventCaptureListenerWithPassiveFlag,\n } from '.\/EventListener';\n \n-const capturePhaseEvents = new Set([\n+export const capturePhaseEvents: Set = new Set([\n TOP_FOCUS,\n TOP_BLUR,\n TOP_SCROLL,\n@@ -137,6 +143,11 @@ const capturePhaseEvents = new Set([\n TOP_WAITING,\n ]);\n \n+if (enableCreateEventHandleAPI) {\n+ capturePhaseEvents.add(TOP_BEFORE_BLUR);\n+ capturePhaseEvents.add(TOP_AFTER_BLUR);\n+}\n+\n function executeDispatch(\n event: ReactSyntheticEvent,\n listener: Function,\n@@ -217,7 +228,7 @@ function dispatchEventsForPlugins(\n \n export function listenToTopLevelEvent(\n topLevelType: DOMTopLevelEventType,\n- targetContainer: EventTarget,\n+ target: EventTarget,\n listenerMap: ElementListenerMap,\n eventSystemFlags: EventSystemFlags,\n passive?: boolean,\n@@ -228,25 +239,26 @@ export function listenToTopLevelEvent(\n \/\/ otherwise it won't capture incoming events that are only\n \/\/ triggered on the document directly.\n if (topLevelType === TOP_SELECTION_CHANGE) {\n- targetContainer = (targetContainer: any).ownerDocument || targetContainer;\n- listenerMap = getEventListenerMap(targetContainer);\n+ target = (target: any).ownerDocument || target;\n+ listenerMap = getEventListenerMap(target);\n }\n+ capture =\n+ capture === undefined ? capturePhaseEvents.has(topLevelType) : capture;\n+ const listenerMapKey = getListenerMapKey(topLevelType, capture);\n const listenerEntry: ElementListenerMapEntry | void = listenerMap.get(\n- topLevelType,\n+ listenerMapKey,\n );\n- const isCapturePhase =\n- capture === undefined ? capturePhaseEvents.has(topLevelType) : capture;\n if (listenerEntry === undefined) {\n const listener = addTrappedEventListener(\n- targetContainer,\n+ target,\n topLevelType,\n eventSystemFlags,\n- isCapturePhase,\n+ capture,\n false,\n passive,\n priority,\n );\n- listenerMap.set(topLevelType, {passive, listener});\n+ listenerMap.set(listenerMapKey, {passive, listener});\n }\n }\n \n@@ -324,17 +336,35 @@ function addTrappedEventListener(\n };\n }\n if (capture) {\n- unsubscribeListener = addEventCaptureListener(\n- targetContainer,\n- rawEventName,\n- listener,\n- );\n+ if (enableCreateEventHandleAPI && passive !== undefined) {\n+ unsubscribeListener = addEventCaptureListenerWithPassiveFlag(\n+ targetContainer,\n+ rawEventName,\n+ listener,\n+ passive,\n+ );\n+ } else {\n+ unsubscribeListener = addEventCaptureListener(\n+ targetContainer,\n+ rawEventName,\n+ listener,\n+ );\n+ }\n } else {\n- unsubscribeListener = addEventBubbleListener(\n- targetContainer,\n- rawEventName,\n- listener,\n- );\n+ if (enableCreateEventHandleAPI && passive !== undefined) {\n+ unsubscribeListener = addEventBubbleListenerWithPassiveFlag(\n+ targetContainer,\n+ rawEventName,\n+ listener,\n+ passive,\n+ );\n+ } else {\n+ unsubscribeListener = addEventBubbleListener(\n+ targetContainer,\n+ rawEventName,\n+ listener,\n+ );\n+ }\n }\n return unsubscribeListener;\n }\n@@ -397,8 +427,6 @@ export function dispatchEventForPluginEventSystem(\n (eventSystemFlags & LEGACY_FB_SUPPORT) === 0 &&\n \/\/ We also don't want to defer during event replaying.\n (eventSystemFlags & IS_REPLAYED) === 0 &&\n- \/\/ We don't want to apply the legacy FB support for the useEvent API.\n- (eventSystemFlags & USE_EVENT_SYSTEM) === 0 &&\n willDeferLaterForLegacyFBSupport(topLevelType, targetContainer)\n ) {\n return;\n@@ -707,3 +735,10 @@ export function accumulateEnterLeaveListeners(\n );\n }\n }\n+\n+export function getListenerMapKey(\n+ topLevelType: DOMTopLevelEventType,\n+ capture: boolean,\n+): string {\n+ return `${getRawEventName(topLevelType)}__${capture ? 'capture' : 'bubble'}`;\n+}\ndiff --git a\/packages\/react-dom\/src\/events\/EventSystemFlags.js b\/packages\/react-dom\/src\/events\/EventSystemFlags.js\nindex 585519c117..69e39bf5fc 100644\n--- a\/packages\/react-dom\/src\/events\/EventSystemFlags.js\n+++ b\/packages\/react-dom\/src\/events\/EventSystemFlags.js\n@@ -11,10 +11,9 @@ export type EventSystemFlags = number;\n \n export const PLUGIN_EVENT_SYSTEM = 1;\n export const RESPONDER_EVENT_SYSTEM = 1 << 1;\n-export const USE_EVENT_SYSTEM = 1 << 2;\n-export const IS_TARGET_PHASE_ONLY = 1 << 3;\n-export const IS_PASSIVE = 1 << 4;\n-export const PASSIVE_NOT_SUPPORTED = 1 << 5;\n-export const IS_REPLAYED = 1 << 6;\n-export const IS_FIRST_ANCESTOR = 1 << 7;\n-export const LEGACY_FB_SUPPORT = 1 << 8;\n+export const IS_TARGET_PHASE_ONLY = 1 << 2;\n+export const IS_PASSIVE = 1 << 3;\n+export const PASSIVE_NOT_SUPPORTED = 1 << 4;\n+export const IS_REPLAYED = 1 << 5;\n+export const IS_FIRST_ANCESTOR = 1 << 6;\n+export const LEGACY_FB_SUPPORT = 1 << 7;\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\nindex 0550aa82a8..74347b3a93 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernSelectEventPlugin.js\n@@ -28,7 +28,11 @@ import {\n } from '..\/..\/client\/ReactDOMComponentTree';\n import {hasSelectionCapabilities} from '..\/..\/client\/ReactInputSelection';\n import {DOCUMENT_NODE} from '..\/..\/shared\/HTMLNodeType';\n-import {accumulateTwoPhaseListeners} from '..\/DOMModernPluginEventSystem';\n+import {\n+ accumulateTwoPhaseListeners,\n+ getListenerMapKey,\n+ capturePhaseEvents,\n+} from '..\/DOMModernPluginEventSystem';\n \n const skipSelectionChangeEvent =\n canUseDOM && 'documentMode' in document && document.documentMode <= 11;\n@@ -153,7 +157,9 @@ function isListeningToEvents(\n const listenerMap = getEventListenerMap(mountAt);\n for (let i = 0; i < events.length; i++) {\n const event = events[i];\n- if (!listenerMap.has(event)) {\n+ const capture = capturePhaseEvents.has(event);\n+ const listenerMapKey = getListenerMapKey(event, capture);\n+ if (!listenerMap.has(listenerMapKey)) {\n return false;\n }\n }\n@@ -165,7 +171,9 @@ function isListeningToEvent(\n mountAt: Document | Element,\n ): boolean {\n const listenerMap = getEventListenerMap(mountAt);\n- return listenerMap.has(registrationName);\n+ const capture = capturePhaseEvents.has(registrationName);\n+ const listenerMapKey = getListenerMapKey(registrationName, capture);\n+ return listenerMap.has(listenerMapKey);\n }\n \n \/**\ndiff --git a\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js b\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\nindex 3be2a61dd6..e11c882db0 100644\n--- a\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\n+++ b\/packages\/react-dom\/src\/events\/plugins\/ModernSimpleEventPlugin.js\n@@ -26,6 +26,7 @@ import {\n simpleEventPluginEventTypes,\n } from '..\/DOMEventProperties';\n import {accumulateTwoPhaseListeners} from '..\/DOMModernPluginEventSystem';\n+import {IS_TARGET_PHASE_ONLY} from '..\/EventSystemFlags';\n \n import SyntheticAnimationEvent from '..\/SyntheticAnimationEvent';\n import SyntheticClipboardEvent from '..\/SyntheticClipboardEvent';\n@@ -40,6 +41,8 @@ import SyntheticUIEvent from '..\/SyntheticUIEvent';\n import SyntheticWheelEvent from '..\/SyntheticWheelEvent';\n import getEventCharCode from '..\/getEventCharCode';\n \n+import {enableCreateEventHandleAPI} from 'shared\/ReactFeatureFlags';\n+\n \/\/ Only used in DEV for exhaustiveness validation.\n const knownHTMLTopLevelTypes: Array = [\n DOMTopLevelEventTypes.TOP_ABORT,\n@@ -201,7 +204,16 @@ const SimpleEventPlugin: ModernPluginModule = {\n nativeEventTarget,\n );\n \n- accumulateTwoPhaseListeners(targetInst, dispatchQueue, event);\n+ if (\n+ enableCreateEventHandleAPI &&\n+ eventSystemFlags !== undefined &&\n+ eventSystemFlags & IS_TARGET_PHASE_ONLY &&\n+ targetContainer != null\n+ ) {\n+ \/\/ TODO: accumulateEventTargetListeners\n+ } else {\n+ accumulateTwoPhaseListeners(targetInst, dispatchQueue, event);\n+ }\n },\n };\n \ndiff --git a\/packages\/react-dom\/src\/shared\/ReactDOMTypes.js b\/packages\/react-dom\/src\/shared\/ReactDOMTypes.js\nindex 19cd62793b..086e105543 100644\n--- a\/packages\/react-dom\/src\/shared\/ReactDOMTypes.js\n+++ b\/packages\/react-dom\/src\/shared\/ReactDOMTypes.js\n@@ -12,7 +12,9 @@ import type {\n ReactEventResponder,\n ReactEventResponderInstance,\n EventPriority,\n+ ReactScopeInstance,\n } from 'shared\/ReactTypes';\n+import type {DOMTopLevelEventType} from 'legacy-events\/TopLevelEventTypes';\n \n type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | Touch;\n \n@@ -75,3 +77,18 @@ export type ReactDOMResponderContext = {\n getResponderNode(): Element | null,\n ...\n };\n+\n+export type ReactDOMEventHandle = {|\n+ setListener(\n+ target: EventTarget | ReactScopeInstance,\n+ callback: (SyntheticEvent) => void,\n+ ): void,\n+ clear(): void,\n+|};\n+\n+export type ReactDOMEventHandleListener = {|\n+ callback: (SyntheticEvent) => void,\n+ capture: boolean,\n+ destroy: (target: EventTarget | ReactScopeInstance) => void,\n+ type: DOMTopLevelEventType,\n+|};\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\nindex aa473b2218..2e7b8c7ab0 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n@@ -483,7 +483,7 @@ export function getInstanceFromNode(node: any) {\n throw new Error('Not yet implemented.');\n }\n \n-export function beforeRemoveInstance(instance: any) {\n+export function removeInstanceEventHandles(instance: any) {\n \/\/ noop\n }\n \ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js b\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\nindex 9cfedc2453..a5d3e6d176 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\n@@ -536,7 +536,7 @@ export function getInstanceFromNode(node: any) {\n throw new Error('Not yet implemented.');\n }\n \n-export function beforeRemoveInstance(instance: any) {\n+export function removeInstanceEventHandles(instance: any) {\n \/\/ noop\n }\n \ndiff --git a\/packages\/react-noop-renderer\/src\/createReactNoop.js b\/packages\/react-noop-renderer\/src\/createReactNoop.js\nindex 6c2417a22f..7cdbae2736 100644\n--- a\/packages\/react-noop-renderer\/src\/createReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/createReactNoop.js\n@@ -442,7 +442,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n throw new Error('Not yet implemented.');\n },\n \n- beforeRemoveInstance(instance: any): void {\n+ removeInstanceEventHandles(instance: any): void {\n \/\/ NO-OP\n },\n \n@@ -460,7 +460,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n \n prepareScopeUpdate() {},\n \n- prepareScopeUnmount() {},\n+ removeScopeEventHandles() {},\n \n getInstanceFromScope() {\n throw new Error('Not yet implemented.');\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.new.js b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.new.js\nindex 91e74031dd..72e501a8d3 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.new.js\n@@ -37,6 +37,7 @@ import {\n enableSuspenseCallback,\n enableScopeAPI,\n runAllPassiveEffectDestroysBeforeCreates,\n+ enableCreateEventHandleAPI,\n } from 'shared\/ReactFeatureFlags';\n import {\n FunctionComponent,\n@@ -113,10 +114,10 @@ import {\n updateFundamentalComponent,\n commitHydratedContainer,\n commitHydratedSuspenseInstance,\n- beforeRemoveInstance,\n+ removeInstanceEventHandles,\n clearContainer,\n prepareScopeUpdate,\n- prepareScopeUnmount,\n+ removeScopeEventHandles,\n } from '.\/ReactFiberHostConfig';\n import {\n captureCommitPhaseError,\n@@ -1029,7 +1030,9 @@ function commitUnmount(\n if (enableDeprecatedFlareAPI) {\n unmountDeprecatedResponderListeners(current);\n }\n- beforeRemoveInstance(current.stateNode);\n+ if (enableCreateEventHandleAPI && current.ref !== null) {\n+ removeInstanceEventHandles(current.stateNode);\n+ }\n safelyDetachRef(current);\n return;\n }\n@@ -1072,7 +1075,9 @@ function commitUnmount(\n unmountDeprecatedResponderListeners(current);\n }\n const scopeInstance = current.stateNode;\n- prepareScopeUnmount(scopeInstance);\n+ if (enableCreateEventHandleAPI && current.ref !== null) {\n+ removeScopeEventHandles(scopeInstance);\n+ }\n safelyDetachRef(current);\n }\n return;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.old.js b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.old.js\nindex 16c25e1593..80a4673f9a 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.old.js\n@@ -36,6 +36,7 @@ import {\n enableSuspenseCallback,\n enableScopeAPI,\n runAllPassiveEffectDestroysBeforeCreates,\n+ enableCreateEventHandleAPI,\n } from 'shared\/ReactFeatureFlags';\n import {\n FunctionComponent,\n@@ -110,10 +111,10 @@ import {\n updateFundamentalComponent,\n commitHydratedContainer,\n commitHydratedSuspenseInstance,\n- beforeRemoveInstance,\n+ removeInstanceEventHandles,\n clearContainer,\n prepareScopeUpdate,\n- prepareScopeUnmount,\n+ removeScopeEventHandles,\n } from '.\/ReactFiberHostConfig';\n import {\n captureCommitPhaseError,\n@@ -1027,7 +1028,9 @@ function commitUnmount(\n if (enableDeprecatedFlareAPI) {\n unmountDeprecatedResponderListeners(current);\n }\n- beforeRemoveInstance(current.stateNode);\n+ if (enableCreateEventHandleAPI && current.ref !== null) {\n+ removeInstanceEventHandles(current.stateNode);\n+ }\n safelyDetachRef(current);\n return;\n }\n@@ -1070,7 +1073,9 @@ function commitUnmount(\n unmountDeprecatedResponderListeners(current);\n }\n const scopeInstance = current.stateNode;\n- prepareScopeUnmount(scopeInstance);\n+ if (enableCreateEventHandleAPI && current.ref !== null) {\n+ removeScopeEventHandles(scopeInstance);\n+ }\n safelyDetachRef(current);\n }\n return;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHostConfigWithNoScopes.js b\/packages\/react-reconciler\/src\/ReactFiberHostConfigWithNoScopes.js\nindex 1c784ff529..57e3756340 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHostConfigWithNoScopes.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHostConfigWithNoScopes.js\n@@ -23,5 +23,5 @@ function shim(...args: any) {\n \n \/\/ React Scopes (when unsupported)\n export const prepareScopeUpdate = shim;\n-export const prepareScopeUnmount = shim;\n+export const removeScopeEventHandles = shim;\n export const getInstanceFromScope = shim;\ndiff --git a\/packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js b\/packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js\nindex c752c497ac..2315cd6d98 100644\n--- a\/packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js\n+++ b\/packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js\n@@ -74,7 +74,8 @@ export const mountFundamentalComponent =\n export const shouldUpdateFundamentalComponent =\n $$$hostConfig.shouldUpdateFundamentalComponent;\n export const getInstanceFromNode = $$$hostConfig.getInstanceFromNode;\n-export const beforeRemoveInstance = $$$hostConfig.beforeRemoveInstance;\n+export const removeInstanceEventHandles =\n+ $$$hostConfig.removeInstanceEventHandles;\n export const isOpaqueHydratingObject = $$$hostConfig.isOpaqueHydratingObject;\n export const makeOpaqueHydratingObject =\n $$$hostConfig.makeOpaqueHydratingObject;\n@@ -84,7 +85,7 @@ export const beforeActiveInstanceBlur = $$$hostConfig.beforeActiveInstanceBlur;\n export const afterActiveInstanceBlur = $$$hostConfig.afterActiveInstanceBlur;\n export const preparePortalMount = $$$hostConfig.preparePortalMount;\n export const prepareScopeUpdate = $$$hostConfig.preparePortalMount;\n-export const prepareScopeUnmount = $$$hostConfig.prepareScopeUnmount;\n+export const removeScopeEventHandles = $$$hostConfig.removeScopeEventHandles;\n export const getInstanceFromScope = $$$hostConfig.getInstanceFromScope;\n \n \/\/ -------------------\ndiff --git a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\nindex 508d8c0f2a..79627fff53 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n@@ -387,7 +387,7 @@ export function getInstanceFromNode(mockNode: Object) {\n return null;\n }\n \n-export function beforeRemoveInstance(instance: any) {\n+export function removeInstanceEventHandles(instance: any) {\n \/\/ noop\n }\n \n@@ -444,7 +444,7 @@ export function prepareScopeUpdate(scopeInstance: Object, inst: Object): void {\n nodeToInstanceMap.set(scopeInstance, inst);\n }\n \n-export function prepareScopeUnmount(scopeInstance: Object): void {\n+export function removeScopeEventHandles(scopeInstance: Object): void {\n nodeToInstanceMap.delete(scopeInstance);\n }\n \ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 8fb1a871fa..3afba6de96 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -57,6 +57,9 @@ export const enableFundamentalAPI = false;\n \/\/ Experimental Scope support.\n export const enableScopeAPI = false;\n \n+\/\/ Experimental Create Event Handle API.\n+export const enableCreateEventHandleAPI = false;\n+\n \/\/ New API for JSX transforms to target - https:\/\/github.com\/reactjs\/rfcs\/pull\/107\n \n \/\/ We will enforce mocking scheduler with scheduler\/unstable_mock at some point. (v17?)\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex c5fb08aaa5..08a7466fdf 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -27,6 +27,7 @@ export const warnAboutDeprecatedLifecycles = true;\n export const enableDeprecatedFlareAPI = false;\n export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n+export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = true;\n export const enableSuspenseCallback = false;\n export const warnAboutDefaultPropsOnFunctionComponents = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 5c63962525..73b03f2e04 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -26,6 +26,7 @@ export const enableSchedulerDebugging = false;\n export const enableDeprecatedFlareAPI = false;\n export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n+export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = false;\n export const enableSuspenseCallback = false;\n export const warnAboutDefaultPropsOnFunctionComponents = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 238f8a0611..a8a5f26d66 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -26,6 +26,7 @@ export const enableSchedulerDebugging = false;\n export const enableDeprecatedFlareAPI = false;\n export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n+export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = false;\n export const enableSuspenseCallback = false;\n export const warnAboutDefaultPropsOnFunctionComponents = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex bb0c999241..3ac44b769b 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -26,6 +26,7 @@ export const disableInputAttributeSyncing = false;\n export const enableDeprecatedFlareAPI = true;\n export const enableFundamentalAPI = false;\n export const enableScopeAPI = true;\n+export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = true;\n export const enableSuspenseCallback = true;\n export const warnAboutDefaultPropsOnFunctionComponents = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.testing.js b\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\nindex 08b6133e93..acdc78b483 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\n@@ -26,6 +26,7 @@ export const enableSchedulerDebugging = false;\n export const enableDeprecatedFlareAPI = false;\n export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n+export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = false;\n export const enableSuspenseCallback = false;\n export const warnAboutDefaultPropsOnFunctionComponents = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\nindex 4b4e297282..1da0e18cb8 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\n@@ -26,6 +26,7 @@ export const enableSchedulerDebugging = false;\n export const enableDeprecatedFlareAPI = true;\n export const enableFundamentalAPI = false;\n export const enableScopeAPI = true;\n+export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = true;\n export const enableSuspenseCallback = true;\n export const warnAboutDefaultPropsOnFunctionComponents = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex 7bc6bd4806..19380fac7f 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -58,6 +58,8 @@ export const disableModulePatternComponents = true;\n \n export const enableDeprecatedFlareAPI = true;\n \n+export const enableCreateEventHandleAPI = false;\n+\n export const enableFundamentalAPI = false;\n \n export const enableScopeAPI = true;\n","commit":{"authoredAt":"2020-05-12T19:01:12+01:00","revision":"80c4dea0d1da0012977c6c4b2ac7a8bd37154d50","authorName":"Dominic Gannaway","shortRevision":"80c4dea0d1","authorEmail":"trueadm@users.noreply.github.com","subject":"Modern Event System: Add scaffolding for createEventHandle (#18898)"}}

dillon1000/react

Files changed