Skip to content

Commit 9c3315b

Browse files
committed
old
1 parent a009f7f commit 9c3315b

File tree

2 files changed

+50
-15
lines changed

2 files changed

+50
-15
lines changed

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

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ import {createCursor, push, pop} from './ReactFiberStack.old';
1717
export type SuspenseInfo = {name: string | null};
1818

1919
export type TransitionObject = {
20+
markerName?: string,
2021
transitionName: string,
2122
startTime: number,
2223
};
2324

2425
export type PendingTransitionCallbacks = {
2526
transitionStart: Array<TransitionObject> | null,
2627
transitionComplete: Array<TransitionObject> | null,
28+
markerComplete: Array<TransitionObject> | null,
2729
};
2830

2931
export type Transition = {
@@ -47,27 +49,38 @@ export function processTransitionCallbacks(
4749
if (enableTransitionTracing) {
4850
if (pendingTransitions !== null) {
4951
const transitionStart = pendingTransitions.transitionStart;
50-
if (transitionStart !== null) {
52+
if (transitionStart !== null && callbacks.onTransitionStart != null) {
5153
transitionStart.forEach(transition => {
52-
if (callbacks.onTransitionStart != null) {
53-
callbacks.onTransitionStart(
54-
transition.transitionName,
55-
transition.startTime,
56-
);
57-
}
54+
callbacks.onTransitionStart(
55+
transition.transitionName,
56+
transition.startTime,
57+
);
58+
});
59+
}
60+
61+
const markerComplete = pendingTransitions.markerComplete;
62+
if (markerComplete !== null && callbacks.onMarkerComplete != null) {
63+
markerComplete.forEach(transition => {
64+
callbacks.onMarkerComplete(
65+
transition.transitionName,
66+
transition.markerName,
67+
transition.startTime,
68+
endTime,
69+
);
5870
});
5971
}
6072

6173
const transitionComplete = pendingTransitions.transitionComplete;
62-
if (transitionComplete !== null) {
74+
if (
75+
transitionComplete !== null &&
76+
callbacks.onTransitionComplete != null
77+
) {
6378
transitionComplete.forEach(transition => {
64-
if (callbacks.onTransitionComplete != null) {
65-
callbacks.onTransitionComplete(
66-
transition.transitionName,
67-
transition.startTime,
68-
endTime,
69-
);
70-
}
79+
callbacks.onTransitionComplete(
80+
transition.transitionName,
81+
transition.startTime,
82+
endTime,
83+
);
7184
});
7285
}
7386
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ export function addTransitionStartCallbackToPendingTransition(
349349
currentPendingTransitionCallbacks = {
350350
transitionStart: [],
351351
transitionComplete: null,
352+
markerComplete: null,
352353
};
353354
}
354355

@@ -360,6 +361,26 @@ export function addTransitionStartCallbackToPendingTransition(
360361
}
361362
}
362363

364+
export function addMarkerCompleteCallbackToPendingTransition(
365+
transition: TransitionObject,
366+
) {
367+
if (enableTransitionTracing) {
368+
if (currentPendingTransitionCallbacks === null) {
369+
currentPendingTransitionCallbacks = {
370+
transitionStart: null,
371+
transitionComplete: null,
372+
markerComplete: [],
373+
};
374+
}
375+
}
376+
377+
if (currentPendingTransitionCallbacks.markerComplete === null) {
378+
currentPendingTransitionCallbacks.markerComplete = [];
379+
}
380+
381+
currentPendingTransitionCallbacks.markerComplete.push(transition);
382+
}
383+
363384
export function addTransitionCompleteCallbackToPendingTransition(
364385
transition: TransitionObject,
365386
) {
@@ -368,6 +389,7 @@ export function addTransitionCompleteCallbackToPendingTransition(
368389
currentPendingTransitionCallbacks = {
369390
transitionStart: null,
370391
transitionComplete: [],
392+
markerComplete: null,
371393
};
372394
}
373395

0 commit comments

Comments
 (0)