@samitouri / QOS-React-2 / commits / b5bac18219

Align event group constant naming with lane naming (#20744)

* Rename ContinuousEvent to DefaultEvent * Rename UserBlockingEvent to ContinuousEvent

Dan Abramov committed Feb 8, 2021 at 17:48 UTC b5bac18219636112a450d392c02102ec56262c74
8 files changed +31 -39
packages/react-dom/src/client/ReactDOM.js
+3 -3
@@ -32,7 +32,7 @@ import {
32 flushPassiveEffects,
33 IsThisRendererActing,
34 attemptSynchronousHydration,
35 - attemptUserBlockingHydration,
35 + attemptDiscreteHydration,
36 attemptContinuousHydration,
37 attemptHydrationAtCurrentPriority,
38 runWithPriority,
@@ -56,7 +56,7 @@ import {
56 import {restoreControlledState} from './ReactDOMComponent';
57 import {
58 setAttemptSynchronousHydration,
59 - setAttemptUserBlockingHydration,
59 + setAttemptDiscreteHydration,
60 setAttemptContinuousHydration,
61 setAttemptHydrationAtCurrentPriority,
62 queueExplicitHydrationTarget,
@@ -71,7 +71,7 @@ import {
71 } from '../events/ReactDOMControlledComponent';
72
73 setAttemptSynchronousHydration(attemptSynchronousHydration);
74 -setAttemptUserBlockingHydration(attemptUserBlockingHydration);
74 +setAttemptDiscreteHydration(attemptDiscreteHydration);
75 setAttemptContinuousHydration(attemptContinuousHydration);
76 setAttemptHydrationAtCurrentPriority(attemptHydrationAtCurrentPriority);
77 setGetCurrentUpdatePriority(getCurrentUpdateLanePriority);
packages/react-dom/src/events/DOMEventProperties.js
+10 -14
@@ -17,11 +17,7 @@ import {
17 ANIMATION_START,
18 TRANSITION_END,
19 } from './DOMEventNames';
20 -import {
21 - DiscreteEvent,
22 - UserBlockingEvent,
23 - ContinuousEvent,
24 -} from 'shared/ReactTypes';
20 +import {DiscreteEvent, ContinuousEvent, DefaultEvent} from 'shared/ReactTypes';
21
22 import {enableCreateEventHandleAPI} from 'shared/ReactFeatureFlags';
23
@@ -97,7 +93,7 @@ if (enableCreateEventHandleAPI) {
93 }
94
95 // prettier-ignore
100 -const userBlockingPairsForSimpleEventPlugin: Array<string | DOMEventName> = [
96 +const continuousPairsForSimpleEventPlugin: Array<string | DOMEventName> = [
97 ('drag': DOMEventName), 'drag',
98 ('dragenter': DOMEventName), 'dragEnter',
99 ('dragexit': DOMEventName), 'dragExit',
@@ -116,7 +112,7 @@ const userBlockingPairsForSimpleEventPlugin: Array<string | DOMEventName> = [
112 ];
113
114 // prettier-ignore
119 -const continuousPairsForSimpleEventPlugin: Array<string | DOMEventName> = [
115 +const defaultPairsForSimpleEventPlugin: Array<string | DOMEventName> = [
116 ('abort': DOMEventName), 'abort',
117 (ANIMATION_END: DOMEventName), 'animationEnd',
118 (ANIMATION_ITERATION: DOMEventName), 'animationIteration',
@@ -190,10 +186,10 @@ export function getEventPriorityForPluginSystem(
186 domEventName: DOMEventName,
187 ): EventPriority {
188 const priority = eventPriorities.get(domEventName);
193 - // Default to a ContinuousEvent. Note: we might
189 + // Default to a DefaultEvent. Note: we might
190 // want to warn if we can't detect the priority
191 // for the event.
196 - return priority === undefined ? ContinuousEvent : priority;
192 + return priority === undefined ? DefaultEvent : priority;
193 }
194
195 export function getEventPriorityForListenerSystem(
@@ -210,7 +206,7 @@ export function getEventPriorityForListenerSystem(
206 type,
207 );
208 }
213 - return ContinuousEvent;
209 + return DefaultEvent;
210 }
211
212 export function registerSimpleEvents() {
@@ -218,13 +214,13 @@ export function registerSimpleEvents() {
214 discreteEventPairsForSimpleEventPlugin,
215 DiscreteEvent,
216 );
221 - registerSimplePluginEventsAndSetTheirPriorities(
222 - userBlockingPairsForSimpleEventPlugin,
223 - UserBlockingEvent,
224 - );
217 registerSimplePluginEventsAndSetTheirPriorities(
218 continuousPairsForSimpleEventPlugin,
219 ContinuousEvent,
220 );
221 + registerSimplePluginEventsAndSetTheirPriorities(
222 + defaultPairsForSimpleEventPlugin,
223 + DefaultEvent,
224 + );
225 setEventPriorities(otherDiscreteEvents, DiscreteEvent);
226 }
packages/react-dom/src/events/ReactDOMEventListener.js
+5 -9
@@ -43,11 +43,7 @@ import {
43 decoupleUpdatePriorityFromScheduler,
44 enableNewReconciler,
45 } from 'shared/ReactFeatureFlags';
46 -import {
47 - UserBlockingEvent,
48 - ContinuousEvent,
49 - DiscreteEvent,
50 -} from 'shared/ReactTypes';
46 +import {ContinuousEvent, DefaultEvent, DiscreteEvent} from 'shared/ReactTypes';
47 import {getEventPriorityForPluginSystem} from './DOMEventProperties';
48 import {dispatchEventForPluginEventSystem} from './DOMPluginEventSystem';
49 import {
@@ -118,10 +114,10 @@ export function createEventListenerWrapperWithPriority(
114 case DiscreteEvent:
115 listenerWrapper = dispatchDiscreteEvent;
116 break;
121 - case UserBlockingEvent:
122 - listenerWrapper = dispatchUserBlockingUpdate;
123 - break;
117 case ContinuousEvent:
118 + listenerWrapper = dispatchContinuousEvent;
119 + break;
120 + case DefaultEvent:
121 default:
122 listenerWrapper = dispatchEvent;
123 break;
@@ -157,7 +153,7 @@ function dispatchDiscreteEvent(
153 );
154 }
155
160 -function dispatchUserBlockingUpdate(
156 +function dispatchContinuousEvent(
157 domEventName,
158 eventSystemFlags,
159 container,
packages/react-dom/src/events/ReactDOMEventReplaying.js
+4 -4
@@ -39,10 +39,10 @@ export function setAttemptSynchronousHydration(fn: (fiber: Object) => void) {
39 attemptSynchronousHydration = fn;
40 }
41
42 -let attemptUserBlockingHydration: (fiber: Object) => void;
42 +let attemptDiscreteHydration: (fiber: Object) => void;
43
44 -export function setAttemptUserBlockingHydration(fn: (fiber: Object) => void) {
45 - attemptUserBlockingHydration = fn;
44 +export function setAttemptDiscreteHydration(fn: (fiber: Object) => void) {
45 + attemptDiscreteHydration = fn;
46 }
47
48 let attemptContinuousHydration: (fiber: Object) => void;
@@ -489,7 +489,7 @@ function replayUnblockedEvents() {
489 // the next discrete event.
490 const fiber = getInstanceFromNode(nextDiscreteEvent.blockedOn);
491 if (fiber !== null) {
492 - attemptUserBlockingHydration(fiber);
492 + attemptDiscreteHydration(fiber);
493 }
494 break;
495 }
packages/react-reconciler/src/ReactFiberReconciler.js
+5 -5
@@ -29,7 +29,7 @@ import {
29 IsThisRendererActing as IsThisRendererActing_old,
30 getPublicRootInstance as getPublicRootInstance_old,
31 attemptSynchronousHydration as attemptSynchronousHydration_old,
32 - attemptUserBlockingHydration as attemptUserBlockingHydration_old,
32 + attemptDiscreteHydration as attemptDiscreteHydration_old,
33 attemptContinuousHydration as attemptContinuousHydration_old,
34 attemptHydrationAtCurrentPriority as attemptHydrationAtCurrentPriority_old,
35 findHostInstance as findHostInstance_old,
@@ -69,7 +69,7 @@ import {
69 IsThisRendererActing as IsThisRendererActing_new,
70 getPublicRootInstance as getPublicRootInstance_new,
71 attemptSynchronousHydration as attemptSynchronousHydration_new,
72 - attemptUserBlockingHydration as attemptUserBlockingHydration_new,
72 + attemptDiscreteHydration as attemptDiscreteHydration_new,
73 attemptContinuousHydration as attemptContinuousHydration_new,
74 attemptHydrationAtCurrentPriority as attemptHydrationAtCurrentPriority_new,
75 findHostInstance as findHostInstance_new,
@@ -134,9 +134,9 @@ export const getPublicRootInstance = enableNewReconciler
134 export const attemptSynchronousHydration = enableNewReconciler
135 ? attemptSynchronousHydration_new
136 : attemptSynchronousHydration_old;
137 -export const attemptUserBlockingHydration = enableNewReconciler
138 - ? attemptUserBlockingHydration_new
139 - : attemptUserBlockingHydration_old;
137 +export const attemptDiscreteHydration = enableNewReconciler
138 + ? attemptDiscreteHydration_new
139 + : attemptDiscreteHydration_old;
140 export const attemptContinuousHydration = enableNewReconciler
141 ? attemptContinuousHydration_new
142 : attemptContinuousHydration_old;
packages/react-reconciler/src/ReactFiberReconciler.new.js
+1 -1
@@ -396,7 +396,7 @@ function markRetryLaneIfNotHydrated(fiber: Fiber, retryLane: Lane) {
396 }
397 }
398
399 -export function attemptUserBlockingHydration(fiber: Fiber): void {
399 +export function attemptDiscreteHydration(fiber: Fiber): void {
400 if (fiber.tag !== SuspenseComponent) {
401 // We ignore HostRoots here because we can't increase
402 // their priority and they should not suspend on I/O,
packages/react-reconciler/src/ReactFiberReconciler.old.js
+1 -1
@@ -396,7 +396,7 @@ function markRetryLaneIfNotHydrated(fiber: Fiber, retryLane: Lane) {
396 }
397 }
398
399 -export function attemptUserBlockingHydration(fiber: Fiber): void {
399 +export function attemptDiscreteHydration(fiber: Fiber): void {
400 if (fiber.tag !== SuspenseComponent) {
401 // We ignore HostRoots here because we can't increase
402 // their priority and they should not suspend on I/O,
packages/shared/ReactTypes.js
+2 -2
@@ -89,8 +89,8 @@ export type RefObject = {|
89 export type EventPriority = 0 | 1 | 2;
90
91 export const DiscreteEvent: EventPriority = 0;
92 -export const UserBlockingEvent: EventPriority = 1;
93 -export const ContinuousEvent: EventPriority = 2;
92 +export const ContinuousEvent: EventPriority = 1;
93 +export const DefaultEvent: EventPriority = 2;
94
95 export type ReactScope = {|
96 $$typeof: Symbol | number,