Skip to content
Merged
Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions packages/studio/src/components/StudioLeftSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function StudioLeftSidebar({
const {
leftCollapsed,
leftWidth,
setLeftWidth,
adjustPanelWidth,
toggleLeftSidebar,
handlePanelResizeStart,
handlePanelResizeMove,
Expand Down Expand Up @@ -173,8 +173,7 @@ export function StudioLeftSidebar({
if (e.key !== "ArrowLeft" && e.key !== "ArrowRight") return;
e.preventDefault();
const delta = e.key === "ArrowLeft" ? -16 : 16;
const maxLeft = Math.floor(window.innerWidth * 0.5);
setLeftWidth(Math.max(160, Math.min(maxLeft, leftWidth + delta)));
adjustPanelWidth("left", delta);
}}
>
{/* Expanded hit zone: 8px wide, centered on the 3px seam */}
Expand Down
6 changes: 3 additions & 3 deletions packages/studio/src/components/StudioRightPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export function StudioRightPanel({
}: StudioRightPanelProps) {
const {
rightWidth,
setRightWidth,
adjustPanelWidth,
rightPanelTab,
setRightPanelTab,
rightInspectorPanes,
Expand Down Expand Up @@ -464,7 +464,7 @@ export function StudioRightPanel({
e.preventDefault();
// Panel is right-anchored: ArrowLeft grows it, ArrowRight shrinks it.
const delta = e.key === "ArrowLeft" ? 16 : -16;
setRightWidth(Math.max(160, Math.min(600, rightWidth + delta)));
adjustPanelWidth("right", delta);
}}
>
{/* Expanded hit zone: 8px wide, centered on the 3px seam */}
Expand All @@ -473,7 +473,7 @@ export function StudioRightPanel({
<div className="absolute top-1/2 left-0 h-[52px] w-[3px] -translate-y-1/2 bg-white/12 transition-colors group-hover:bg-white/18 group-active:bg-white/24" />
</div>
<div
className="flex min-w-0 flex-shrink-0 flex-col overflow-hidden rounded-lg border border-neutral-800 bg-neutral-900"
className="flex min-w-0 flex-shrink-0 flex-col overflow-hidden rounded-lg border border-neutral-800 bg-neutral-950"
style={{ width: rightWidth }}
>
{captionEditMode ? (
Expand Down
2 changes: 1 addition & 1 deletion packages/studio/src/components/nle/NLEContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { useAssetPreviewStore } from "../../utils/assetPreviewStore";

// Timeline gets a generous default height so the preview isn't oversized and the
// tracks have room to breathe (CapCut-style). Users can still drag the divider.
const DEFAULT_TIMELINE_H = 340;
const DEFAULT_TIMELINE_H = 360;

export function shouldDisableTimelineWhileCompositionLoading(compositionLoading: boolean): boolean {
return compositionLoading;
Expand Down
9 changes: 3 additions & 6 deletions packages/studio/src/contexts/PanelLayoutContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ export function usePanelLayoutContext(): PanelLayoutValue {
export function PanelLayoutProvider({
value: {
leftWidth,
setLeftWidth,
rightWidth,
setRightWidth,
adjustPanelWidth,
leftCollapsed,
setLeftCollapsed,
rightCollapsed,
Expand All @@ -39,9 +38,8 @@ export function PanelLayoutProvider({
const stable = useMemo<PanelLayoutValue>(
() => ({
leftWidth,
setLeftWidth,
rightWidth,
setRightWidth,
adjustPanelWidth,
leftCollapsed,
setLeftCollapsed,
rightCollapsed,
Expand All @@ -58,9 +56,8 @@ export function PanelLayoutProvider({
}),
[
leftWidth,
setLeftWidth,
rightWidth,
setRightWidth,
adjustPanelWidth,
leftCollapsed,
setLeftCollapsed,
rightCollapsed,
Expand Down
69 changes: 68 additions & 1 deletion packages/studio/src/hooks/usePanelLayout.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,30 @@

import React, { act } from "react";
import { createRoot } from "react-dom/client";
import { afterEach, describe, expect, it, vi } from "vitest";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { readStudioUiPreferences } from "../utils/studioUiPreferences";
import { usePanelLayout } from "./usePanelLayout";

(globalThis as unknown as { IS_REACT_ACT_ENVIRONMENT: boolean }).IS_REACT_ACT_ENVIRONMENT = true;

beforeEach(() => {
const entries = new Map<string, string>();
Object.defineProperty(window, "localStorage", {
configurable: true,
value: {
get length() {
return entries.size;
},
clear: () => entries.clear(),
getItem: (key: string) => entries.get(key) ?? null,
key: (index: number) => Array.from(entries.keys())[index] ?? null,
removeItem: (key: string) => entries.delete(key),
setItem: (key: string, value: string) => entries.set(key, value),
} satisfies Storage,
});
Object.defineProperty(window, "innerWidth", { configurable: true, value: 1496 });
});

afterEach(() => {
document.body.innerHTML = "";
vi.doUnmock("../components/editor/manualEditingAvailability");
Expand Down Expand Up @@ -42,6 +61,54 @@ function renderPanelLayout() {
}

describe("usePanelLayout — right inspector panes", () => {
it("opens Design with the intended viewport-scaled panel widths", () => {
const harness = renderPanelLayout();

expect(harness.getState()).toMatchObject({
leftWidth: 384,
rightWidth: 424,
rightCollapsed: false,
rightPanelTab: "design",
});

harness.unmount();
});

it("persists the latest pointer width even before React rerenders", () => {
const harness = renderPanelLayout();
const state = harness.getState();
const target = { setPointerCapture: vi.fn() };

act(() => {
state.handlePanelResizeStart("left", {
preventDefault: vi.fn(),
target,
pointerId: 1,
clientX: 100,
} as unknown as React.PointerEvent);
state.handlePanelResizeMove({ clientX: 140 } as React.PointerEvent);
state.handlePanelResizeEnd();
});

expect(harness.getState().leftWidth).toBe(424);
expect(readStudioUiPreferences().leftWidth).toBe(424);
harness.unmount();
});

it("accumulates and persists rapid keyboard resize steps", () => {
const harness = renderPanelLayout();
const state = harness.getState();

act(() => {
state.adjustPanelWidth("right", 16);
state.adjustPanelWidth("right", 16);
});

expect(harness.getState().rightWidth).toBe(456);
expect(readStudioUiPreferences().rightWidth).toBe(456);
harness.unmount();
});

it("toggleRightInspectorPane independently flips one pane, allowing both open at once", () => {
const harness = renderPanelLayout();
expect(harness.getState().rightInspectorPanes).toEqual({ layers: false, design: true });
Expand Down
106 changes: 72 additions & 34 deletions packages/studio/src/hooks/usePanelLayout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,76 @@ export interface InitialPanelLayoutState {
rightPanelTab?: RightPanelTab | null;
}

type PanelSide = "left" | "right";

function getInitialRightInspectorPanes(tab?: RightPanelTab | null): RightInspectorPanes {
if (tab === "layers") return { layers: true, design: false };
return { layers: false, design: true };
}

function getInitialPanelWidths(): { left: number; right: number } {
const viewportWidth = typeof window === "undefined" ? 1496 : window.innerWidth;
const preferences = readStudioUiPreferences();
const leftDefault = Math.max(240, Math.min(384, Math.round(viewportWidth * 0.257)));
const rightDefault = Math.max(320, Math.min(424, Math.round(viewportWidth * 0.284)));
return {
left: Math.max(
160,
Math.min(Math.floor(viewportWidth * 0.5), preferences.leftWidth ?? leftDefault),
),
right: Math.max(160, Math.min(600, preferences.rightWidth ?? rightDefault)),
};
}

function clampPanelWidth(side: PanelSide, width: number): number {
const max = side === "left" ? Math.floor(window.innerWidth * 0.5) : 600;
return Math.max(160, Math.min(max, width));
}

export function usePanelLayout(initialState?: InitialPanelLayoutState) {
const [leftWidth, setLeftWidth] = useState(240);
const [rightWidth, setRightWidth] = useState(400);
const [initialPanelWidths] = useState(getInitialPanelWidths);
const [leftWidth, setLeftWidth] = useState(initialPanelWidths.left);
const [rightWidth, setRightWidth] = useState(initialPanelWidths.right);
const panelWidthsRef = useRef(initialPanelWidths);
const [leftCollapsed, setLeftCollapsed] = useState(
() => readStudioUiPreferences().leftCollapsed ?? false,
);
const [rightCollapsed, setRightCollapsed] = useState(initialState?.rightCollapsed ?? true);
const [rightCollapsed, setRightCollapsed] = useState(initialState?.rightCollapsed ?? false);
const [rightPanelTab, setRightPanelTab] = useState<RightPanelTab>(
initialState?.rightPanelTab ?? "renders",
initialState?.rightPanelTab ?? "design",
);
const [rightInspectorPanes, setRightInspectorPanes] = useState<RightInspectorPanes>(() =>
getInitialRightInspectorPanes(initialState?.rightPanelTab),
);
const panelDragRef = useRef<{
side: "left" | "right";
side: PanelSide;
startX: number;
startW: number;
} | null>(null);

const updatePanelWidth = useCallback((side: PanelSide, width: number) => {
const next = clampPanelWidth(side, width);
panelWidthsRef.current[side] = next;
if (side === "left") setLeftWidth(next);
else setRightWidth(next);
return next;
}, []);

const commitPanelWidth = useCallback(
(side: PanelSide, width: number) => {
const next = updatePanelWidth(side, Math.round(width));
writeStudioUiPreferences(side === "left" ? { leftWidth: next } : { rightWidth: next });
},
[updatePanelWidth],
);

const adjustPanelWidth = useCallback(
(side: PanelSide, delta: number) => {
commitPanelWidth(side, panelWidthsRef.current[side] + delta);
},
[commitPanelWidth],
);

const toggleLeftSidebar = useCallback(() => {
setLeftCollapsed((collapsed) => {
writeStudioUiPreferences({ leftCollapsed: !collapsed });
Expand All @@ -45,38 +91,31 @@ export function usePanelLayout(initialState?: InitialPanelLayoutState) {
});
}, []);

const handlePanelResizeStart = useCallback(
(side: "left" | "right", e: React.PointerEvent) => {
e.preventDefault();
(e.target as HTMLElement).setPointerCapture(e.pointerId);
panelDragRef.current = {
side,
startX: e.clientX,
startW: side === "left" ? leftWidth : rightWidth,
};
const handlePanelResizeStart = useCallback((side: PanelSide, e: React.PointerEvent) => {
e.preventDefault();
(e.target as HTMLElement).setPointerCapture(e.pointerId);
panelDragRef.current = {
side,
startX: e.clientX,
startW: panelWidthsRef.current[side],
};
}, []);

const handlePanelResizeMove = useCallback(
(e: React.PointerEvent) => {
const drag = panelDragRef.current;
if (!drag) return;
const delta = e.clientX - drag.startX;
updatePanelWidth(drag.side, drag.startW + (drag.side === "left" ? delta : -delta));
},
[leftWidth, rightWidth],
[updatePanelWidth],
);

const handlePanelResizeMove = useCallback((e: React.PointerEvent) => {
const drag = panelDragRef.current;
if (!drag) return;
const delta = e.clientX - drag.startX;
const maxLeft = Math.floor(window.innerWidth * 0.5);
const newW = Math.max(
160,
Math.min(
drag.side === "left" ? maxLeft : 600,
drag.startW + (drag.side === "left" ? delta : -delta),
),
);
if (drag.side === "left") setLeftWidth(newW);
else setRightWidth(newW);
}, []);

const handlePanelResizeEnd = useCallback(() => {
const side = panelDragRef.current?.side;
if (side) commitPanelWidth(side, panelWidthsRef.current[side]);
panelDragRef.current = null;
Comment thread
ukimsanov marked this conversation as resolved.
}, []);
}, [commitPanelWidth]);

const trackedSetRightPanelTab = useCallback(
(tab: RightPanelTab) => {
Expand Down Expand Up @@ -120,9 +159,8 @@ export function usePanelLayout(initialState?: InitialPanelLayoutState) {

return {
leftWidth,
setLeftWidth,
rightWidth,
setRightWidth,
adjustPanelWidth,
leftCollapsed,
setLeftCollapsed,
rightCollapsed,
Expand Down
20 changes: 0 additions & 20 deletions packages/studio/src/player/components/PlayerControls.test.ts

This file was deleted.

Loading
Loading