Skip to content

The VS Code of video editing, built for agents.

TypeScript

Refactor timeline management in layout context and update related components

konstantin-pauluse0e464dd0f3e
diff --git a/apps/web/src/components/sidebar-left/project-menu/view-menu.tsx b/apps/web/src/components/sidebar-left/project-menu/view-menu.tsx
index 26bda6fb..cce815af 100644
--- a/apps/web/src/components/sidebar-left/project-menu/view-menu.tsx
+++ b/apps/web/src/components/sidebar-left/project-menu/view-menu.tsx
@@ -53,7 +53,7 @@ export function ViewMenu() {
<DropdownMenuItem onSelect={layout.toggleUI}>
Toggle UI
</DropdownMenuItem>
- <DropdownMenuItem onSelect={layout.toggleTimelineMinimized}>
+ <DropdownMenuItem onSelect={layout.toggleTimeline}>
Toggle timeline
</DropdownMenuItem>
</DropdownMenuGroup>
diff --git a/apps/web/src/components/timeline/layers/layers.tsx b/apps/web/src/components/timeline/layers/layers.tsx
index c42a29ee..a6dbfb93 100644
--- a/apps/web/src/components/timeline/layers/layers.tsx
+++ b/apps/web/src/components/timeline/layers/layers.tsx
@@ -41,7 +41,7 @@ export function Layers() {
const timeline = useTimeline();
const { world } = useEngine();
const { now, playing, looping } = useECS();
- const { timelineMinimized, toggleTimelineMinimized } = useLayout();
+ const { timelineMinimized, toggleTimeline } = useLayout();
const c = world.components;
const timelineIndex = world.timelineIndex;
@@ -96,7 +96,7 @@ export function Layers() {
const handleHeaderDoubleClick = (e: MouseEvent) => {
if ((e.target as HTMLElement).closest('button')) return;
- toggleTimelineMinimized();
+ toggleTimeline();
}
createEffect(() => {
diff --git a/apps/web/src/context/layout.tsx b/apps/web/src/context/layout.tsx
index d5288bbd..40b39b0c 100644
--- a/apps/web/src/context/layout.tsx
+++ b/apps/web/src/context/layout.tsx
@@ -8,14 +8,12 @@ import { createStoredSignal } from '@/lib/store';
import { store } from '@/init';
type LayoutContextValue = {
- sidebarsVisible: Accessor<boolean>;
- timelineVisible: Accessor<boolean>;
+ uiVisible: Accessor<boolean>;
timelineMinimized: Accessor<boolean>;
timelineHeight: Accessor<number>;
setTimelineHeight(height: number): void;
toggleUI(): void;
toggleTimeline(): void;
- toggleTimelineMinimized(): void;
};
const LayoutContext = createContext<LayoutContextValue>();
@@ -24,13 +22,10 @@ export const MIN_TIMELINE_HEIGHT = 120;
export const DEFAULT_TIMELINE_HEIGHT = 234;
export function LayoutProvider(props: { children: JSX.Element }) {
- const [sidebarsVisible, setSidebarsVisible] = createStoredSignal(
- store.define<boolean>('layout.sidebarsVisible', true),
+ const [uiVisible, setUiVisible] = createStoredSignal(
+ store.define<boolean>('layout.uiVisible', true),
);
- const [timelinePreferred, setTimelinePreferred] = createStoredSignal(
- store.define<boolean>('layout.timelineVisible', true),
- );
const [timelineHeight, setTimelineHeight] = createStoredSignal(
store.define<number>('layout.timelineHeight', DEFAULT_TIMELINE_HEIGHT),
);
@@ -38,31 +33,18 @@ export function LayoutProvider(props: { children: JSX.Element }) {
store.define<boolean>('layout.timelineMinimized', false),
);
- const timelineVisible = () => sidebarsVisible() && timelinePreferred();
-
- const toggleUI = () => {
- setSidebarsVisible(!sidebarsVisible());
- };
-
- const toggleTimeline = () => {
- setTimelinePreferred(!timelinePreferred());
- };
-
- const toggleTimelineMinimized = () => {
- setTimelineMinimized(!timelineMinimized());
- };
+ const toggleUI = () => setUiVisible(!uiVisible());
+ const toggleTimeline = () => setTimelineMinimized(!timelineMinimized());
return (
<LayoutContext.Provider
value={{
- sidebarsVisible,
- timelineVisible,
+ uiVisible,
timelineMinimized,
timelineHeight,
setTimelineHeight,
toggleUI,
toggleTimeline,
- toggleTimelineMinimized,
}}>
{props.children}
</LayoutContext.Provider>
diff --git a/apps/web/src/pages/editor.tsx b/apps/web/src/pages/editor.tsx
index 58d748ba..228f0708 100644
--- a/apps/web/src/pages/editor.tsx
+++ b/apps/web/src/pages/editor.tsx
@@ -14,12 +14,12 @@ import { RULER_HEIGHT } from "@/components/engine/timeline/config";
const MIN_CANVAS_HEIGHT = 200;
export function EditorPage() {
- const { sidebarsVisible, timelineVisible, timelineMinimized, timelineHeight, setTimelineHeight } = useLayout();
+ const { uiVisible, timelineMinimized, timelineHeight, setTimelineHeight } = useLayout();
const { isDesktop, isFullscreen } = useEditorApi();
const [resizing, setResizing] = createSignal(false);
const timelineStyles = createMemo(() => {
- if (!timelineVisible()) return;
+ if (!uiVisible()) return;
const height = timelineMinimized() ? RULER_HEIGHT : timelineHeight();
@@ -59,25 +59,25 @@ export function EditorPage() {
<div
class="bg-sidebar h-screen w-full overflow-hidden grid"
classList={{
- 'grid-cols-[264px_1px_1fr_1px_264px]': sidebarsVisible(),
- 'grid-cols-[1fr]': !sidebarsVisible(),
- 'grid-rows-[1fr]': !timelineVisible(),
+ 'grid-cols-[264px_1px_1fr_1px_264px]': uiVisible(),
+ 'grid-cols-[1fr]': !uiVisible(),
+ 'grid-rows-[1fr]': !uiVisible(),
}}
style={timelineStyles()}
>
<Show when={isDesktop && !isFullscreen()}>
<div class="fixed top-0 left-0 right-0 h-10 z-20" style="-webkit-app-region: drag;" />
</Show>
- <Show when={sidebarsVisible()}>
+ <Show when={uiVisible()}>
<SidebarLeft />
<div class="bg-border-strong" />
</Show>
<Canvas />
- <Show when={sidebarsVisible()}>
+ <Show when={uiVisible()}>
<div class="bg-border-strong" />
<Inspector />
</Show>
- <Show when={timelineVisible()}>
+ <Show when={uiVisible()}>
<div class="col-span-full bg-border-strong relative">
<Show when={!timelineMinimized()}>
<div
@@ -92,20 +92,20 @@ export function EditorPage() {
</Show>
</div>
</Show>
- <Show when={timelineVisible()}>
+ <Show when={uiVisible()}>
<Layers />
<div class="bg-border-strong" />
</Show>
- <Show when={timelineVisible()}>
+ <Show when={uiVisible()}>
<Timeline />
</Show>
- <Show when={timelineVisible()}>
+ <Show when={uiVisible()}>
<div class="bg-border-strong" />
<Show when={!timelineMinimized()}>
<Soundboard />
</Show>
</Show>
- <Show when={!sidebarsVisible()}>
+ <Show when={!uiVisible()}>
<FloatingProjectHeader />
</Show>
</div>