Skip to content

fix: timeline selection ui #1348

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
ameer2468 merged 2 commits into from
Nov 4, 2025
Merged

fix: timeline selection ui #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49d4451
Update ConfigSidebar.tsx
ameer2468 Nov 4, 2025
31093a1
Update Header.tsx
ameer2468 Nov 4, 2025
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
30 changes: 19 additions & 11 deletions apps/desktop/src/routes/editor/ConfigSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,9 @@ export function ConfigSidebar() {
"--margin-top-scroll": "5px",
}}
class="custom-scroll overflow-x-hidden overflow-y-scroll text-[0.875rem] flex-1 min-h-0"
classList={{
hidden: !!editorState.timeline.selection,
}}
>
<BackgroundConfig scrollRef={scrollRef} />
<CameraConfig scrollRef={scrollRef} />
Expand Down Expand Up @@ -645,14 +648,19 @@ export function ConfigSidebar() {
<CaptionsTab />
</KTabs.Content>
</div>
<Show when={editorState.timeline.selection}>
{(selection) => (
<div
style={{
"--margin-top-scroll": "5px",
}}
class="absolute custom-scroll p-5 top-16 left-0 right-0 bottom-0 text-[0.875rem] space-y-4 bg-gray-1 dark:bg-gray-2 z-50 animate-in slide-in-from-bottom-2 fade-in"
>
<div
style={{
"--margin-top-scroll": "5px",
}}
class="custom-scroll p-5 top-16 left-0 right-0 bottom-0 text-[0.875rem] space-y-4 bg-gray-1 dark:bg-gray-2 z-50"
classList={{
hidden: !editorState.timeline.selection,
"animate-in slide-in-from-bottom-2 fade-in":
!!editorState.timeline.selection,
}}
>
<Show when={editorState.timeline.selection}>
{(selection) => (
<Suspense>
<Show
when={(() => {
Expand Down Expand Up @@ -872,9 +880,9 @@ export function ConfigSidebar() {
)}
</Show>
</Suspense>
</div>
)}
</Show>
)}
</Show>
</div>
</KTabs>
);
}
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/src/routes/editor/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ export function Header() {
}}
tooltipText="Captions"
leftIcon={<IconCapCaptions class="w-5" />}
comingSoon={!editorState.timeline.selection}
comingSoon={true}
/>
<EditorButton
onClick={() => {
if (clearTimelineSelection()) return;
}}
tooltipText="Performance"
leftIcon={<IconCapGauge class="w-[18px]" />}
comingSoon={!editorState.timeline.selection}
comingSoon={true}
/>
</div>

Expand Down