Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export type SuspenseTreeState = {
hoveredTimelineIndex: number | -1,
uniqueSuspendersOnly: boolean,
playing: boolean,
autoSelect: boolean,
};

type ACTION_SUSPENSE_TREE_MUTATION = {
Expand Down Expand Up @@ -123,6 +124,7 @@ function getInitialState(store: Store): SuspenseTreeState {
hoveredTimelineIndex: -1,
uniqueSuspendersOnly,
playing: false,
autoSelect: true,
};

return initialState;
Expand Down Expand Up @@ -181,7 +183,10 @@ function SuspenseTreeContextController({children}: Props): React.Node {
selectedTimelineID === null || nextTimeline.length === 0
? -1
: nextTimeline.indexOf(selectedTimelineID);
if (nextTimeline.length > 0 && nextTimelineIndex === -1) {
if (
nextTimeline.length > 0 &&
(nextTimelineIndex === -1 || state.autoSelect)
) {
nextTimelineIndex = nextTimeline.length - 1;
selectedSuspenseID = nextTimeline[nextTimelineIndex];
}
Expand Down Expand Up @@ -212,6 +217,7 @@ function SuspenseTreeContextController({children}: Props): React.Node {
...state,
selectedSuspenseID,
playing: false, // pause
autoSelect: false,
};
}
case 'SET_SUSPENSE_LINEAGE': {
Expand All @@ -223,6 +229,7 @@ function SuspenseTreeContextController({children}: Props): React.Node {
lineage,
selectedSuspenseID: suspenseID,
playing: false, // pause
autoSelect: false,
};
}
case 'SET_SUSPENSE_TIMELINE': {
Expand Down Expand Up @@ -277,6 +284,7 @@ function SuspenseTreeContextController({children}: Props): React.Node {
selectedSuspenseID: nextSelectedSuspenseID,
timelineIndex: nextTimelineIndex,
playing: false, // pause
autoSelect: false,
};
}
case 'SUSPENSE_SKIP_TIMELINE_INDEX': {
Expand All @@ -299,6 +307,7 @@ function SuspenseTreeContextController({children}: Props): React.Node {
selectedSuspenseID: nextSelectedSuspenseID,
timelineIndex: nextTimelineIndex,
playing: false, // pause
autoSelect: false,
};
}
case 'SUSPENSE_PLAY_PAUSE': {
Expand All @@ -325,6 +334,7 @@ function SuspenseTreeContextController({children}: Props): React.Node {
selectedSuspenseID: nextSelectedSuspenseID,
timelineIndex: nextTimelineIndex,
playing: mode === 'toggle' ? !state.playing : mode === 'play',
autoSelect: false,
};
}
case 'SUSPENSE_PLAY_TICK': {
Expand Down Expand Up @@ -381,6 +391,7 @@ function SuspenseTreeContextController({children}: Props): React.Node {
selectedSuspenseID: nextSelectedSuspenseID,
timelineIndex: nextTimelineIndex,
playing: false, // pause
autoSelect: false,
};
}
case 'HOVER_TIMELINE_FOR_ID': {
Expand Down
Loading