Skip to content

Commit cc958d2

Browse files
committed
Revert "Clean up discrete event replaying (#26558)"
This reverts commit 9cfba0f.
1 parent d41e5c2 commit cc958d2

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

packages/react-dom-bindings/src/events/ReactDOMEventListener.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import {isRootDehydrated} from 'react-reconciler/src/ReactFiberShellHydration';
5757
const {ReactCurrentBatchConfig} = ReactSharedInternals;
5858

5959
// TODO: can we stop exporting these?
60-
let _enabled: boolean = true;
60+
export let _enabled: boolean = true;
6161

6262
// This is exported in FB builds for use by legacy FB layer infra.
6363
// We'd like to remove this but it's not clear if this is safe.

packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ type QueuedReplayableEvent = {
6060

6161
let hasScheduledReplayAttempt = false;
6262

63+
// The queue of discrete events to be replayed.
64+
const queuedDiscreteEvents: Array<QueuedReplayableEvent> = [];
65+
66+
// Indicates if any continuous event targets are non-null for early bailout.
67+
const hasAnyQueuedContinuousEvents: boolean = false;
6368
// The last of each continuous event type. We only need to replay the last one
6469
// if the last target was dehydrated.
6570
let queuedFocus: null | QueuedReplayableEvent = null;
@@ -77,6 +82,14 @@ type QueuedHydrationTarget = {
7782
};
7883
const queuedExplicitHydrationTargets: Array<QueuedHydrationTarget> = [];
7984

85+
export function hasQueuedDiscreteEvents(): boolean {
86+
return queuedDiscreteEvents.length > 0;
87+
}
88+
89+
export function hasQueuedContinuousEvents(): boolean {
90+
return hasAnyQueuedContinuousEvents;
91+
}
92+
8093
const discreteReplayableEvents: Array<DOMEventName> = [
8194
'mousedown',
8295
'mouseup',
@@ -433,6 +446,21 @@ function scheduleCallbackIfUnblocked(
433446
export function retryIfBlockedOn(
434447
unblocked: Container | SuspenseInstance,
435448
): void {
449+
// Mark anything that was blocked on this as no longer blocked
450+
// and eligible for a replay.
451+
if (queuedDiscreteEvents.length > 0) {
452+
scheduleCallbackIfUnblocked(queuedDiscreteEvents[0], unblocked);
453+
// This is a exponential search for each boundary that commits. I think it's
454+
// worth it because we expect very few discrete events to queue up and once
455+
// we are actually fully unblocked it will be fast to replay them.
456+
for (let i = 1; i < queuedDiscreteEvents.length; i++) {
457+
const queuedEvent = queuedDiscreteEvents[i];
458+
if (queuedEvent.blockedOn === unblocked) {
459+
queuedEvent.blockedOn = null;
460+
}
461+
}
462+
}
463+
436464
if (queuedFocus !== null) {
437465
scheduleCallbackIfUnblocked(queuedFocus, unblocked);
438466
}

0 commit comments

Comments
 (0)