Skip to content

Experimental Event API: Redesign event responder propagation #15408

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
merged 4 commits into from
Apr 13, 2019
Merged

Experimental Event API: Redesign event responder propagation #15408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba3936d
Event API: Redesign event instance propagation
trueadm Apr 13, 2019
96f427e
Remove dead code
trueadm Apr 13, 2019
2f5292d
Ensure all events are batched
trueadm Apr 13, 2019
157f4cb
Refine responder event re-use
trueadm Apr 13, 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
292 changes: 179 additions & 113 deletions packages/react-dom/src/events/DOMEventResponderSystem.js
View file
Open in desktop

Large diffs are not rendered by default.

92 changes: 54 additions & 38 deletions packages/react-dom/src/events/ReactDOMEventListener.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {DOMTopLevelEventType} from 'events/TopLevelEventTypes';

import {batchedUpdates, interactiveUpdates} from 'events/ReactGenericBatching';
import {runExtractedPluginEventsInBatch} from 'events/EventPluginHub';
import {runResponderEventsInBatch} from '../events/DOMEventResponderSystem';
import {dispatchEventForResponderEventSystem} from '../events/DOMEventResponderSystem';
import {isFiberMounted} from 'react-reconciler/reflection';
import {HostRoot} from 'shared/ReactWorkTags';
import {
Expand Down Expand Up @@ -48,7 +48,6 @@ type BookKeepingInstance = {
nativeEvent: AnyNativeEvent | null,
targetInst: Fiber | null,
ancestors: Array<Fiber | null>,
eventSystemFlags: EventSystemFlags,
};

/**
Expand All @@ -75,22 +74,19 @@ function getTopLevelCallbackBookKeeping(
topLevelType: DOMTopLevelEventType,
nativeEvent: AnyNativeEvent,
targetInst: Fiber | null,
eventSystemFlags: EventSystemFlags,
): BookKeepingInstance {
if (callbackBookkeepingPool.length) {
const instance = callbackBookkeepingPool.pop();
instance.topLevelType = topLevelType;
instance.nativeEvent = nativeEvent;
instance.targetInst = targetInst;
instance.eventSystemFlags = eventSystemFlags;
return instance;
}
return {
topLevelType,
nativeEvent,
targetInst,
ancestors: [],
eventSystemFlags,
};
}

Expand All @@ -101,7 +97,6 @@ function releaseTopLevelCallbackBookKeeping(
instance.nativeEvent = null;
instance.targetInst = null;
instance.ancestors.length = 0;
instance.eventSystemFlags = 0;
if (callbackBookkeepingPool.length < CALLBACK_BOOKKEEPING_POOL_SIZE) {
callbackBookkeepingPool.push(instance);
}
Expand Down Expand Up @@ -131,28 +126,16 @@ function handleTopLevel(bookKeeping: BookKeepingInstance) {

for (let i = 0; i < bookKeeping.ancestors.length; i++) {
targetInst = bookKeeping.ancestors[i];
const eventSystemFlags = bookKeeping.eventSystemFlags;
const eventTarget = getEventTarget(bookKeeping.nativeEvent);
const topLevelType = ((bookKeeping.topLevelType: any): DOMTopLevelEventType);
const nativeEvent = ((bookKeeping.nativeEvent: any): AnyNativeEvent);

if (eventSystemFlags === PLUGIN_EVENT_SYSTEM) {
runExtractedPluginEventsInBatch(
topLevelType,
targetInst,
nativeEvent,
eventTarget,
);
} else if (enableEventAPI) {
// Responder event system (experimental event API)
runResponderEventsInBatch(
topLevelType,
targetInst,
nativeEvent,
eventTarget,
eventSystemFlags,
);
}
runExtractedPluginEventsInBatch(
topLevelType,
targetInst,
nativeEvent,
eventTarget,
);
}
}

Expand Down Expand Up @@ -242,6 +225,27 @@ function dispatchInteractiveEvent(topLevelType, eventSystemFlags, nativeEvent) {
);
}

function dispatchEventForPluginEventSystem(
topLevelType: DOMTopLevelEventType,
eventSystemFlags: EventSystemFlags,
nativeEvent: AnyNativeEvent,
targetInst: null | Fiber,
): void {
const bookKeeping = getTopLevelCallbackBookKeeping(
topLevelType,
nativeEvent,
targetInst,
);

try {
// Event queue being processed in the same cycle allows
// `preventDefault`.
batchedUpdates(handleTopLevel, bookKeeping);
} finally {
releaseTopLevelCallbackBookKeeping(bookKeeping);
}
}

export function dispatchEvent(
topLevelType: DOMTopLevelEventType,
eventSystemFlags: EventSystemFlags,
Expand All @@ -250,9 +254,9 @@ export function dispatchEvent(
if (!_enabled) {
return;
}

const nativeEventTarget = getEventTarget(nativeEvent);
let targetInst = getClosestInstanceFromNode(nativeEventTarget);

if (
targetInst !== null &&
typeof targetInst.tag === 'number' &&
Expand All @@ -265,18 +269,30 @@ export function dispatchEvent(
targetInst = null;
}

const bookKeeping = getTopLevelCallbackBookKeeping(
topLevelType,
nativeEvent,
targetInst,
eventSystemFlags,
);

try {
// Event queue being processed in the same cycle allows
// `preventDefault`.
batchedUpdates(handleTopLevel, bookKeeping);
} finally {
releaseTopLevelCallbackBookKeeping(bookKeeping);
if (enableEventAPI) {
if (eventSystemFlags === PLUGIN_EVENT_SYSTEM) {
dispatchEventForPluginEventSystem(
topLevelType,
eventSystemFlags,
nativeEvent,
targetInst,
);
} else {
// Responder event system (experimental event API)
dispatchEventForResponderEventSystem(
topLevelType,
targetInst,
nativeEvent,
nativeEventTarget,
eventSystemFlags,
);
}
} else {
dispatchEventForPluginEventSystem(
topLevelType,
eventSystemFlags,
nativeEvent,
targetInst,
);
}
}
Loading