From fbeb09734b268b6e2ea7c81f9321d42810517657 Mon Sep 17 00:00:00 2001 From: Lee-Orr Date: Wed, 20 Mar 2024 18:35:46 -0400 Subject: [PATCH 1/3] Update studio/src/anim/timeline_animation.rs Co-authored-by: Danny McGee --- studio/src/anim/timeline_animation.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studio/src/anim/timeline_animation.rs b/studio/src/anim/timeline_animation.rs index 02e5c9c..754bc66 100644 --- a/studio/src/anim/timeline_animation.rs +++ b/studio/src/anim/timeline_animation.rs @@ -624,7 +624,7 @@ mod wasm { export interface UpdateKeyframes extends CustomEvent { type: "update-keyframes", - details: { + detail: { added: Record, removed: string[] } From 81cc85881a82380e1d986a76281d2492d58506bc Mon Sep 17 00:00:00 2001 From: Lee-Orr Date: Wed, 20 Mar 2024 18:36:21 -0400 Subject: [PATCH 2/3] Update studio-frontend/src/app/anim-editor.element.ts Co-authored-by: Danny McGee --- studio-frontend/src/app/anim-editor.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studio-frontend/src/app/anim-editor.element.ts b/studio-frontend/src/app/anim-editor.element.ts index 1e88bc6..871f104 100644 --- a/studio-frontend/src/app/anim-editor.element.ts +++ b/studio-frontend/src/app/anim-editor.element.ts @@ -39,7 +39,7 @@ export class AnimEditorElement extends LitElement { @state() keyframes : Record = {}; - @state() selected_track : { track: string } | {outside_entity: string } | false = false; + @state() selectedTrack?: { track: string } | { outsideEntity: string }; trackCount(): number { return Object.keys(this.tracks).length; From 4df40708e3b7a20826e754f3003e0ade35d0fb08 Mon Sep 17 00:00:00 2001 From: Lee-Orr Date: Wed, 20 Mar 2024 18:37:06 -0400 Subject: [PATCH 3/3] Update studio-frontend/src/app/anim-editor.element.ts Co-authored-by: Danny McGee --- studio-frontend/src/app/anim-editor.element.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/studio-frontend/src/app/anim-editor.element.ts b/studio-frontend/src/app/anim-editor.element.ts index 871f104..995ee0b 100644 --- a/studio-frontend/src/app/anim-editor.element.ts +++ b/studio-frontend/src/app/anim-editor.element.ts @@ -242,8 +242,12 @@ export class AnimEditorElement extends LitElement { track_order_hashed[track] = index; } - const selected = typeof this.selected_track === "object" && "track" in this.selected_track ? this.selected_track.track : false; - const can_add_selected = typeof this.selected_track === "object" && "outside_entity" in this.selected_track ? this.selected_track.outside_entity : false; + const selected = !isOutsideEntity(this.selectedTrack) + ? this.selectedTrack.track + : false; + const canAddSelected = isOutsideEntity(this.selectedTrack) + ? this.selectedTrack.outsideEntity + : false; let length = this.timelineEnd - this.timelineStart; let clip_start = (this.clipStart - this.timelineStart) / length;