Skip to content

Proper insert location and delete selection behavior #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
subdavis merged 1 commit into from
Feb 18, 2021
Merged

Proper insert location and delete selection behavior #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions client/dive-common/use/useModeManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function useModeManager({
recipes: Recipe[];
selectTrack: (trackId: TrackId | null, edit: boolean) => void;
selectNextTrack: (delta?: number) => TrackId | null;
addTrack: (frame: number, defaultType: string) => Track;
addTrack: (frame: number, defaultType: string, afterId?: TrackId) => Track;
removeTrack: (trackId: TrackId) => void;
}) {
let creating = false;
Expand Down Expand Up @@ -135,7 +135,9 @@ export default function useModeManager({

function handleAddTrackOrDetection(): TrackId {
// Handles adding a new track with the NewTrack Settings
const newTrackId = addTrack(frame.value, newTrackSettings.type).trackId;
const newTrackId = addTrack(
frame.value, newTrackSettings.type, selectedTrackId.value || undefined,
).trackId;
selectTrack(newTrackId, true);
creating = true;
return newTrackId;
Expand Down Expand Up @@ -341,15 +343,16 @@ export default function useModeManager({
}

function handleRemoveTrack(trackIds: TrackId[]) {
/* Figure out next track ID */
const maybeNextTrackId = selectNextTrack(1);
const previousOrNext = maybeNextTrackId !== null
? maybeNextTrackId
: selectNextTrack(-1);
/* Delete track */
trackIds.forEach((trackId) => {
removeTrack(trackId);
});
if (selectedTrackId.value !== null) {
if (trackIds.includes(selectedTrackId.value)) {
const newTrack = selectNextTrack(1) !== null ? selectNextTrack(1) : selectNextTrack(-1);
selectTrack(newTrack, false);
}
}
selectTrack(previousOrNext, false);
}

/** Toggle editing mode for track */
Expand Down
14 changes: 10 additions & 4 deletions client/src/use/useTrackStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,26 @@ export default function useTrackStore({ markChangesPending }: UseTrackStoreParam
markChangesPending('upsert', track);
}

function insertTrack(track: Track) {
function insertTrack(track: Track, afterId?: TrackId) {
track.bus.$on('notify', onChange);
trackMap.set(track.trackId, track);
intervalTree.insert([track.begin, track.end], track.trackId.toString());
trackIds.value.push(track.trackId);
if (afterId) {
/* Insert specifically after another trackId */
const insertIndex = trackIds.value.indexOf(afterId) + 1;
trackIds.value.splice(insertIndex, 0, track.trackId);
} else {
trackIds.value.push(track.trackId);
}
}

function addTrack(frame: number, defaultType: string): Track {
function addTrack(frame: number, defaultType: string, afterId?: TrackId): Track {
const track = new Track(getNewTrackId(), {
begin: frame,
end: frame,
confidencePairs: [[defaultType, 1]],
});
insertTrack(track);
insertTrack(track, afterId);
markChangesPending('upsert', track);
return track;
}
Expand Down