Skip to content

Commit c0d5b8d

Browse files
gaearongaearon
committed
Put constants behind react-reconciler export
1 parent 6558bde commit c0d5b8d

File tree

10 files changed

+48
-66
lines changed

10 files changed

+48
-66
lines changed

‎packages/react-art/src/ReactARTHostConfig.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,11 @@
77

88
import Transform from 'art/core/transform';
99
import Mode from 'art/modes/current';
10-
import {enableNewReconciler} from 'shared/ReactFeatureFlags';
1110
import invariant from 'shared/invariant';
1211

1312
import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
1413

15-
import {DefaultLanePriority as DefaultLanePriority_old} from 'react-reconciler/src/ReactFiberLane.old';
16-
import {DefaultLanePriority as DefaultLanePriority_new} from 'react-reconciler/src/ReactFiberLane.new';
17-
18-
const DefaultLanePriority = enableNewReconciler
19-
? DefaultLanePriority_new
20-
: DefaultLanePriority_old;
14+
import {DefaultEventPriority} from 'react-reconciler';
2115

2216
const pooledTransform = new Transform();
2317

@@ -349,7 +343,7 @@ export function shouldSetTextContent(type, props) {
349343
}
350344

351345
export function getCurrentEventPriority() {
352-
return DefaultLanePriority;
346+
return DefaultEventPriority;
353347
}
354348

355349
// The ART renderer is secondary to the React DOM renderer.

‎packages/react-dom/src/client/ReactDOMHostConfig.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,10 @@ import {
6666
enableSuspenseServerRenderer,
6767
enableCreateEventHandleAPI,
6868
enableScopeAPI,
69-
enableNewReconciler,
7069
} from 'shared/ReactFeatureFlags';
7170
import {HostComponent, HostText} from 'react-reconciler/src/ReactWorkTags';
7271
import {listenToAllSupportedEvents} from '../events/DOMPluginEventSystem';
73-
74-
import {DefaultLanePriority as DefaultLanePriority_old} from 'react-reconciler/src/ReactFiberLane.old';
75-
import {DefaultLanePriority as DefaultLanePriority_new} from 'react-reconciler/src/ReactFiberLane.new';
76-
77-
const DefaultLanePriority = enableNewReconciler
78-
? DefaultLanePriority_new
79-
: DefaultLanePriority_old;
72+
import {DefaultEventPriority} from 'react-reconciler';
8073

8174
export type Type = string;
8275
export type Props = {
@@ -384,7 +377,7 @@ export function createTextInstance(
384377
export function getCurrentEventPriority(): * {
385378
const currentEvent = window.event;
386379
if (currentEvent === undefined) {
387-
return DefaultLanePriority;
380+
return DefaultEventPriority;
388381
}
389382
return getEventPriority(currentEvent.type);
390383
}

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

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,24 @@ import {
5050
} from './ReactDOMUpdateBatching';
5151

5252
import {
53-
InputDiscreteLanePriority as InputDiscreteLanePriority_old,
53+
DefaultEventPriority,
54+
DiscreteEventPriority,
55+
ContinuousEventPriority,
56+
} from 'react-reconciler';
57+
import {
5458
InputContinuousLanePriority as InputContinuousLanePriority_old,
55-
DefaultLanePriority as DefaultLanePriority_old,
5659
getCurrentUpdateLanePriority as getCurrentUpdateLanePriority_old,
5760
setCurrentUpdateLanePriority as setCurrentUpdateLanePriority_old,
5861
} from 'react-reconciler/src/ReactFiberLane.old';
5962
import {
60-
InputDiscreteLanePriority as InputDiscreteLanePriority_new,
6163
InputContinuousLanePriority as InputContinuousLanePriority_new,
62-
DefaultLanePriority as DefaultLanePriority_new,
6364
getCurrentUpdateLanePriority as getCurrentUpdateLanePriority_new,
6465
setCurrentUpdateLanePriority as setCurrentUpdateLanePriority_new,
6566
} from 'react-reconciler/src/ReactFiberLane.new';
6667

67-
const InputDiscreteLanePriority = enableNewReconciler
68-
? InputDiscreteLanePriority_new
69-
: InputDiscreteLanePriority_old;
7068
const InputContinuousLanePriority = enableNewReconciler
7169
? InputContinuousLanePriority_new
7270
: InputContinuousLanePriority_old;
73-
const DefaultLanePriority = enableNewReconciler
74-
? DefaultLanePriority_new
75-
: DefaultLanePriority_old;
7671
const getCurrentUpdateLanePriority = enableNewReconciler
7772
? getCurrentUpdateLanePriority_new
7873
: getCurrentUpdateLanePriority_old;
@@ -119,13 +114,13 @@ export function createEventListenerWrapperWithPriority(
119114
const eventPriority = getEventPriority(domEventName);
120115
let listenerWrapper;
121116
switch (eventPriority) {
122-
case InputDiscreteLanePriority:
117+
case DiscreteEventPriority:
123118
listenerWrapper = dispatchDiscreteEvent;
124119
break;
125-
case InputContinuousLanePriority:
120+
case ContinuousEventPriority:
126121
listenerWrapper = dispatchContinuousEvent;
127122
break;
128-
case DefaultLanePriority:
123+
case DefaultEventPriority:
129124
default:
130125
listenerWrapper = dispatchEvent;
131126
break;
@@ -397,7 +392,7 @@ export function getEventPriority(domEventName: DOMEventName): * {
397392
// eslint-disable-next-line no-fallthrough
398393
case 'beforeblur':
399394
case 'afterblur':
400-
return InputDiscreteLanePriority;
395+
return DiscreteEventPriority;
401396
case 'drag':
402397
case 'dragenter':
403398
case 'dragexit':
@@ -413,8 +408,8 @@ export function getEventPriority(domEventName: DOMEventName): * {
413408
case 'toggle':
414409
case 'touchmove':
415410
case 'wheel':
416-
return InputContinuousLanePriority;
411+
return ContinuousEventPriority;
417412
default:
418-
return DefaultLanePriority;
413+
return DefaultEventPriority;
419414
}
420415
}

‎packages/react-native-renderer/src/ReactFabricHostConfig.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,11 @@ import type {
2121
import {mountSafeCallback_NOT_REALLY_SAFE} from './NativeMethodsMixinUtils';
2222
import {create, diff} from './ReactNativeAttributePayload';
2323

24-
import {enableNewReconciler} from 'shared/ReactFeatureFlags';
2524
import invariant from 'shared/invariant';
2625

2726
import {dispatchEvent} from './ReactFabricEventEmitter';
2827

29-
import {DefaultLanePriority as DefaultLanePriority_old} from 'react-reconciler/src/ReactFiberLane.old';
30-
import {DefaultLanePriority as DefaultLanePriority_new} from 'react-reconciler/src/ReactFiberLane.new';
31-
32-
const DefaultLanePriority = enableNewReconciler
33-
? DefaultLanePriority_new
34-
: DefaultLanePriority_old;
28+
import {DefaultEventPriority} from 'react-reconciler';
3529

3630
// Modules provided by RN:
3731
import {
@@ -348,7 +342,7 @@ export function shouldSetTextContent(type: string, props: Props): boolean {
348342
}
349343

350344
export function getCurrentEventPriority(): * {
351-
return DefaultLanePriority;
345+
return DefaultEventPriority;
352346
}
353347

354348
// The Fabric renderer is secondary to the existing React Native renderer.

‎packages/react-native-renderer/src/ReactNativeHostConfig.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import type {TouchedViewDataAtPoint} from './ReactNativeTypes';
1111

1212
import invariant from 'shared/invariant';
13-
import {enableNewReconciler} from 'shared/ReactFeatureFlags';
1413

1514
// Modules provided by RN:
1615
import {
@@ -27,12 +26,7 @@ import {
2726
} from './ReactNativeComponentTree';
2827
import ReactNativeFiberHostComponent from './ReactNativeFiberHostComponent';
2928

30-
import {DefaultLanePriority as DefaultLanePriority_old} from 'react-reconciler/src/ReactFiberLane.old';
31-
import {DefaultLanePriority as DefaultLanePriority_new} from 'react-reconciler/src/ReactFiberLane.new';
32-
33-
const DefaultLanePriority = enableNewReconciler
34-
? DefaultLanePriority_new
35-
: DefaultLanePriority_old;
29+
import {DefaultEventPriority} from 'react-reconciler';
3630

3731
const {get: getViewConfigForType} = ReactNativeViewConfigRegistry;
3832

@@ -270,7 +264,7 @@ export function shouldSetTextContent(type: string, props: Props): boolean {
270264
}
271265

272266
export function getCurrentEventPriority(): * {
273-
return DefaultLanePriority;
267+
return DefaultEventPriority;
274268
}
275269

276270
// -------------------

‎packages/react-noop-renderer/src/createReactNoop.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,12 @@ import {
2626
BlockingRoot,
2727
LegacyRoot,
2828
} from 'react-reconciler/src/ReactRootTags';
29+
import {DefaultEventPriority} from 'react-reconciler';
2930

3031
import ReactSharedInternals from 'shared/ReactSharedInternals';
3132
import enqueueTask from 'shared/enqueueTask';
32-
import {enableNewReconciler} from 'shared/ReactFeatureFlags';
3333
const {IsSomeRendererActing} = ReactSharedInternals;
3434

35-
import {DefaultLanePriority as DefaultLanePriority_old} from 'react-reconciler/src/ReactFiberLane.old';
36-
import {DefaultLanePriority as DefaultLanePriority_new} from 'react-reconciler/src/ReactFiberLane.new';
37-
38-
const DefaultLanePriority = enableNewReconciler
39-
? DefaultLanePriority_new
40-
: DefaultLanePriority_old;
41-
4235
type Container = {
4336
rootID: string,
4437
children: Array<Instance | TextInstance>,
@@ -400,7 +393,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
400393
resetAfterCommit(): void {},
401394

402395
getCurrentEventPriority() {
403-
return DefaultLanePriority;
396+
return DefaultEventPriority;
404397
},
405398

406399
now: Scheduler.unstable_now,

‎packages/react-reconciler/src/ReactFiberReconciler.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ import {
5252
registerMutableSourceForHydration as registerMutableSourceForHydration_old,
5353
runWithPriority as runWithPriority_old,
5454
getCurrentUpdateLanePriority as getCurrentUpdateLanePriority_old,
55+
DefaultEventPriority as DefaultEventPriority_old,
56+
DiscreteEventPriority as DiscreteEventPriority_old,
57+
ContinuousEventPriority as ContinuousEventPriority_old,
5558
} from './ReactFiberReconciler.old';
5659

5760
import {
@@ -92,6 +95,9 @@ import {
9295
registerMutableSourceForHydration as registerMutableSourceForHydration_new,
9396
runWithPriority as runWithPriority_new,
9497
getCurrentUpdateLanePriority as getCurrentUpdateLanePriority_new,
98+
DefaultEventPriority as DefaultEventPriority_new,
99+
DiscreteEventPriority as DiscreteEventPriority_new,
100+
ContinuousEventPriority as ContinuousEventPriority_new,
95101
} from './ReactFiberReconciler.new';
96102

97103
export const createContainer = enableNewReconciler
@@ -168,6 +174,15 @@ export const createPortal = enableNewReconciler
168174
export const createComponentSelector = enableNewReconciler
169175
? createComponentSelector_new
170176
: createComponentSelector_old;
177+
export const DefaultEventPriority = enableNewReconciler
178+
? DefaultEventPriority_new
179+
: DefaultEventPriority_old;
180+
export const DiscreteEventPriority = enableNewReconciler
181+
? DiscreteEventPriority_new
182+
: DiscreteEventPriority_old;
183+
export const ContinuousEventPriority = enableNewReconciler
184+
? ContinuousEventPriority_new
185+
: ContinuousEventPriority_old;
171186

172187
//TODO: "psuedo" is spelled "pseudo"
173188
export const createHasPsuedoClassSelector = enableNewReconciler

‎packages/react-reconciler/src/ReactFiberReconciler.new.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ import {
9494
} from './ReactFiberHotReloading.new';
9595
import {markRenderScheduled} from './SchedulingProfiler';
9696

97+
export {
98+
InputDiscreteLanePriority as DiscreteEventPriority,
99+
InputContinuousLanePriority as ContinuousEventPriority,
100+
DefaultLanePriority as DefaultEventPriority,
101+
} from './ReactFiberLane.new';
97102
export {registerMutableSourceForHydration} from './ReactMutableSource.new';
98103
export {createPortal} from './ReactPortal';
99104
export {

‎packages/react-reconciler/src/ReactFiberReconciler.old.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ import {
9494
} from './ReactFiberHotReloading.old';
9595
import {markRenderScheduled} from './SchedulingProfiler';
9696

97+
export {
98+
InputDiscreteLanePriority as DiscreteEventPriority,
99+
InputContinuousLanePriority as ContinuousEventPriority,
100+
DefaultLanePriority as DefaultEventPriority,
101+
} from './ReactFiberLane.old';
97102
export {registerMutableSourceForHydration} from './ReactMutableSource.new';
98103
export {createPortal} from './ReactPortal';
99104
export {

‎packages/react-test-renderer/src/ReactTestHostConfig.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@
88
*/
99

1010
import {REACT_OPAQUE_ID_TYPE} from 'shared/ReactSymbols';
11-
12-
import {DefaultLanePriority as DefaultLanePriority_old} from 'react-reconciler/src/ReactFiberLane.old';
13-
import {DefaultLanePriority as DefaultLanePriority_new} from 'react-reconciler/src/ReactFiberLane.new';
14-
15-
const DefaultLanePriority = enableNewReconciler
16-
? DefaultLanePriority_new
17-
: DefaultLanePriority_old;
11+
import {DefaultEventPriority} from 'react-reconciler';
1812

1913
export type Type = string;
2014
export type Props = Object;
@@ -221,7 +215,7 @@ export function createTextInstance(
221215
}
222216

223217
export function getCurrentEventPriority(): * {
224-
return DefaultLanePriority;
218+
return DefaultEventPriority;
225219
}
226220

227221
export const isPrimaryRenderer = false;

0 commit comments

Comments
 (0)