Skip to content

Commit ddf3597

Browse files
committed
change transition callback types
1 parent c1f5884 commit ddf3597

File tree

3 files changed

+20
-32
lines changed

3 files changed

+20
-32
lines changed

packages/react-reconciler/src/ReactFiberCommitWork.new.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2816,10 +2816,7 @@ function commitPassiveMountOnFiber(
28162816
// Initial render
28172817
if (committedTransitions !== null) {
28182818
committedTransitions.forEach(transition => {
2819-
addTransitionStartCallbackToPendingTransition({
2820-
transitionName: transition.name,
2821-
startTime: transition.startTime,
2822-
});
2819+
addTransitionStartCallbackToPendingTransition(transition);
28232820
});
28242821

28252822
clearTransitionsForLanes(finishedRoot, committedLanes);
@@ -2831,10 +2828,7 @@ function commitPassiveMountOnFiber(
28312828
pendingSuspenseBoundaries === null ||
28322829
pendingSuspenseBoundaries.size === 0
28332830
) {
2834-
addTransitionCompleteCallbackToPendingTransition({
2835-
transitionName: transition.name,
2836-
startTime: transition.startTime,
2837-
});
2831+
addTransitionCompleteCallbackToPendingTransition(transition);
28382832
incompleteTransitions.delete(transition);
28392833
}
28402834
},
@@ -2981,9 +2975,8 @@ function commitPassiveMountOnFiber(
29812975
) {
29822976
instance.transitions.forEach(transition => {
29832977
addMarkerCompleteCallbackToPendingTransition({
2984-
transitionName: transition.name,
2985-
startTime: transition.startTime,
2986-
markerName: finishedWork.memoizedProps.name,
2978+
transition,
2979+
name: finishedWork.memoizedProps.name,
29872980
});
29882981
});
29892982
instance.transitions = null;

packages/react-reconciler/src/ReactFiberTracingMarkerComponent.new.js

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@ import {getWorkInProgressTransitions} from './ReactFiberWorkLoop.new';
1717

1818
export type SuspenseInfo = {name: string | null};
1919

20-
export type TransitionObject = {
21-
transitionName: string,
22-
startTime: number,
20+
export type MarkerTransition = {
21+
transition: Transition,
22+
name: string,
2323
};
2424

25-
export type MarkerTransitionObject = TransitionObject & {markerName: string};
2625
export type PendingTransitionCallbacks = {
27-
transitionStart: Array<TransitionObject> | null,
28-
transitionComplete: Array<TransitionObject> | null,
29-
markerComplete: Array<MarkerTransitionObject> | null,
26+
transitionStart: Array<Transition> | null,
27+
transitionComplete: Array<Transition> | null,
28+
markerComplete: Array<MarkerTransition> | null,
3029
};
3130

3231
export type Transition = {
@@ -58,22 +57,19 @@ export function processTransitionCallbacks(
5857
if (transitionStart !== null) {
5958
transitionStart.forEach(transition => {
6059
if (callbacks.onTransitionStart != null) {
61-
callbacks.onTransitionStart(
62-
transition.transitionName,
63-
transition.startTime,
64-
);
60+
callbacks.onTransitionStart(transition.name, transition.startTime);
6561
}
6662
});
6763
}
6864

6965
const markerComplete = pendingTransitions.markerComplete;
7066
if (markerComplete !== null) {
71-
markerComplete.forEach(transition => {
67+
markerComplete.forEach(marker => {
7268
if (callbacks.onMarkerComplete != null) {
7369
callbacks.onMarkerComplete(
74-
transition.transitionName,
75-
transition.markerName,
76-
transition.startTime,
70+
marker.transition.name,
71+
marker.name,
72+
marker.transition.startTime,
7773
endTime,
7874
);
7975
}
@@ -85,7 +81,7 @@ export function processTransitionCallbacks(
8581
transitionComplete.forEach(transition => {
8682
if (callbacks.onTransitionComplete != null) {
8783
callbacks.onTransitionComplete(
88-
transition.transitionName,
84+
transition.name,
8985
transition.startTime,
9086
endTime,
9187
);

packages/react-reconciler/src/ReactFiberWorkLoop.new.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import type {FunctionComponentUpdateQueue} from './ReactFiberHooks.new';
1616
import type {EventPriority} from './ReactEventPriorities.new';
1717
import type {
1818
PendingTransitionCallbacks,
19-
TransitionObject,
20-
MarkerTransitionObject,
19+
MarkerTransition,
2120
Transition,
2221
} from './ReactFiberTracingMarkerComponent.new';
2322

@@ -332,7 +331,7 @@ export function getWorkInProgressTransitions() {
332331
let currentPendingTransitionCallbacks: PendingTransitionCallbacks | null = null;
333332

334333
export function addTransitionStartCallbackToPendingTransition(
335-
transition: TransitionObject,
334+
transition: Transition,
336335
) {
337336
if (enableTransitionTracing) {
338337
if (currentPendingTransitionCallbacks === null) {
@@ -352,7 +351,7 @@ export function addTransitionStartCallbackToPendingTransition(
352351
}
353352

354353
export function addMarkerCompleteCallbackToPendingTransition(
355-
transition: MarkerTransitionObject,
354+
transition: MarkerTransition,
356355
) {
357356
if (enableTransitionTracing) {
358357
if (currentPendingTransitionCallbacks === null) {
@@ -372,7 +371,7 @@ export function addMarkerCompleteCallbackToPendingTransition(
372371
}
373372

374373
export function addTransitionCompleteCallbackToPendingTransition(
375-
transition: TransitionObject,
374+
transition: Transition,
376375
) {
377376
if (enableTransitionTracing) {
378377
if (currentPendingTransitionCallbacks === null) {

0 commit comments

Comments
 (0)