Skip to content

The VS Code of video editing, built for agents.

TypeScript

Update timeline configuration and scrolling behavior

konstantin-paulusbf54ffdfc625
diff --git a/apps/web/src/components/engine/timeline/config.ts b/apps/web/src/components/engine/timeline/config.ts
index a92aa347..ab955775 100644
--- a/apps/web/src/components/engine/timeline/config.ts
+++ b/apps/web/src/components/engine/timeline/config.ts
@@ -6,12 +6,21 @@ export const MIN_CLIP_HEIGHT = 28;
export const MAX_CLIP_HEIGHT = 116;
export const KEYFRAME_TRACK_HEIGHT = 32;
export const TARGET_MAJOR_TICK_DISTANCE = 160;
-export const TIMELINE_RESOLUTION_RANGE = [0.03, 12] as const;
+
+export const TIMELINE_RESOLUTION_RANGE = [0.03, 120] as const;
export const DEFAULT_TIMELINE_RESOLUTION = 1 / 0.7;
-export const DEFAULT_CLIP_HEIGHT = 32;
+export const DEFAULT_CLIP_HEIGHT = 40;
export const TIMELINE_PADDING_LEFT = 8;
+export const WHEEL_LINE_HEIGHT = 16;
+export const WHEEL_PAGE_HEIGHT = 600;
+
+export const ZOOM_DELTA_CLAMP = 50;
+export const ZOOM_SENSITIVITY = 0.01;
+
+export const SCROLL_X_SENSITIVITY = 2;
+
export const CLICK_DISTANCE_THRESHOLD = 5;
export const DOUBLE_CLICK_THRESHOLD = 500;
diff --git a/apps/web/src/components/engine/timeline/constants.ts b/apps/web/src/components/engine/timeline/constants.ts
index 3c3b1bda..fce7d481 100644
--- a/apps/web/src/components/engine/timeline/constants.ts
+++ b/apps/web/src/components/engine/timeline/constants.ts
@@ -5,6 +5,22 @@
import { secondsToFrames } from "../utils";
export const RULER_INTERVALS = [
+ {
+ numerator: secondsToFrames(600),
+ denominator: 10,
+ },
+ {
+ numerator: secondsToFrames(300),
+ denominator: 5,
+ },
+ {
+ numerator: secondsToFrames(120),
+ denominator: 4,
+ },
+ {
+ numerator: secondsToFrames(60),
+ denominator: 6,
+ },
{
numerator: secondsToFrames(30),
denominator: 10,
diff --git a/apps/web/src/components/engine/timeline/timeline.ts b/apps/web/src/components/engine/timeline/timeline.ts
index eb3c8a1c..8988f9e4 100644
--- a/apps/web/src/components/engine/timeline/timeline.ts
+++ b/apps/web/src/components/engine/timeline/timeline.ts
@@ -14,7 +14,17 @@ import {
renderLayers,
} from "./render";
import { pixelsToFrames, updateTimelineTransform } from "./utils";
-import { DEFAULT_TIMELINE_RESOLUTION, TIMELINE_RESOLUTION_RANGE, TIMELINE_PADDING_LEFT, RULER_HEIGHT } from "./config";
+import {
+ DEFAULT_TIMELINE_RESOLUTION,
+ TIMELINE_RESOLUTION_RANGE,
+ TIMELINE_PADDING_LEFT,
+ RULER_HEIGHT,
+ WHEEL_LINE_HEIGHT,
+ WHEEL_PAGE_HEIGHT,
+ ZOOM_DELTA_CLAMP,
+ ZOOM_SENSITIVITY,
+ SCROLL_X_SENSITIVITY,
+} from "./config";
import { useEngine } from "@/context/engine";
import { useCursor } from "@/hooks/use-cursor";
import { createTimelineContext } from "./world";
@@ -156,7 +166,7 @@ export function createTimeline() {
if (sid === null) return;
const scrollX = c.Timeline.scrollX[sid] ?? 0;
const resolution = c.Timeline.resolution[sid] || DEFAULT_TIMELINE_RESOLUTION;
- const minScrollX = -TIMELINE_PADDING_LEFT / resolution;
+ const { deltaX, deltaY } = normalizeWheel(event);
// Prioritize: Z (zoom) > X (horizontal) > Y (vertical)
// Only one axis can be scrolled at a time
@@ -165,24 +175,24 @@ export function createTimeline() {
const rect = timeline.canvas?.getBoundingClientRect();
const timelineX = event.clientX - (rect?.left ?? 0);
- let newResolution = resolution;
- newResolution *= 1.01 ** -event.deltaY;
+ const dy = clamp(deltaY, -ZOOM_DELTA_CLAMP, ZOOM_DELTA_CLAMP);
+ let newResolution = resolution * Math.exp(-dy * ZOOM_SENSITIVITY);
newResolution = clamp(newResolution, 1 / TIMELINE_RESOLUTION_RANGE[1], 1 / TIMELINE_RESOLUTION_RANGE[0]);
let newScrollX = scrollX + timelineX / resolution - timelineX / newResolution;
- newScrollX = Math.max(minScrollX, newScrollX);
+ newScrollX = Math.max(-TIMELINE_PADDING_LEFT / newResolution, newScrollX);
c.Timeline.scrollX[sid] = newScrollX;
c.Timeline.resolution[sid] = newResolution;
- } else if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
+ } else if (Math.abs(deltaX) > Math.abs(deltaY)) {
// Horizontal scroll (X axis) - when horizontal movement is dominant
- const frameDelta = event.deltaX / resolution;
+ const frameDelta = (deltaX * SCROLL_X_SENSITIVITY) / resolution;
let newScrollX = scrollX + frameDelta;
- newScrollX = Math.max(minScrollX, newScrollX);
+ newScrollX = Math.max(-TIMELINE_PADDING_LEFT / resolution, newScrollX);
c.Timeline.scrollX[sid] = newScrollX;
} else {
// Vertical scroll (Y axis) - default when no other conditions match
- c.Timeline.scrollY[sid] = (c.Timeline.scrollY[sid] ?? 0) + event.deltaY;
+ c.Timeline.scrollY[sid] = (c.Timeline.scrollY[sid] ?? 0) + deltaY;
applyScroll();
}
@@ -209,10 +219,12 @@ export function createTimeline() {
const sid = world.selection.scene;
if (sid === null) return;
- if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
- layerScrollX += event.deltaX;
+ const { deltaX, deltaY } = normalizeWheel(event);
+
+ if (Math.abs(deltaX) > Math.abs(deltaY)) {
+ layerScrollX += deltaX;
} else {
- c.Timeline.scrollY[sid] = (c.Timeline.scrollY[sid] ?? 0) + event.deltaY;
+ c.Timeline.scrollY[sid] = (c.Timeline.scrollY[sid] ?? 0) + deltaY;
}
applyScroll();
@@ -301,3 +313,13 @@ export function createTimeline() {
setMinimized,
};
}
+
+function normalizeWheel(event: WheelEvent) {
+ const scale = event.deltaMode === WheelEvent.DOM_DELTA_LINE
+ ? WHEEL_LINE_HEIGHT
+ : event.deltaMode === WheelEvent.DOM_DELTA_PAGE
+ ? WHEEL_PAGE_HEIGHT
+ : 1;
+
+ return { deltaX: event.deltaX * scale, deltaY: event.deltaY * scale };
+}