The open-source CapCut alternative
feat: ripple editing mode on timeline
Maze Winther5266aed5eb18
diff --git a/apps/web/src/components/editor/timeline-element.tsx b/apps/web/src/components/editor/timeline-element.tsxindex 4ba889ef..eb9f1c01 100644--- a/apps/web/src/components/editor/timeline-element.tsx+++ b/apps/web/src/components/editor/timeline-element.tsx@@ -1,386 +1,392 @@-"use client";--import { useState } from "react";-import { Button } from "../ui/button";-import {- MoreVertical,- Scissors,- Trash2,- SplitSquareHorizontal,- Music,- ChevronRight,- ChevronLeft,- Type,- Copy,- RefreshCw,-} from "lucide-react";-import { useMediaStore } from "@/stores/media-store";-import { useTimelineStore } from "@/stores/timeline-store";-import { usePlaybackStore } from "@/stores/playback-store";-import AudioWaveform from "./audio-waveform";-import { toast } from "sonner";-import { TimelineElementProps, TrackType } from "@/types/timeline";-import { useTimelineElementResize } from "@/hooks/use-timeline-element-resize";-import {- getTrackElementClasses,- TIMELINE_CONSTANTS,- getTrackHeight,-} from "@/constants/timeline-constants";-import {- DropdownMenu,- DropdownMenuContent,- DropdownMenuItem,- DropdownMenuSeparator,- DropdownMenuTrigger,- DropdownMenuSub,- DropdownMenuSubContent,- DropdownMenuSubTrigger,-} from "../ui/dropdown-menu";-import {- ContextMenu,- ContextMenuContent,- ContextMenuItem,- ContextMenuSeparator,- ContextMenuTrigger,-} from "../ui/context-menu";--export function TimelineElement({- element,- track,- zoomLevel,- isSelected,- onElementMouseDown,- onElementClick,-}: TimelineElementProps) {- const { mediaItems } = useMediaStore();- const {- updateElementTrim,- updateElementDuration,- removeElementFromTrack,- dragState,- splitElement,- splitAndKeepLeft,- splitAndKeepRight,- separateAudio,- addElementToTrack,- replaceElementMedia,- } = useTimelineStore();- const { currentTime } = usePlaybackStore();-- const [elementMenuOpen, setElementMenuOpen] = useState(false);-- const {- resizing,- isResizing,- handleResizeStart,- handleResizeMove,- handleResizeEnd,- } = useTimelineElementResize({- element,- track,- zoomLevel,- onUpdateTrim: updateElementTrim,- onUpdateDuration: updateElementDuration,- });-- const effectiveDuration =- element.duration - element.trimStart - element.trimEnd;- const elementWidth = Math.max(- TIMELINE_CONSTANTS.ELEMENT_MIN_WIDTH,- effectiveDuration * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel- );-- // Use real-time position during drag, otherwise use stored position- const isBeingDragged = dragState.elementId === element.id;- const elementStartTime =- isBeingDragged && dragState.isDragging- ? dragState.currentTime- : element.startTime;-- // Element should always be positioned at startTime - trimStart only affects content, not position- const elementLeft = elementStartTime * 50 * zoomLevel;-- const handleElementSplitContext = () => {- const effectiveStart = element.startTime;- const effectiveEnd =- element.startTime +- (element.duration - element.trimStart - element.trimEnd);-- if (currentTime > effectiveStart && currentTime < effectiveEnd) {- const secondElementId = splitElement(track.id, element.id, currentTime);- if (!secondElementId) {- toast.error("Failed to split element");- }- } else {- toast.error("Playhead must be within element to split");- }- };-- const handleElementDuplicateContext = () => {- const { id, ...elementWithoutId } = element;- addElementToTrack(track.id, {- ...elementWithoutId,- name: element.name + " (copy)",- startTime:- element.startTime +- (element.duration - element.trimStart - element.trimEnd) +- 0.1,- });- };-- const handleElementDeleteContext = () => {- removeElementFromTrack(track.id, element.id);- };-- const handleReplaceClip = () => {- if (element.type !== "media") {- toast.error("Replace is only available for media clips");- return;- }-- // Create a file input to select replacement media- const input = document.createElement("input");- input.type = "file";- input.accept = "video/*,audio/*,image/*";- input.onchange = async (e) => {- const file = (e.target as HTMLInputElement).files?.[0];- if (!file) return;-- try {- const success = await replaceElementMedia(track.id, element.id, file);- if (success) {- toast.success("Clip replaced successfully");- } else {- toast.error("Failed to replace clip");- }- } catch (error) {- toast.error("Failed to replace clip");- console.log(- JSON.stringify({ error: "Failed to replace clip", details: error })- );- }- };- input.click();- };-- const renderElementContent = () => {- if (element.type === "text") {- return (- <div className="w-full h-full flex items-center justify-start pl-2">- <span className="text-xs text-foreground/80 truncate">- {element.content}- </span>- </div>- );- }-- // Render media element ->- const mediaItem = mediaItems.find((item) => item.id === element.mediaId);- if (!mediaItem) {- return (- <span className="text-xs text-foreground/80 truncate">- {element.name}- </span>- );- }-- const TILE_ASPECT_RATIO = 16 / 9;-- if (mediaItem.type === "image") {- // Calculate tile size based on 16:9 aspect ratio- const trackHeight = getTrackHeight(track.type);- const tileHeight = trackHeight - 8; // Account for padding- const tileWidth = tileHeight * TILE_ASPECT_RATIO;-- return (- <div className="w-full h-full flex items-center justify-center">- <div className="bg-[#004D52] py-3 w-full h-full relative">- {/* Background with tiled images */}- <div- className="absolute top-3 bottom-3 left-0 right-0"- style={{- backgroundImage: mediaItem.url- ? `url(${mediaItem.url})`- : "none",- backgroundRepeat: "repeat-x",- backgroundSize: `${tileWidth}px ${tileHeight}px`,- backgroundPosition: "left center",- pointerEvents: "none",- }}- aria-label={`Tiled background of ${mediaItem.name}`}- />- {/* Overlay with vertical borders */}- <div- className="absolute top-3 bottom-3 left-0 right-0 pointer-events-none"- style={{- backgroundImage: `repeating-linear-gradient(- to right,- transparent 0px,- transparent ${tileWidth - 1}px,- rgba(255, 255, 255, 0.6) ${tileWidth - 1}px,- rgba(255, 255, 255, 0.6) ${tileWidth}px- )`,- backgroundPosition: "left center",- }}- />- </div>- </div>- );- }-- const VIDEO_TILE_PADDING = 16;- const OVERLAY_SPACE_MULTIPLIER = 1.5;-- if (mediaItem.type === "video" && mediaItem.thumbnailUrl) {- const trackHeight = getTrackHeight(track.type);- const tileHeight = trackHeight - VIDEO_TILE_PADDING;- const tileWidth = tileHeight * TILE_ASPECT_RATIO;-- return (- <div className="w-full h-full flex items-center gap-2">- <div className="flex-1 h-full relative overflow-hidden">- {/* Background with tiled thumbnails */}- <div- className="absolute inset-0"- style={{- backgroundImage: mediaItem.thumbnailUrl- ? `url(${mediaItem.thumbnailUrl})`- : "none",- backgroundRepeat: "repeat-x",- backgroundSize: `${tileWidth}px ${tileHeight}px`,- backgroundPosition: "left center",- pointerEvents: "none",- }}- aria-label={`Tiled thumbnail of ${mediaItem.name}`}- />- {/* Overlay with vertical borders */}- <div- className="absolute inset-0 pointer-events-none"- style={{- backgroundImage: `repeating-linear-gradient(- to right,- transparent 0px,- transparent ${tileWidth - 1}px,- rgba(255, 255, 255, 0.6) ${tileWidth - 1}px,- rgba(255, 255, 255, 0.6) ${tileWidth}px- )`,- backgroundPosition: "left center",- }}- />- </div>- {elementWidth > tileWidth * OVERLAY_SPACE_MULTIPLIER ? (- <div className="absolute right-2 top-1/2 -translate-y-1/2 bg-black/70 text-white text-xs px-2 py-1 rounded pointer-events-none max-w-[40%] truncate">- {element.name}- </div>- ) : (- <span className="text-xs text-foreground/80 truncate flex-shrink-0 max-w-[120px]">- {element.name}- </span>- )}- </div>- );- }-- // Render audio element ->- if (mediaItem.type === "audio") {- return (- <div className="w-full h-full flex items-center gap-2">- <div className="flex-1 min-w-0">- <AudioWaveform- audioUrl={mediaItem.url || ""}- height={24}- className="w-full"- />- </div>- </div>- );- }-- return (- <span className="text-xs text-foreground/80 truncate">- {element.name}- </span>- );- };-- const handleElementMouseDown = (e: React.MouseEvent) => {- if (onElementMouseDown) {- onElementMouseDown(e, element);- }- };-- return (- <ContextMenu>- <ContextMenuTrigger asChild>- <div- className={`absolute top-0 h-full select-none timeline-element ${- isBeingDragged ? "z-50" : "z-10"- }`}- style={{- left: `${elementLeft}px`,- width: `${elementWidth}px`,- }}- data-element-id={element.id}- data-track-id={track.id}- onMouseMove={resizing ? handleResizeMove : undefined}- onMouseUp={resizing ? handleResizeEnd : undefined}- onMouseLeave={resizing ? handleResizeEnd : undefined}- >- <div- className={`relative h-full rounded-[0.15rem] cursor-pointer overflow-hidden ${getTrackElementClasses(- track.type- )} ${isSelected ? "border-b-[0.5px] border-t-[0.5px] border-foreground" : ""} ${- isBeingDragged ? "z-50" : "z-10"- }`}- onClick={(e) => onElementClick && onElementClick(e, element)}- onMouseDown={handleElementMouseDown}- onContextMenu={(e) =>- onElementMouseDown && onElementMouseDown(e, element)- }- >- <div className="absolute inset-0 flex items-center h-full">- {renderElementContent()}- </div>-- {isSelected && (- <>- <div- className="absolute left-0 top-0 bottom-0 w-1 cursor-w-resize bg-foreground z-50"- onMouseDown={(e) => handleResizeStart(e, element.id, "left")}- />- <div- className="absolute right-0 top-0 bottom-0 w-1 cursor-e-resize bg-foreground z-50"- onMouseDown={(e) => handleResizeStart(e, element.id, "right")}- />- </>- )}- </div>- </div>- </ContextMenuTrigger>- <ContextMenuContent>- <ContextMenuItem onClick={handleElementSplitContext}>- <Scissors className="h-4 w-4 mr-2" />- Split at playhead- </ContextMenuItem>- <ContextMenuItem onClick={handleElementDuplicateContext}>- <Copy className="h-4 w-4 mr-2" />- Duplicate {element.type === "text" ? "text" : "clip"}- </ContextMenuItem>- {element.type === "media" && (- <ContextMenuItem onClick={handleReplaceClip}>- <RefreshCw className="h-4 w-4 mr-2" />- Replace clip- </ContextMenuItem>- )}- <ContextMenuSeparator />- <ContextMenuItem- onClick={handleElementDeleteContext}- className="text-destructive focus:text-destructive"- >- <Trash2 className="h-4 w-4 mr-2" />- Delete {element.type === "text" ? "text" : "clip"}- </ContextMenuItem>- </ContextMenuContent>- </ContextMenu>- );-}+"use client";++import { useState } from "react";+import { Button } from "../ui/button";+import {+ MoreVertical,+ Scissors,+ Trash2,+ SplitSquareHorizontal,+ Music,+ ChevronRight,+ ChevronLeft,+ Type,+ Copy,+ RefreshCw,+} from "lucide-react";+import { useMediaStore } from "@/stores/media-store";+import { useTimelineStore } from "@/stores/timeline-store";+import { usePlaybackStore } from "@/stores/playback-store";+import AudioWaveform from "./audio-waveform";+import { toast } from "sonner";+import { TimelineElementProps, TrackType } from "@/types/timeline";+import { useTimelineElementResize } from "@/hooks/use-timeline-element-resize";+import {+ getTrackElementClasses,+ TIMELINE_CONSTANTS,+ getTrackHeight,+} from "@/constants/timeline-constants";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuSeparator,+ DropdownMenuTrigger,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,+} from "../ui/dropdown-menu";+import {+ ContextMenu,+ ContextMenuContent,+ ContextMenuItem,+ ContextMenuSeparator,+ ContextMenuTrigger,+} from "../ui/context-menu";++export function TimelineElement({+ element,+ track,+ zoomLevel,+ isSelected,+ onElementMouseDown,+ onElementClick,+}: TimelineElementProps) {+ const { mediaItems } = useMediaStore();+ const {+ updateElementTrim,+ updateElementDuration,+ removeElementFromTrack,+ removeElementFromTrackWithRipple,+ dragState,+ splitElement,+ splitAndKeepLeft,+ splitAndKeepRight,+ separateAudio,+ addElementToTrack,+ replaceElementMedia,+ rippleEditingEnabled,+ } = useTimelineStore();+ const { currentTime } = usePlaybackStore();++ const [elementMenuOpen, setElementMenuOpen] = useState(false);++ const {+ resizing,+ isResizing,+ handleResizeStart,+ handleResizeMove,+ handleResizeEnd,+ } = useTimelineElementResize({+ element,+ track,+ zoomLevel,+ onUpdateTrim: updateElementTrim,+ onUpdateDuration: updateElementDuration,+ });++ const effectiveDuration =+ element.duration - element.trimStart - element.trimEnd;+ const elementWidth = Math.max(+ TIMELINE_CONSTANTS.ELEMENT_MIN_WIDTH,+ effectiveDuration * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel+ );++ // Use real-time position during drag, otherwise use stored position+ const isBeingDragged = dragState.elementId === element.id;+ const elementStartTime =+ isBeingDragged && dragState.isDragging+ ? dragState.currentTime+ : element.startTime;++ // Element should always be positioned at startTime - trimStart only affects content, not position+ const elementLeft = elementStartTime * 50 * zoomLevel;++ const handleElementSplitContext = () => {+ const effectiveStart = element.startTime;+ const effectiveEnd =+ element.startTime ++ (element.duration - element.trimStart - element.trimEnd);++ if (currentTime > effectiveStart && currentTime < effectiveEnd) {+ const secondElementId = splitElement(track.id, element.id, currentTime);+ if (!secondElementId) {+ toast.error("Failed to split element");+ }+ } else {+ toast.error("Playhead must be within element to split");+ }+ };++ const handleElementDuplicateContext = () => {+ const { id, ...elementWithoutId } = element;+ addElementToTrack(track.id, {+ ...elementWithoutId,+ name: element.name + " (copy)",+ startTime:+ element.startTime ++ (element.duration - element.trimStart - element.trimEnd) ++ 0.1,+ });+ };++ const handleElementDeleteContext = () => {+ if (rippleEditingEnabled) {+ removeElementFromTrackWithRipple(track.id, element.id);+ } else {+ removeElementFromTrack(track.id, element.id);+ }+ };++ const handleReplaceClip = () => {+ if (element.type !== "media") {+ toast.error("Replace is only available for media clips");+ return;+ }++ // Create a file input to select replacement media+ const input = document.createElement("input");+ input.type = "file";+ input.accept = "video/*,audio/*,image/*";+ input.onchange = async (e) => {+ const file = (e.target as HTMLInputElement).files?.[0];+ if (!file) return;++ try {+ const success = await replaceElementMedia(track.id, element.id, file);+ if (success) {+ toast.success("Clip replaced successfully");+ } else {+ toast.error("Failed to replace clip");+ }+ } catch (error) {+ toast.error("Failed to replace clip");+ console.log(+ JSON.stringify({ error: "Failed to replace clip", details: error })+ );+ }+ };+ input.click();+ };++ const renderElementContent = () => {+ if (element.type === "text") {+ return (+ <div className="w-full h-full flex items-center justify-start pl-2">+ <span className="text-xs text-foreground/80 truncate">+ {element.content}+ </span>+ </div>+ );+ }++ // Render media element ->+ const mediaItem = mediaItems.find((item) => item.id === element.mediaId);+ if (!mediaItem) {+ return (+ <span className="text-xs text-foreground/80 truncate">+ {element.name}+ </span>+ );+ }++ const TILE_ASPECT_RATIO = 16 / 9;++ if (mediaItem.type === "image") {+ // Calculate tile size based on 16:9 aspect ratio+ const trackHeight = getTrackHeight(track.type);+ const tileHeight = trackHeight - 8; // Account for padding+ const tileWidth = tileHeight * TILE_ASPECT_RATIO;++ return (+ <div className="w-full h-full flex items-center justify-center">+ <div className="bg-[#004D52] py-3 w-full h-full relative">+ {/* Background with tiled images */}+ <div+ className="absolute top-3 bottom-3 left-0 right-0"+ style={{+ backgroundImage: mediaItem.url+ ? `url(${mediaItem.url})`+ : "none",+ backgroundRepeat: "repeat-x",+ backgroundSize: `${tileWidth}px ${tileHeight}px`,+ backgroundPosition: "left center",+ pointerEvents: "none",+ }}+ aria-label={`Tiled background of ${mediaItem.name}`}+ />+ {/* Overlay with vertical borders */}+ <div+ className="absolute top-3 bottom-3 left-0 right-0 pointer-events-none"+ style={{+ backgroundImage: `repeating-linear-gradient(+ to right,+ transparent 0px,+ transparent ${tileWidth - 1}px,+ rgba(255, 255, 255, 0.6) ${tileWidth - 1}px,+ rgba(255, 255, 255, 0.6) ${tileWidth}px+ )`,+ backgroundPosition: "left center",+ }}+ />+ </div>+ </div>+ );+ }++ const VIDEO_TILE_PADDING = 16;+ const OVERLAY_SPACE_MULTIPLIER = 1.5;++ if (mediaItem.type === "video" && mediaItem.thumbnailUrl) {+ const trackHeight = getTrackHeight(track.type);+ const tileHeight = trackHeight - VIDEO_TILE_PADDING;+ const tileWidth = tileHeight * TILE_ASPECT_RATIO;++ return (+ <div className="w-full h-full flex items-center gap-2">+ <div className="flex-1 h-full relative overflow-hidden">+ {/* Background with tiled thumbnails */}+ <div+ className="absolute inset-0"+ style={{+ backgroundImage: mediaItem.thumbnailUrl+ ? `url(${mediaItem.thumbnailUrl})`+ : "none",+ backgroundRepeat: "repeat-x",+ backgroundSize: `${tileWidth}px ${tileHeight}px`,+ backgroundPosition: "left center",+ pointerEvents: "none",+ }}+ aria-label={`Tiled thumbnail of ${mediaItem.name}`}+ />+ {/* Overlay with vertical borders */}+ <div+ className="absolute inset-0 pointer-events-none"+ style={{+ backgroundImage: `repeating-linear-gradient(+ to right,+ transparent 0px,+ transparent ${tileWidth - 1}px,+ rgba(255, 255, 255, 0.6) ${tileWidth - 1}px,+ rgba(255, 255, 255, 0.6) ${tileWidth}px+ )`,+ backgroundPosition: "left center",+ }}+ />+ </div>+ {elementWidth > tileWidth * OVERLAY_SPACE_MULTIPLIER ? (+ <div className="absolute right-2 top-1/2 -translate-y-1/2 bg-black/70 text-white text-xs px-2 py-1 rounded pointer-events-none max-w-[40%] truncate">+ {element.name}+ </div>+ ) : (+ <span className="text-xs text-foreground/80 truncate flex-shrink-0 max-w-[120px]">+ {element.name}+ </span>+ )}+ </div>+ );+ }++ // Render audio element ->+ if (mediaItem.type === "audio") {+ return (+ <div className="w-full h-full flex items-center gap-2">+ <div className="flex-1 min-w-0">+ <AudioWaveform+ audioUrl={mediaItem.url || ""}+ height={24}+ className="w-full"+ />+ </div>+ </div>+ );+ }++ return (+ <span className="text-xs text-foreground/80 truncate">+ {element.name}+ </span>+ );+ };++ const handleElementMouseDown = (e: React.MouseEvent) => {+ if (onElementMouseDown) {+ onElementMouseDown(e, element);+ }+ };++ return (+ <ContextMenu>+ <ContextMenuTrigger asChild>+ <div+ className={`absolute top-0 h-full select-none timeline-element ${+ isBeingDragged ? "z-50" : "z-10"+ }`}+ style={{+ left: `${elementLeft}px`,+ width: `${elementWidth}px`,+ }}+ data-element-id={element.id}+ data-track-id={track.id}+ onMouseMove={resizing ? handleResizeMove : undefined}+ onMouseUp={resizing ? handleResizeEnd : undefined}+ onMouseLeave={resizing ? handleResizeEnd : undefined}+ >+ <div+ className={`relative h-full rounded-[0.15rem] cursor-pointer overflow-hidden ${getTrackElementClasses(+ track.type+ )} ${isSelected ? "border-b-[0.5px] border-t-[0.5px] border-foreground" : ""} ${+ isBeingDragged ? "z-50" : "z-10"+ }`}+ onClick={(e) => onElementClick && onElementClick(e, element)}+ onMouseDown={handleElementMouseDown}+ onContextMenu={(e) =>+ onElementMouseDown && onElementMouseDown(e, element)+ }+ >+ <div className="absolute inset-0 flex items-center h-full">+ {renderElementContent()}+ </div>++ {isSelected && (+ <>+ <div+ className="absolute left-0 top-0 bottom-0 w-1 cursor-w-resize bg-foreground z-50"+ onMouseDown={(e) => handleResizeStart(e, element.id, "left")}+ />+ <div+ className="absolute right-0 top-0 bottom-0 w-1 cursor-e-resize bg-foreground z-50"+ onMouseDown={(e) => handleResizeStart(e, element.id, "right")}+ />+ </>+ )}+ </div>+ </div>+ </ContextMenuTrigger>+ <ContextMenuContent>+ <ContextMenuItem onClick={handleElementSplitContext}>+ <Scissors className="h-4 w-4 mr-2" />+ Split at playhead+ </ContextMenuItem>+ <ContextMenuItem onClick={handleElementDuplicateContext}>+ <Copy className="h-4 w-4 mr-2" />+ Duplicate {element.type === "text" ? "text" : "clip"}+ </ContextMenuItem>+ {element.type === "media" && (+ <ContextMenuItem onClick={handleReplaceClip}>+ <RefreshCw className="h-4 w-4 mr-2" />+ Replace clip+ </ContextMenuItem>+ )}+ <ContextMenuSeparator />+ <ContextMenuItem+ onClick={handleElementDeleteContext}+ className="text-destructive focus:text-destructive"+ >+ <Trash2 className="h-4 w-4 mr-2" />+ Delete {element.type === "text" ? "text" : "clip"}+ </ContextMenuItem>+ </ContextMenuContent>+ </ContextMenu>+ );+}diff --git a/apps/web/src/components/editor/timeline-track.tsx b/apps/web/src/components/editor/timeline-track.tsxindex 2aa1c2b0..82ca0b98 100644--- a/apps/web/src/components/editor/timeline-track.tsx+++ b/apps/web/src/components/editor/timeline-track.tsx@@ -39,6 +39,7 @@ export function TimelineTrackContent({addTrack,moveElementToTrack,updateElementStartTime,+ updateElementStartTimeWithRipple,addElementToTrack,selectedElements,selectElement,@@ -49,6 +50,7 @@ export function TimelineTrackContent({clearSelectedElements,insertTrackAt,snappingEnabled,+ rippleEditingEnabled,} = useTimelineStore();const { currentTime } = usePlaybackStore();@@ -221,11 +223,19 @@ export function TimelineTrackContent({const timelineRect = timelineRef.current?.getBoundingClientRect();if (!timelineRect) {if (isTrackThatStartedDrag) {- updateElementStartTime(- track.id,- dragState.elementId,- dragState.currentTime- );+ if (rippleEditingEnabled) {+ updateElementStartTimeWithRipple(+ track.id,+ dragState.elementId,+ dragState.currentTime+ );+ } else {+ updateElementStartTime(+ track.id,+ dragState.elementId,+ dragState.currentTime+ );+ }endDragAction();// Clear snap point when drag endsonSnapPointChange?.(null);@@ -272,7 +282,19 @@ export function TimelineTrackContent({if (!hasOverlap) {if (dragState.trackId === track.id) {- updateElementStartTime(track.id, dragState.elementId, finalTime);+ if (rippleEditingEnabled) {+ updateElementStartTimeWithRipple(+ track.id,+ dragState.elementId,+ finalTime+ );+ } else {+ updateElementStartTime(+ track.id,+ dragState.elementId,+ finalTime+ );+ }} else {moveElementToTrack(dragState.trackId,@@ -280,11 +302,19 @@ export function TimelineTrackContent({dragState.elementId);requestAnimationFrame(() => {- updateElementStartTime(- track.id,- dragState.elementId!,- finalTime- );+ if (rippleEditingEnabled) {+ updateElementStartTimeWithRipple(+ track.id,+ dragState.elementId!,+ finalTime+ );+ } else {+ updateElementStartTime(+ track.id,+ dragState.elementId!,+ finalTime+ );+ }});}}@@ -318,7 +348,15 @@ export function TimelineTrackContent({});if (!hasOverlap) {- updateElementStartTime(track.id, dragState.elementId, finalTime);+ if (rippleEditingEnabled) {+ updateElementStartTimeWithRipple(+ track.id,+ dragState.elementId,+ finalTime+ );+ } else {+ updateElementStartTime(track.id, dragState.elementId, finalTime);+ }}}}@@ -743,12 +781,28 @@ export function TimelineTrackContent({if (fromTrackId === track.id) {// Moving within same track- updateElementStartTime(track.id, elementId, finalStartTime);+ if (rippleEditingEnabled) {+ updateElementStartTimeWithRipple(+ track.id,+ elementId,+ finalStartTime+ );+ } else {+ updateElementStartTime(track.id, elementId, finalStartTime);+ }} else {// Moving to different trackmoveElementToTrack(fromTrackId, track.id, elementId);requestAnimationFrame(() => {- updateElementStartTime(track.id, elementId, finalStartTime);+ if (rippleEditingEnabled) {+ updateElementStartTimeWithRipple(+ track.id,+ elementId,+ finalStartTime+ );+ } else {+ updateElementStartTime(track.id, elementId, finalStartTime);+ }});}} else if (hasMediaItem) {diff --git a/apps/web/src/components/editor/timeline.tsx b/apps/web/src/components/editor/timeline.tsxindex 117abc32..9e68fd4d 100644--- a/apps/web/src/components/editor/timeline.tsx+++ b/apps/web/src/components/editor/timeline.tsx@@ -1,1069 +1,1095 @@-"use client";--import { ScrollArea } from "../ui/scroll-area";-import { Button } from "../ui/button";-import {- Scissors,- ArrowLeftToLine,- ArrowRightToLine,- Trash2,- Snowflake,- Copy,- SplitSquareHorizontal,- Pause,- Play,- Video,- Music,- TypeIcon,- Lock,- LockOpen,-} from "lucide-react";-import {- Tooltip,- TooltipContent,- TooltipTrigger,- TooltipProvider,-} from "../ui/tooltip";-import {- ContextMenu,- ContextMenuContent,- ContextMenuItem,- ContextMenuTrigger,-} from "../ui/context-menu";-import { useTimelineStore } from "@/stores/timeline-store";-import { useMediaStore } from "@/stores/media-store";-import { usePlaybackStore } from "@/stores/playback-store";-import { useProjectStore } from "@/stores/project-store";-import { useTimelineZoom } from "@/hooks/use-timeline-zoom";-import { processMediaFiles } from "@/lib/media-processing";-import { toast } from "sonner";-import { useState, useRef, useEffect, useCallback } from "react";-import { TimelineTrackContent } from "./timeline-track";-import {- TimelinePlayhead,- useTimelinePlayheadRuler,-} from "./timeline-playhead";-import { SelectionBox } from "./selection-box";-import { useSelectionBox } from "@/hooks/use-selection-box";-import { SnapIndicator } from "./snap-indicator";-import { SnapPoint } from "@/hooks/use-timeline-snapping";-import type { DragData, TimelineTrack } from "@/types/timeline";-import {- getTrackHeight,- getCumulativeHeightBefore,- getTotalTracksHeight,- TIMELINE_CONSTANTS,- snapTimeToFrame,-} from "@/constants/timeline-constants";--export function Timeline() {- // Timeline shows all tracks (video, audio, effects) and their elements.- // You can drag media here to add it to your project.- // elements can be trimmed, deleted, and moved.-- const {- tracks,- addTrack,- addElementToTrack,- removeElementFromTrack,- getTotalDuration,- selectedElements,- clearSelectedElements,- setSelectedElements,- splitElement,- splitAndKeepLeft,- splitAndKeepRight,- toggleTrackMute,- separateAudio,- snappingEnabled,- toggleSnapping,- dragState,- } = useTimelineStore();- const { mediaItems, addMediaItem } = useMediaStore();- const { activeProject } = useProjectStore();- const { currentTime, duration, seek, setDuration, isPlaying, toggle } =- usePlaybackStore();- const [isDragOver, setIsDragOver] = useState(false);- const [isProcessing, setIsProcessing] = useState(false);- const [progress, setProgress] = useState(0);- const dragCounterRef = useRef(0);- const timelineRef = useRef<HTMLDivElement>(null);- const rulerRef = useRef<HTMLDivElement>(null);- const [isInTimeline, setIsInTimeline] = useState(false);-- // Track mouse down/up for distinguishing clicks from drag/resize ends- const mouseTrackingRef = useRef({- isMouseDown: false,- downX: 0,- downY: 0,- downTime: 0,- });-- // Timeline zoom functionality- const { zoomLevel, setZoomLevel, handleWheel } = useTimelineZoom({- containerRef: timelineRef,- isInTimeline,- });-- // Old marquee selection removed - using new SelectionBox component instead-- // Dynamic timeline width calculation based on playhead position and duration- const dynamicTimelineWidth = Math.max(- (duration || 0) * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel, // Base width from duration- (currentTime + 30) * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel, // Width to show current time + 30 seconds buffer- timelineRef.current?.clientWidth || 1000 // Minimum width- );-- // Scroll synchronization and auto-scroll to playhead- const rulerScrollRef = useRef<HTMLDivElement>(null);- const tracksScrollRef = useRef<HTMLDivElement>(null);- const trackLabelsRef = useRef<HTMLDivElement>(null);- const playheadRef = useRef<HTMLDivElement>(null);- const trackLabelsScrollRef = useRef<HTMLDivElement>(null);- const isUpdatingRef = useRef(false);- const lastRulerSync = useRef(0);- const lastTracksSync = useRef(0);- const lastVerticalSync = useRef(0);-- // Timeline playhead ruler handlers- const { handleRulerMouseDown } = useTimelinePlayheadRuler({- currentTime,- duration,- zoomLevel,- seek,- rulerRef,- rulerScrollRef,- tracksScrollRef,- playheadRef,- });-- // Selection box functionality- const tracksContainerRef = useRef<HTMLDivElement>(null);- const {- selectionBox,- handleMouseDown: handleSelectionMouseDown,- isSelecting,- justFinishedSelecting,- } = useSelectionBox({- containerRef: tracksContainerRef,- playheadRef,- onSelectionComplete: (elements) => {- console.log(JSON.stringify({ onSelectionComplete: elements.length }));- setSelectedElements(elements);- },- });-- // Calculate snap indicator state- const [currentSnapPoint, setCurrentSnapPoint] = useState<SnapPoint | null>(- null- );- const showSnapIndicator =- dragState.isDragging && snappingEnabled && currentSnapPoint !== null;-- // Callback to handle snap point changes from TimelineTrackContent- const handleSnapPointChange = useCallback((snapPoint: SnapPoint | null) => {- setCurrentSnapPoint(snapPoint);- }, []);-- // Track mouse down to distinguish real clicks from drag/resize ends- const handleTimelineMouseDown = useCallback((e: React.MouseEvent) => {- // Only track mouse down on timeline background areas (not elements)- const target = e.target as HTMLElement;- const isTimelineBackground =- !target.closest(".timeline-element") &&- !playheadRef.current?.contains(target) &&- !target.closest("[data-track-labels]");-- if (isTimelineBackground) {- mouseTrackingRef.current = {- isMouseDown: true,- downX: e.clientX,- downY: e.clientY,- downTime: e.timeStamp,- };- }- }, []);-- // Timeline content click to seek handler- const handleTimelineContentClick = useCallback(- (e: React.MouseEvent) => {- const { isMouseDown, downX, downY, downTime } = mouseTrackingRef.current;-- // Reset mouse tracking- mouseTrackingRef.current = {- isMouseDown: false,- downX: 0,- downY: 0,- downTime: 0,- };-- // Only process as click if we tracked a mouse down on timeline background- if (!isMouseDown) {- console.log(- JSON.stringify({- ignoredClickWithoutMouseDown: true,- timeStamp: e.timeStamp,- })- );- return;- }-- // Check if mouse moved significantly (indicates drag, not click)- const deltaX = Math.abs(e.clientX - downX);- const deltaY = Math.abs(e.clientY - downY);- const deltaTime = e.timeStamp - downTime;-- if (deltaX > 5 || deltaY > 5 || deltaTime > 500) {- console.log(- JSON.stringify({- ignoredDragNotClick: true,- deltaX,- deltaY,- deltaTime,- timeStamp: e.timeStamp,- })- );- return;- }-- // Don't seek if this was a selection box operation- if (isSelecting || justFinishedSelecting) {- return;- }-- // Don't seek if clicking on timeline elements, but still deselect- if ((e.target as HTMLElement).closest(".timeline-element")) {- return;- }-- // Don't seek if clicking on playhead- if (playheadRef.current?.contains(e.target as Node)) {- return;- }-- // Don't seek if clicking on track labels- if ((e.target as HTMLElement).closest("[data-track-labels]")) {- clearSelectedElements();- return;- }-- // Clear selected elements when clicking empty timeline area- console.log(JSON.stringify({ clearingSelectedElements: true }));- clearSelectedElements();-- // Determine if we're clicking in ruler or tracks area- const isRulerClick = (e.target as HTMLElement).closest(- "[data-ruler-area]"- );-- let mouseX: number;- let scrollLeft = 0;-- if (isRulerClick) {- // Calculate based on ruler position- const rulerContent = rulerScrollRef.current?.querySelector(- "[data-radix-scroll-area-viewport]"- ) as HTMLElement;- if (!rulerContent) return;- const rect = rulerContent.getBoundingClientRect();- mouseX = e.clientX - rect.left;- scrollLeft = rulerContent.scrollLeft;- } else {- // Calculate based on tracks content position- const tracksContent = tracksScrollRef.current?.querySelector(- "[data-radix-scroll-area-viewport]"- ) as HTMLElement;- if (!tracksContent) return;- const rect = tracksContent.getBoundingClientRect();- mouseX = e.clientX - rect.left;- scrollLeft = tracksContent.scrollLeft;- }-- const rawTime = Math.max(- 0,- Math.min(- duration,- (mouseX + scrollLeft) /- (TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel)- )- );-- // Use frame snapping for timeline clicking- const projectFps = activeProject?.fps || 30;- const time = snapTimeToFrame(rawTime, projectFps);-- seek(time);- },- [- duration,- zoomLevel,- seek,- rulerScrollRef,- tracksScrollRef,- clearSelectedElements,- isSelecting,- justFinishedSelecting,- ]- );-- // Update timeline duration when tracks change- useEffect(() => {- const totalDuration = getTotalDuration();- setDuration(Math.max(totalDuration, 10)); // Minimum 10 seconds for empty timeline- }, [tracks, setDuration, getTotalDuration]);-- // Old marquee system removed - using new SelectionBox component instead-- const handleDragEnter = (e: React.DragEvent) => {- // When something is dragged over the timeline, show overlay- e.preventDefault();- // Don't show overlay for timeline elements - they're handled by tracks- if (e.dataTransfer.types.includes("application/x-timeline-element")) {- return;- }- dragCounterRef.current += 1;- if (!isDragOver) {- setIsDragOver(true);- }- };-- const handleDragOver = (e: React.DragEvent) => {- e.preventDefault();- };-- const handleDragLeave = (e: React.DragEvent) => {- e.preventDefault();-- // Don't update state for timeline elements - they're handled by tracks- if (e.dataTransfer.types.includes("application/x-timeline-element")) {- return;- }-- dragCounterRef.current -= 1;- if (dragCounterRef.current === 0) {- setIsDragOver(false);- }- };-- const handleDrop = async (e: React.DragEvent) => {- // When media is dropped, add it as a new track/element- e.preventDefault();- setIsDragOver(false);- dragCounterRef.current = 0;-- // Ignore timeline element drags - they're handled by track-specific handlers- const hasTimelineElement = e.dataTransfer.types.includes(- "application/x-timeline-element"- );- if (hasTimelineElement) {- return;- }-- const itemData = e.dataTransfer.getData("application/x-media-item");- if (itemData) {- try {- const dragData: DragData = JSON.parse(itemData);-- if (dragData.type === "text") {- // Always create new text track to avoid overlaps- useTimelineStore.getState().addTextToNewTrack(dragData);- } else {- // Handle media items- const mediaItem = mediaItems.find(- (item: any) => item.id === dragData.id- );- if (!mediaItem) {- toast.error("Media item not found");- return;- }-- useTimelineStore.getState().addMediaToNewTrack(mediaItem);- }- } catch (error) {- console.error("Error parsing dropped item data:", error);- toast.error("Failed to add item to timeline");- }- } else if (e.dataTransfer.files?.length > 0) {- // Handle file drops by creating new tracks- if (!activeProject) {- toast.error("No active project");- return;- }-- setIsProcessing(true);- setProgress(0);- try {- const processedItems = await processMediaFiles(- e.dataTransfer.files,- (p) => setProgress(p)- );- for (const processedItem of processedItems) {- await addMediaItem(activeProject.id, processedItem);- const currentMediaItems = useMediaStore.getState().mediaItems;- const addedItem = currentMediaItems.find(- (item) =>- item.name === processedItem.name && item.url === processedItem.url- );- if (addedItem) {- useTimelineStore.getState().addMediaToNewTrack(addedItem);- }- }- } catch (error) {- // Show error if file processing fails- console.error("Error processing external files:", error);- toast.error("Failed to process dropped files");- } finally {- setIsProcessing(false);- setProgress(0);- }- }- };-- const dragProps = {- onDragEnter: handleDragEnter,- onDragOver: handleDragOver,- onDragLeave: handleDragLeave,- onDrop: handleDrop,- };-- // Action handlers for toolbar- const handleSplitSelected = () => {- if (selectedElements.length === 0) {- toast.error("No elements selected");- return;- }- let splitCount = 0;- selectedElements.forEach(({ trackId, elementId }) => {- const track = tracks.find((t) => t.id === trackId);- const element = track?.elements.find((c) => c.id === elementId);- if (element && track) {- const effectiveStart = element.startTime;- const effectiveEnd =- element.startTime +- (element.duration - element.trimStart - element.trimEnd);-- if (currentTime > effectiveStart && currentTime < effectiveEnd) {- const newElementId = splitElement(trackId, elementId, currentTime);- if (newElementId) splitCount++;- }- }- });- if (splitCount === 0) {- toast.error("Playhead must be within selected elements to split");- }- };-- const handleDuplicateSelected = () => {- if (selectedElements.length === 0) {- toast.error("No elements selected");- return;- }- const canDuplicate = selectedElements.length === 1;- if (!canDuplicate) return;-- const newSelections: { trackId: string; elementId: string }[] = [];-- selectedElements.forEach(({ trackId, elementId }) => {- const track = tracks.find((t) => t.id === trackId);- const element = track?.elements.find((el) => el.id === elementId);-- if (element) {- const newStartTime =- element.startTime +- (element.duration - element.trimStart - element.trimEnd) +- 0.1;-- // Create element without id (will be generated by store)- const { id, ...elementWithoutId } = element;-- addElementToTrack(trackId, {- ...elementWithoutId,- startTime: newStartTime,- });-- // We can't predict the new id, so just clear selection for now- // TODO: addElementToTrack could return the new element id- }- });-- clearSelectedElements();- };-- const handleFreezeSelected = () => {- toast.info("Freeze frame functionality coming soon!");- };-- const handleSplitAndKeepLeft = () => {- if (selectedElements.length !== 1) {- toast.error("Select exactly one element");- return;- }- const { trackId, elementId } = selectedElements[0];- const track = tracks.find((t) => t.id === trackId);- const element = track?.elements.find((c) => c.id === elementId);- if (!element) return;- const effectiveStart = element.startTime;- const effectiveEnd =- element.startTime +- (element.duration - element.trimStart - element.trimEnd);- if (currentTime <= effectiveStart || currentTime >= effectiveEnd) {- toast.error("Playhead must be within selected element");- return;- }- splitAndKeepLeft(trackId, elementId, currentTime);- };-- const handleSplitAndKeepRight = () => {- if (selectedElements.length !== 1) {- toast.error("Select exactly one element");- return;- }- const { trackId, elementId } = selectedElements[0];- const track = tracks.find((t) => t.id === trackId);- const element = track?.elements.find((c) => c.id === elementId);- if (!element) return;- const effectiveStart = element.startTime;- const effectiveEnd =- element.startTime +- (element.duration - element.trimStart - element.trimEnd);- if (currentTime <= effectiveStart || currentTime >= effectiveEnd) {- toast.error("Playhead must be within selected element");- return;- }- splitAndKeepRight(trackId, elementId, currentTime);- };-- const handleSeparateAudio = () => {- if (selectedElements.length !== 1) {- toast.error("Select exactly one media element to separate audio");- return;- }- const { trackId, elementId } = selectedElements[0];- const track = tracks.find((t) => t.id === trackId);- if (!track || track.type !== "media") {- toast.error("Select a media element to separate audio");- return;- }- separateAudio(trackId, elementId);- };-- const handleDeleteSelected = () => {- if (selectedElements.length === 0) {- toast.error("No elements selected");- return;- }- selectedElements.forEach(({ trackId, elementId }) => {- removeElementFromTrack(trackId, elementId);- });- clearSelectedElements();- };-- // --- Scroll synchronization effect ---- useEffect(() => {- const rulerViewport = rulerScrollRef.current?.querySelector(- "[data-radix-scroll-area-viewport]"- ) as HTMLElement;- const tracksViewport = tracksScrollRef.current?.querySelector(- "[data-radix-scroll-area-viewport]"- ) as HTMLElement;- const trackLabelsViewport = trackLabelsScrollRef.current?.querySelector(- "[data-radix-scroll-area-viewport]"- ) as HTMLElement;-- if (!rulerViewport || !tracksViewport) return;-- // Horizontal scroll synchronization between ruler and tracks- const handleRulerScroll = () => {- const now = Date.now();- if (isUpdatingRef.current || now - lastRulerSync.current < 16) return;- lastRulerSync.current = now;- isUpdatingRef.current = true;- tracksViewport.scrollLeft = rulerViewport.scrollLeft;- isUpdatingRef.current = false;- };- const handleTracksScroll = () => {- const now = Date.now();- if (isUpdatingRef.current || now - lastTracksSync.current < 16) return;- lastTracksSync.current = now;- isUpdatingRef.current = true;- rulerViewport.scrollLeft = tracksViewport.scrollLeft;- isUpdatingRef.current = false;- };-- rulerViewport.addEventListener("scroll", handleRulerScroll);- tracksViewport.addEventListener("scroll", handleTracksScroll);-- // Vertical scroll synchronization between track labels and tracks content- if (trackLabelsViewport) {- const handleTrackLabelsScroll = () => {- const now = Date.now();- if (isUpdatingRef.current || now - lastVerticalSync.current < 16)- return;- lastVerticalSync.current = now;- isUpdatingRef.current = true;- tracksViewport.scrollTop = trackLabelsViewport.scrollTop;- isUpdatingRef.current = false;- };- const handleTracksVerticalScroll = () => {- const now = Date.now();- if (isUpdatingRef.current || now - lastVerticalSync.current < 16)- return;- lastVerticalSync.current = now;- isUpdatingRef.current = true;- trackLabelsViewport.scrollTop = tracksViewport.scrollTop;- isUpdatingRef.current = false;- };-- trackLabelsViewport.addEventListener("scroll", handleTrackLabelsScroll);- tracksViewport.addEventListener("scroll", handleTracksVerticalScroll);-- return () => {- rulerViewport.removeEventListener("scroll", handleRulerScroll);- tracksViewport.removeEventListener("scroll", handleTracksScroll);- trackLabelsViewport.removeEventListener(- "scroll",- handleTrackLabelsScroll- );- tracksViewport.removeEventListener(- "scroll",- handleTracksVerticalScroll- );- };- }-- return () => {- rulerViewport.removeEventListener("scroll", handleRulerScroll);- tracksViewport.removeEventListener("scroll", handleTracksScroll);- };- }, []);-- return (- <div- className={`h-full flex flex-col transition-colors duration-200 relative bg-panel rounded-sm overflow-hidden`}- {...dragProps}- onMouseEnter={() => setIsInTimeline(true)}- onMouseLeave={() => setIsInTimeline(false)}- >- {/* Toolbar */}- <div className="border-b flex items-center justify-between px-2 py-1">- <div className="flex items-center gap-1 w-full">- <TooltipProvider delayDuration={500}>- {/* Play/Pause Button */}- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="text"- size="icon"- onClick={toggle}- className="mr-2"- >- {isPlaying ? (- <Pause className="h-4 w-4" />- ) : (- <Play className="h-4 w-4" />- )}- </Button>- </TooltipTrigger>- <TooltipContent>- {isPlaying ? "Pause (Space)" : "Play (Space)"}- </TooltipContent>- </Tooltip>- <div className="w-px h-6 bg-border mx-1" />- {/* Time Display */}- <div- className="text-xs text-muted-foreground font-mono px-2"- style={{ minWidth: "18ch", textAlign: "center" }}- >- {currentTime.toFixed(1)}s / {duration.toFixed(1)}s- </div>- {/* Test Clip Button - for debugging */}- {tracks.length === 0 && (- <>- <div className="w-px h-6 bg-border mx-1" />- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="outline"- size="sm"- onClick={() => {- const trackId = addTrack("media");- addElementToTrack(trackId, {- type: "media",- mediaId: "test",- name: "Test Clip",- duration: TIMELINE_CONSTANTS.DEFAULT_TEXT_DURATION,- startTime: 0,- trimStart: 0,- trimEnd: 0,- });- }}- className="text-xs"- >- Add Test Clip- </Button>- </TooltipTrigger>- <TooltipContent>- Add a test clip to try playback- </TooltipContent>- </Tooltip>- </>- )}- <div className="w-px h-6 bg-border mx-1" />- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="text"- size="icon"- onClick={handleSplitSelected}- >- <Scissors className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Split element (Ctrl+S)</TooltipContent>- </Tooltip>- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="text"- size="icon"- onClick={handleSplitAndKeepLeft}- >- <ArrowLeftToLine className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Split and keep left (Ctrl+Q)</TooltipContent>- </Tooltip>- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="text"- size="icon"- onClick={handleSplitAndKeepRight}- >- <ArrowRightToLine className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Split and keep right (Ctrl+W)</TooltipContent>- </Tooltip>- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="text"- size="icon"- onClick={handleSeparateAudio}- >- <SplitSquareHorizontal className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Separate audio (Ctrl+D)</TooltipContent>- </Tooltip>- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="text"- size="icon"- onClick={handleDuplicateSelected}- >- <Copy className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Duplicate element (Ctrl+D)</TooltipContent>- </Tooltip>- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="text"- size="icon"- onClick={handleFreezeSelected}- >- <Snowflake className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Freeze frame (F)</TooltipContent>- </Tooltip>- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="text"- size="icon"- onClick={handleDeleteSelected}- >- <Trash2 className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Delete element (Delete)</TooltipContent>- </Tooltip>- </TooltipProvider>- </div>- <div className="flex items-center gap-1">- <TooltipProvider delayDuration={500}>- <Tooltip>- <TooltipTrigger asChild>- <Button variant="text" size="icon" onClick={toggleSnapping}>- {snappingEnabled ? (- <LockOpen className="h-4 w-4 text-primary" />- ) : (- <Lock className="h-4 w-4" />- )}- </Button>- </TooltipTrigger>- <TooltipContent>Auto snapping</TooltipContent>- </Tooltip>- </TooltipProvider>- </div>- </div>-- {/* Timeline Container */}- <div- className="flex-1 flex flex-col overflow-hidden relative"- ref={timelineRef}- >- <TimelinePlayhead- currentTime={currentTime}- duration={duration}- zoomLevel={zoomLevel}- tracks={tracks}- seek={seek}- rulerRef={rulerRef}- rulerScrollRef={rulerScrollRef}- tracksScrollRef={tracksScrollRef}- trackLabelsRef={trackLabelsRef}- timelineRef={timelineRef}- playheadRef={playheadRef}- isSnappingToPlayhead={- showSnapIndicator && currentSnapPoint?.type === "playhead"- }- />- <SnapIndicator- snapPoint={currentSnapPoint}- zoomLevel={zoomLevel}- tracks={tracks}- timelineRef={timelineRef}- trackLabelsRef={trackLabelsRef}- isVisible={showSnapIndicator}- />- {/* Timeline Header with Ruler */}- <div className="flex bg-panel sticky top-0 z-10">- {/* Track Labels Header */}- <div className="w-48 flex-shrink-0 bg-muted/30 border-r flex items-center justify-between px-3 py-2">- {/* Empty space */}- <span className="text-sm font-medium text-muted-foreground opacity-0">- .- </span>- </div>-- {/* Timeline Ruler */}- <div- className="flex-1 relative overflow-hidden h-4"- onWheel={handleWheel}- onMouseDown={handleSelectionMouseDown}- onClick={handleTimelineContentClick}- data-ruler-area- >- <ScrollArea className="w-full" ref={rulerScrollRef}>- <div- ref={rulerRef}- className="relative h-4 select-none cursor-default"- style={{- width: `${dynamicTimelineWidth}px`,- }}- onMouseDown={handleRulerMouseDown}- >- {/* Time markers */}- {(() => {- // Calculate appropriate time interval based on zoom level- const getTimeInterval = (zoom: number) => {- const pixelsPerSecond =- TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoom;- if (pixelsPerSecond >= 200) return 0.1; // Every 0.1s when very zoomed in- if (pixelsPerSecond >= 100) return 0.5; // Every 0.5s when zoomed in- if (pixelsPerSecond >= 50) return 1; // Every 1s at normal zoom- if (pixelsPerSecond >= 25) return 2; // Every 2s when zoomed out- if (pixelsPerSecond >= 12) return 5; // Every 5s when more zoomed out- if (pixelsPerSecond >= 6) return 10; // Every 10s when very zoomed out- return 30; // Every 30s when extremely zoomed out- };-- const interval = getTimeInterval(zoomLevel);- const markerCount = Math.ceil(duration / interval) + 1;-- return Array.from({ length: markerCount }, (_, i) => {- const time = i * interval;- if (time > duration) return null;-- const isMainMarker =- time % (interval >= 1 ? Math.max(1, interval) : 1) === 0;-- return (- <div- key={i}- className={`absolute top-0 bottom-0 ${- isMainMarker- ? "border-l border-muted-foreground/40"- : "border-l border-muted-foreground/20"- }`}- style={{- left: `${time * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel}px`,- }}- >- <span- className={`absolute top-1 left-1 text-[0.6rem] ${- isMainMarker- ? "text-muted-foreground font-medium"- : "text-muted-foreground/70"- }`}- >- {(() => {- const formatTime = (seconds: number) => {- const hours = Math.floor(seconds / 3600);- const minutes = Math.floor((seconds % 3600) / 60);- const secs = seconds % 60;-- if (hours > 0) {- return `${hours}:${minutes.toString().padStart(2, "0")}:${Math.floor(secs).toString().padStart(2, "0")}`;- } else if (minutes > 0) {- return `${minutes}:${Math.floor(secs).toString().padStart(2, "0")}`;- } else if (interval >= 1) {- return `${Math.floor(secs)}s`;- } else {- return `${secs.toFixed(1)}s`;- }- };- return formatTime(time);- })()}- </span>- </div>- );- }).filter(Boolean);- })()}- </div>- </ScrollArea>- </div>- </div>-- {/* Tracks Area */}- <div className="flex-1 flex overflow-hidden">- {/* Track Labels */}- {tracks.length > 0 && (- <div- ref={trackLabelsRef}- className="w-48 flex-shrink-0 border-r border-black overflow-y-auto"- data-track-labels- >- <ScrollArea className="w-full h-full" ref={trackLabelsScrollRef}>- <div className="flex flex-col gap-1">- {tracks.map((track) => (- <div- key={track.id}- className="flex items-center px-3 border-b border-muted/30 group bg-foreground/5"- style={{ height: `${getTrackHeight(track.type)}px` }}- >- <div className="flex items-center flex-1 min-w-0">- <TrackIcon track={track} />- </div>- {track.muted && (- <span className="ml-2 text-xs text-red-500 font-semibold flex-shrink-0">- Muted- </span>- )}- </div>- ))}- </div>- </ScrollArea>- </div>- )}-- {/* Timeline Tracks Content */}- <div- className="flex-1 relative overflow-hidden"- onWheel={handleWheel}- onMouseDown={(e) => {- handleTimelineMouseDown(e);- handleSelectionMouseDown(e);- }}- onClick={handleTimelineContentClick}- ref={tracksContainerRef}- >- <SelectionBox- startPos={selectionBox?.startPos || null}- currentPos={selectionBox?.currentPos || null}- containerRef={tracksContainerRef}- isActive={selectionBox?.isActive || false}- />- <ScrollArea className="w-full h-full" ref={tracksScrollRef}>- <div- className="relative flex-1"- style={{- height: `${Math.max(200, Math.min(800, getTotalTracksHeight(tracks)))}px`,- width: `${dynamicTimelineWidth}px`,- }}- >- {tracks.length === 0 ? (- <div></div>- ) : (- <>- {tracks.map((track, index) => (- <ContextMenu key={track.id}>- <ContextMenuTrigger asChild>- <div- className="absolute left-0 right-0 border-b border-muted/30 py-[0.05rem]"- style={{- top: `${getCumulativeHeightBefore(tracks, index)}px`,- height: `${getTrackHeight(track.type)}px`,- }}- onClick={(e) => {- // If clicking empty area (not on a element), deselect all elements- if (- !(e.target as HTMLElement).closest(- ".timeline-element"- )- ) {- clearSelectedElements();- }- }}- >- <TimelineTrackContent- track={track}- zoomLevel={zoomLevel}- onSnapPointChange={handleSnapPointChange}- />- </div>- </ContextMenuTrigger>- <ContextMenuContent>- <ContextMenuItem- onClick={() => toggleTrackMute(track.id)}- >- {track.muted ? "Unmute Track" : "Mute Track"}- </ContextMenuItem>- <ContextMenuItem>- Track settings (soon)- </ContextMenuItem>- </ContextMenuContent>- </ContextMenu>- ))}- </>- )}- </div>- </ScrollArea>- </div>- </div>- </div>- </div>- );-}--function TrackIcon({ track }: { track: TimelineTrack }) {- return (- <>- {track.type === "media" && (- <Video className="w-4 h-4 flex-shrink-0 text-muted-foreground" />- )}- {track.type === "text" && (- <TypeIcon className="w-4 h-4 flex-shrink-0 text-muted-foreground" />- )}- {track.type === "audio" && (- <Music className="w-4 h-4 flex-shrink-0 text-muted-foreground" />- )}- </>- );-}+"use client";++import { ScrollArea } from "../ui/scroll-area";+import { Button } from "../ui/button";+import {+ Scissors,+ ArrowLeftToLine,+ ArrowRightToLine,+ Trash2,+ Snowflake,+ Copy,+ SplitSquareHorizontal,+ Pause,+ Play,+ Video,+ Music,+ TypeIcon,+ Lock,+ LockOpen,+ Link,+} from "lucide-react";+import {+ Tooltip,+ TooltipContent,+ TooltipTrigger,+ TooltipProvider,+} from "../ui/tooltip";+import {+ ContextMenu,+ ContextMenuContent,+ ContextMenuItem,+ ContextMenuTrigger,+} from "../ui/context-menu";+import { useTimelineStore } from "@/stores/timeline-store";+import { useMediaStore } from "@/stores/media-store";+import { usePlaybackStore } from "@/stores/playback-store";+import { useProjectStore } from "@/stores/project-store";+import { useTimelineZoom } from "@/hooks/use-timeline-zoom";+import { processMediaFiles } from "@/lib/media-processing";+import { toast } from "sonner";+import { useState, useRef, useEffect, useCallback } from "react";+import { TimelineTrackContent } from "./timeline-track";+import {+ TimelinePlayhead,+ useTimelinePlayheadRuler,+} from "./timeline-playhead";+import { SelectionBox } from "./selection-box";+import { useSelectionBox } from "@/hooks/use-selection-box";+import { SnapIndicator } from "./snap-indicator";+import { SnapPoint } from "@/hooks/use-timeline-snapping";+import type { DragData, TimelineTrack } from "@/types/timeline";+import {+ getTrackHeight,+ getCumulativeHeightBefore,+ getTotalTracksHeight,+ TIMELINE_CONSTANTS,+ snapTimeToFrame,+} from "@/constants/timeline-constants";++export function Timeline() {+ // Timeline shows all tracks (video, audio, effects) and their elements.+ // You can drag media here to add it to your project.+ // elements can be trimmed, deleted, and moved.++ const {+ tracks,+ addTrack,+ addElementToTrack,+ removeElementFromTrack,+ removeElementFromTrackWithRipple,+ getTotalDuration,+ selectedElements,+ clearSelectedElements,+ setSelectedElements,+ splitElement,+ splitAndKeepLeft,+ splitAndKeepRight,+ toggleTrackMute,+ separateAudio,+ snappingEnabled,+ toggleSnapping,+ rippleEditingEnabled,+ toggleRippleEditing,+ dragState,+ } = useTimelineStore();+ const { mediaItems, addMediaItem } = useMediaStore();+ const { activeProject } = useProjectStore();+ const { currentTime, duration, seek, setDuration, isPlaying, toggle } =+ usePlaybackStore();+ const [isDragOver, setIsDragOver] = useState(false);+ const [isProcessing, setIsProcessing] = useState(false);+ const [progress, setProgress] = useState(0);+ const dragCounterRef = useRef(0);+ const timelineRef = useRef<HTMLDivElement>(null);+ const rulerRef = useRef<HTMLDivElement>(null);+ const [isInTimeline, setIsInTimeline] = useState(false);++ // Track mouse down/up for distinguishing clicks from drag/resize ends+ const mouseTrackingRef = useRef({+ isMouseDown: false,+ downX: 0,+ downY: 0,+ downTime: 0,+ });++ // Timeline zoom functionality+ const { zoomLevel, setZoomLevel, handleWheel } = useTimelineZoom({+ containerRef: timelineRef,+ isInTimeline,+ });++ // Old marquee selection removed - using new SelectionBox component instead++ // Dynamic timeline width calculation based on playhead position and duration+ const dynamicTimelineWidth = Math.max(+ (duration || 0) * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel, // Base width from duration+ (currentTime + 30) * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel, // Width to show current time + 30 seconds buffer+ timelineRef.current?.clientWidth || 1000 // Minimum width+ );++ // Scroll synchronization and auto-scroll to playhead+ const rulerScrollRef = useRef<HTMLDivElement>(null);+ const tracksScrollRef = useRef<HTMLDivElement>(null);+ const trackLabelsRef = useRef<HTMLDivElement>(null);+ const playheadRef = useRef<HTMLDivElement>(null);+ const trackLabelsScrollRef = useRef<HTMLDivElement>(null);+ const isUpdatingRef = useRef(false);+ const lastRulerSync = useRef(0);+ const lastTracksSync = useRef(0);+ const lastVerticalSync = useRef(0);++ // Timeline playhead ruler handlers+ const { handleRulerMouseDown } = useTimelinePlayheadRuler({+ currentTime,+ duration,+ zoomLevel,+ seek,+ rulerRef,+ rulerScrollRef,+ tracksScrollRef,+ playheadRef,+ });++ // Selection box functionality+ const tracksContainerRef = useRef<HTMLDivElement>(null);+ const {+ selectionBox,+ handleMouseDown: handleSelectionMouseDown,+ isSelecting,+ justFinishedSelecting,+ } = useSelectionBox({+ containerRef: tracksContainerRef,+ playheadRef,+ onSelectionComplete: (elements) => {+ console.log(JSON.stringify({ onSelectionComplete: elements.length }));+ setSelectedElements(elements);+ },+ });++ // Calculate snap indicator state+ const [currentSnapPoint, setCurrentSnapPoint] = useState<SnapPoint | null>(+ null+ );+ const showSnapIndicator =+ dragState.isDragging && snappingEnabled && currentSnapPoint !== null;++ // Callback to handle snap point changes from TimelineTrackContent+ const handleSnapPointChange = useCallback((snapPoint: SnapPoint | null) => {+ setCurrentSnapPoint(snapPoint);+ }, []);++ // Track mouse down to distinguish real clicks from drag/resize ends+ const handleTimelineMouseDown = useCallback((e: React.MouseEvent) => {+ // Only track mouse down on timeline background areas (not elements)+ const target = e.target as HTMLElement;+ const isTimelineBackground =+ !target.closest(".timeline-element") &&+ !playheadRef.current?.contains(target) &&+ !target.closest("[data-track-labels]");++ if (isTimelineBackground) {+ mouseTrackingRef.current = {+ isMouseDown: true,+ downX: e.clientX,+ downY: e.clientY,+ downTime: e.timeStamp,+ };+ }+ }, []);++ // Timeline content click to seek handler+ const handleTimelineContentClick = useCallback(+ (e: React.MouseEvent) => {+ const { isMouseDown, downX, downY, downTime } = mouseTrackingRef.current;++ // Reset mouse tracking+ mouseTrackingRef.current = {+ isMouseDown: false,+ downX: 0,+ downY: 0,+ downTime: 0,+ };++ // Only process as click if we tracked a mouse down on timeline background+ if (!isMouseDown) {+ console.log(+ JSON.stringify({+ ignoredClickWithoutMouseDown: true,+ timeStamp: e.timeStamp,+ })+ );+ return;+ }++ // Check if mouse moved significantly (indicates drag, not click)+ const deltaX = Math.abs(e.clientX - downX);+ const deltaY = Math.abs(e.clientY - downY);+ const deltaTime = e.timeStamp - downTime;++ if (deltaX > 5 || deltaY > 5 || deltaTime > 500) {+ console.log(+ JSON.stringify({+ ignoredDragNotClick: true,+ deltaX,+ deltaY,+ deltaTime,+ timeStamp: e.timeStamp,+ })+ );+ return;+ }++ // Don't seek if this was a selection box operation+ if (isSelecting || justFinishedSelecting) {+ return;+ }++ // Don't seek if clicking on timeline elements, but still deselect+ if ((e.target as HTMLElement).closest(".timeline-element")) {+ return;+ }++ // Don't seek if clicking on playhead+ if (playheadRef.current?.contains(e.target as Node)) {+ return;+ }++ // Don't seek if clicking on track labels+ if ((e.target as HTMLElement).closest("[data-track-labels]")) {+ clearSelectedElements();+ return;+ }++ // Clear selected elements when clicking empty timeline area+ console.log(JSON.stringify({ clearingSelectedElements: true }));+ clearSelectedElements();++ // Determine if we're clicking in ruler or tracks area+ const isRulerClick = (e.target as HTMLElement).closest(+ "[data-ruler-area]"+ );++ let mouseX: number;+ let scrollLeft = 0;++ if (isRulerClick) {+ // Calculate based on ruler position+ const rulerContent = rulerScrollRef.current?.querySelector(+ "[data-radix-scroll-area-viewport]"+ ) as HTMLElement;+ if (!rulerContent) return;+ const rect = rulerContent.getBoundingClientRect();+ mouseX = e.clientX - rect.left;+ scrollLeft = rulerContent.scrollLeft;+ } else {+ // Calculate based on tracks content position+ const tracksContent = tracksScrollRef.current?.querySelector(+ "[data-radix-scroll-area-viewport]"+ ) as HTMLElement;+ if (!tracksContent) return;+ const rect = tracksContent.getBoundingClientRect();+ mouseX = e.clientX - rect.left;+ scrollLeft = tracksContent.scrollLeft;+ }++ const rawTime = Math.max(+ 0,+ Math.min(+ duration,+ (mouseX + scrollLeft) /+ (TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel)+ )+ );++ // Use frame snapping for timeline clicking+ const projectFps = activeProject?.fps || 30;+ const time = snapTimeToFrame(rawTime, projectFps);++ seek(time);+ },+ [+ duration,+ zoomLevel,+ seek,+ rulerScrollRef,+ tracksScrollRef,+ clearSelectedElements,+ isSelecting,+ justFinishedSelecting,+ ]+ );++ // Update timeline duration when tracks change+ useEffect(() => {+ const totalDuration = getTotalDuration();+ setDuration(Math.max(totalDuration, 10)); // Minimum 10 seconds for empty timeline+ }, [tracks, setDuration, getTotalDuration]);++ // Old marquee system removed - using new SelectionBox component instead++ const handleDragEnter = (e: React.DragEvent) => {+ // When something is dragged over the timeline, show overlay+ e.preventDefault();+ // Don't show overlay for timeline elements - they're handled by tracks+ if (e.dataTransfer.types.includes("application/x-timeline-element")) {+ return;+ }+ dragCounterRef.current += 1;+ if (!isDragOver) {+ setIsDragOver(true);+ }+ };++ const handleDragOver = (e: React.DragEvent) => {+ e.preventDefault();+ };++ const handleDragLeave = (e: React.DragEvent) => {+ e.preventDefault();++ // Don't update state for timeline elements - they're handled by tracks+ if (e.dataTransfer.types.includes("application/x-timeline-element")) {+ return;+ }++ dragCounterRef.current -= 1;+ if (dragCounterRef.current === 0) {+ setIsDragOver(false);+ }+ };++ const handleDrop = async (e: React.DragEvent) => {+ // When media is dropped, add it as a new track/element+ e.preventDefault();+ setIsDragOver(false);+ dragCounterRef.current = 0;++ // Ignore timeline element drags - they're handled by track-specific handlers+ const hasTimelineElement = e.dataTransfer.types.includes(+ "application/x-timeline-element"+ );+ if (hasTimelineElement) {+ return;+ }++ const itemData = e.dataTransfer.getData("application/x-media-item");+ if (itemData) {+ try {+ const dragData: DragData = JSON.parse(itemData);++ if (dragData.type === "text") {+ // Always create new text track to avoid overlaps+ useTimelineStore.getState().addTextToNewTrack(dragData);+ } else {+ // Handle media items+ const mediaItem = mediaItems.find(+ (item: any) => item.id === dragData.id+ );+ if (!mediaItem) {+ toast.error("Media item not found");+ return;+ }++ useTimelineStore.getState().addMediaToNewTrack(mediaItem);+ }+ } catch (error) {+ console.error("Error parsing dropped item data:", error);+ toast.error("Failed to add item to timeline");+ }+ } else if (e.dataTransfer.files?.length > 0) {+ // Handle file drops by creating new tracks+ if (!activeProject) {+ toast.error("No active project");+ return;+ }++ setIsProcessing(true);+ setProgress(0);+ try {+ const processedItems = await processMediaFiles(+ e.dataTransfer.files,+ (p) => setProgress(p)+ );+ for (const processedItem of processedItems) {+ await addMediaItem(activeProject.id, processedItem);+ const currentMediaItems = useMediaStore.getState().mediaItems;+ const addedItem = currentMediaItems.find(+ (item) =>+ item.name === processedItem.name && item.url === processedItem.url+ );+ if (addedItem) {+ useTimelineStore.getState().addMediaToNewTrack(addedItem);+ }+ }+ } catch (error) {+ // Show error if file processing fails+ console.error("Error processing external files:", error);+ toast.error("Failed to process dropped files");+ } finally {+ setIsProcessing(false);+ setProgress(0);+ }+ }+ };++ const dragProps = {+ onDragEnter: handleDragEnter,+ onDragOver: handleDragOver,+ onDragLeave: handleDragLeave,+ onDrop: handleDrop,+ };++ // Action handlers for toolbar+ const handleSplitSelected = () => {+ if (selectedElements.length === 0) {+ toast.error("No elements selected");+ return;+ }+ let splitCount = 0;+ selectedElements.forEach(({ trackId, elementId }) => {+ const track = tracks.find((t) => t.id === trackId);+ const element = track?.elements.find((c) => c.id === elementId);+ if (element && track) {+ const effectiveStart = element.startTime;+ const effectiveEnd =+ element.startTime ++ (element.duration - element.trimStart - element.trimEnd);++ if (currentTime > effectiveStart && currentTime < effectiveEnd) {+ const newElementId = splitElement(trackId, elementId, currentTime);+ if (newElementId) splitCount++;+ }+ }+ });+ if (splitCount === 0) {+ toast.error("Playhead must be within selected elements to split");+ }+ };++ const handleDuplicateSelected = () => {+ if (selectedElements.length === 0) {+ toast.error("No elements selected");+ return;+ }+ const canDuplicate = selectedElements.length === 1;+ if (!canDuplicate) return;++ const newSelections: { trackId: string; elementId: string }[] = [];++ selectedElements.forEach(({ trackId, elementId }) => {+ const track = tracks.find((t) => t.id === trackId);+ const element = track?.elements.find((el) => el.id === elementId);++ if (element) {+ const newStartTime =+ element.startTime ++ (element.duration - element.trimStart - element.trimEnd) ++ 0.1;++ // Create element without id (will be generated by store)+ const { id, ...elementWithoutId } = element;++ addElementToTrack(trackId, {+ ...elementWithoutId,+ startTime: newStartTime,+ });++ // We can't predict the new id, so just clear selection for now+ // TODO: addElementToTrack could return the new element id+ }+ });++ clearSelectedElements();+ };++ const handleFreezeSelected = () => {+ toast.info("Freeze frame functionality coming soon!");+ };++ const handleSplitAndKeepLeft = () => {+ if (selectedElements.length !== 1) {+ toast.error("Select exactly one element");+ return;+ }+ const { trackId, elementId } = selectedElements[0];+ const track = tracks.find((t) => t.id === trackId);+ const element = track?.elements.find((c) => c.id === elementId);+ if (!element) return;+ const effectiveStart = element.startTime;+ const effectiveEnd =+ element.startTime ++ (element.duration - element.trimStart - element.trimEnd);+ if (currentTime <= effectiveStart || currentTime >= effectiveEnd) {+ toast.error("Playhead must be within selected element");+ return;+ }+ splitAndKeepLeft(trackId, elementId, currentTime);+ };++ const handleSplitAndKeepRight = () => {+ if (selectedElements.length !== 1) {+ toast.error("Select exactly one element");+ return;+ }+ const { trackId, elementId } = selectedElements[0];+ const track = tracks.find((t) => t.id === trackId);+ const element = track?.elements.find((c) => c.id === elementId);+ if (!element) return;+ const effectiveStart = element.startTime;+ const effectiveEnd =+ element.startTime ++ (element.duration - element.trimStart - element.trimEnd);+ if (currentTime <= effectiveStart || currentTime >= effectiveEnd) {+ toast.error("Playhead must be within selected element");+ return;+ }+ splitAndKeepRight(trackId, elementId, currentTime);+ };++ const handleSeparateAudio = () => {+ if (selectedElements.length !== 1) {+ toast.error("Select exactly one media element to separate audio");+ return;+ }+ const { trackId, elementId } = selectedElements[0];+ const track = tracks.find((t) => t.id === trackId);+ if (!track || track.type !== "media") {+ toast.error("Select a media element to separate audio");+ return;+ }+ separateAudio(trackId, elementId);+ };++ const handleDeleteSelected = () => {+ if (selectedElements.length === 0) {+ toast.error("No elements selected");+ return;+ }+ selectedElements.forEach(({ trackId, elementId }) => {+ if (rippleEditingEnabled) {+ removeElementFromTrackWithRipple(trackId, elementId);+ } else {+ removeElementFromTrack(trackId, elementId);+ }+ });+ clearSelectedElements();+ };++ // --- Scroll synchronization effect ---+ useEffect(() => {+ const rulerViewport = rulerScrollRef.current?.querySelector(+ "[data-radix-scroll-area-viewport]"+ ) as HTMLElement;+ const tracksViewport = tracksScrollRef.current?.querySelector(+ "[data-radix-scroll-area-viewport]"+ ) as HTMLElement;+ const trackLabelsViewport = trackLabelsScrollRef.current?.querySelector(+ "[data-radix-scroll-area-viewport]"+ ) as HTMLElement;++ if (!rulerViewport || !tracksViewport) return;++ // Horizontal scroll synchronization between ruler and tracks+ const handleRulerScroll = () => {+ const now = Date.now();+ if (isUpdatingRef.current || now - lastRulerSync.current < 16) return;+ lastRulerSync.current = now;+ isUpdatingRef.current = true;+ tracksViewport.scrollLeft = rulerViewport.scrollLeft;+ isUpdatingRef.current = false;+ };+ const handleTracksScroll = () => {+ const now = Date.now();+ if (isUpdatingRef.current || now - lastTracksSync.current < 16) return;+ lastTracksSync.current = now;+ isUpdatingRef.current = true;+ rulerViewport.scrollLeft = tracksViewport.scrollLeft;+ isUpdatingRef.current = false;+ };++ rulerViewport.addEventListener("scroll", handleRulerScroll);+ tracksViewport.addEventListener("scroll", handleTracksScroll);++ // Vertical scroll synchronization between track labels and tracks content+ if (trackLabelsViewport) {+ const handleTrackLabelsScroll = () => {+ const now = Date.now();+ if (isUpdatingRef.current || now - lastVerticalSync.current < 16)+ return;+ lastVerticalSync.current = now;+ isUpdatingRef.current = true;+ tracksViewport.scrollTop = trackLabelsViewport.scrollTop;+ isUpdatingRef.current = false;+ };+ const handleTracksVerticalScroll = () => {+ const now = Date.now();+ if (isUpdatingRef.current || now - lastVerticalSync.current < 16)+ return;+ lastVerticalSync.current = now;+ isUpdatingRef.current = true;+ trackLabelsViewport.scrollTop = tracksViewport.scrollTop;+ isUpdatingRef.current = false;+ };++ trackLabelsViewport.addEventListener("scroll", handleTrackLabelsScroll);+ tracksViewport.addEventListener("scroll", handleTracksVerticalScroll);++ return () => {+ rulerViewport.removeEventListener("scroll", handleRulerScroll);+ tracksViewport.removeEventListener("scroll", handleTracksScroll);+ trackLabelsViewport.removeEventListener(+ "scroll",+ handleTrackLabelsScroll+ );+ tracksViewport.removeEventListener(+ "scroll",+ handleTracksVerticalScroll+ );+ };+ }++ return () => {+ rulerViewport.removeEventListener("scroll", handleRulerScroll);+ tracksViewport.removeEventListener("scroll", handleTracksScroll);+ };+ }, []);++ return (+ <div+ className={`h-full flex flex-col transition-colors duration-200 relative bg-panel rounded-sm overflow-hidden`}+ {...dragProps}+ onMouseEnter={() => setIsInTimeline(true)}+ onMouseLeave={() => setIsInTimeline(false)}+ >+ {/* Toolbar */}+ <div className="border-b flex items-center justify-between px-2 py-1">+ <div className="flex items-center gap-1 w-full">+ <TooltipProvider delayDuration={500}>+ {/* Play/Pause Button */}+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={toggle}+ className="mr-2"+ >+ {isPlaying ? (+ <Pause className="h-4 w-4" />+ ) : (+ <Play className="h-4 w-4" />+ )}+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ {isPlaying ? "Pause (Space)" : "Play (Space)"}+ </TooltipContent>+ </Tooltip>+ <div className="w-px h-6 bg-border mx-1" />+ {/* Time Display */}+ <div+ className="text-xs text-muted-foreground font-mono px-2"+ style={{ minWidth: "18ch", textAlign: "center" }}+ >+ {currentTime.toFixed(1)}s / {duration.toFixed(1)}s+ </div>+ {/* Test Clip Button - for debugging */}+ {tracks.length === 0 && (+ <>+ <div className="w-px h-6 bg-border mx-1" />+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="outline"+ size="sm"+ onClick={() => {+ const trackId = addTrack("media");+ addElementToTrack(trackId, {+ type: "media",+ mediaId: "test",+ name: "Test Clip",+ duration: TIMELINE_CONSTANTS.DEFAULT_TEXT_DURATION,+ startTime: 0,+ trimStart: 0,+ trimEnd: 0,+ });+ }}+ className="text-xs"+ >+ Add Test Clip+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ Add a test clip to try playback+ </TooltipContent>+ </Tooltip>+ </>+ )}+ <div className="w-px h-6 bg-border mx-1" />+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={handleSplitSelected}+ >+ <Scissors className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Split element (Ctrl+S)</TooltipContent>+ </Tooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={handleSplitAndKeepLeft}+ >+ <ArrowLeftToLine className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Split and keep left (Ctrl+Q)</TooltipContent>+ </Tooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={handleSplitAndKeepRight}+ >+ <ArrowRightToLine className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Split and keep right (Ctrl+W)</TooltipContent>+ </Tooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={handleSeparateAudio}+ >+ <SplitSquareHorizontal className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Separate audio (Ctrl+D)</TooltipContent>+ </Tooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={handleDuplicateSelected}+ >+ <Copy className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Duplicate element (Ctrl+D)</TooltipContent>+ </Tooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={handleFreezeSelected}+ >+ <Snowflake className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Freeze frame (F)</TooltipContent>+ </Tooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={handleDeleteSelected}+ >+ <Trash2 className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Delete element (Delete)</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ <div className="flex items-center gap-1">+ <TooltipProvider delayDuration={500}>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button variant="text" size="icon" onClick={toggleSnapping}>+ {snappingEnabled ? (+ <LockOpen className="h-4 w-4 text-primary" />+ ) : (+ <Lock className="h-4 w-4" />+ )}+ </Button>+ </TooltipTrigger>+ <TooltipContent>Auto snapping</TooltipContent>+ </Tooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ variant="text"+ size="icon"+ onClick={toggleRippleEditing}+ >+ <Link+ className={`h-4 w-4 ${rippleEditingEnabled ? "text-primary" : ""}`}+ />+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ {rippleEditingEnabled+ ? "Disable Ripple Editing"+ : "Enable Ripple Editing"}+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ </div>++ {/* Timeline Container */}+ <div+ className="flex-1 flex flex-col overflow-hidden relative"+ ref={timelineRef}+ >+ <TimelinePlayhead+ currentTime={currentTime}+ duration={duration}+ zoomLevel={zoomLevel}+ tracks={tracks}+ seek={seek}+ rulerRef={rulerRef}+ rulerScrollRef={rulerScrollRef}+ tracksScrollRef={tracksScrollRef}+ trackLabelsRef={trackLabelsRef}+ timelineRef={timelineRef}+ playheadRef={playheadRef}+ isSnappingToPlayhead={+ showSnapIndicator && currentSnapPoint?.type === "playhead"+ }+ />+ <SnapIndicator+ snapPoint={currentSnapPoint}+ zoomLevel={zoomLevel}+ tracks={tracks}+ timelineRef={timelineRef}+ trackLabelsRef={trackLabelsRef}+ isVisible={showSnapIndicator}+ />+ {/* Timeline Header with Ruler */}+ <div className="flex bg-panel sticky top-0 z-10">+ {/* Track Labels Header */}+ <div className="w-48 flex-shrink-0 bg-muted/30 border-r flex items-center justify-between px-3 py-2">+ {/* Empty space */}+ <span className="text-sm font-medium text-muted-foreground opacity-0">+ .+ </span>+ </div>++ {/* Timeline Ruler */}+ <div+ className="flex-1 relative overflow-hidden h-4"+ onWheel={handleWheel}+ onMouseDown={handleSelectionMouseDown}+ onClick={handleTimelineContentClick}+ data-ruler-area+ >+ <ScrollArea className="w-full" ref={rulerScrollRef}>+ <div+ ref={rulerRef}+ className="relative h-4 select-none cursor-default"+ style={{+ width: `${dynamicTimelineWidth}px`,+ }}+ onMouseDown={handleRulerMouseDown}+ >+ {/* Time markers */}+ {(() => {+ // Calculate appropriate time interval based on zoom level+ const getTimeInterval = (zoom: number) => {+ const pixelsPerSecond =+ TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoom;+ if (pixelsPerSecond >= 200) return 0.1; // Every 0.1s when very zoomed in+ if (pixelsPerSecond >= 100) return 0.5; // Every 0.5s when zoomed in+ if (pixelsPerSecond >= 50) return 1; // Every 1s at normal zoom+ if (pixelsPerSecond >= 25) return 2; // Every 2s when zoomed out+ if (pixelsPerSecond >= 12) return 5; // Every 5s when more zoomed out+ if (pixelsPerSecond >= 6) return 10; // Every 10s when very zoomed out+ return 30; // Every 30s when extremely zoomed out+ };++ const interval = getTimeInterval(zoomLevel);+ const markerCount = Math.ceil(duration / interval) + 1;++ return Array.from({ length: markerCount }, (_, i) => {+ const time = i * interval;+ if (time > duration) return null;++ const isMainMarker =+ time % (interval >= 1 ? Math.max(1, interval) : 1) === 0;++ return (+ <div+ key={i}+ className={`absolute top-0 bottom-0 ${+ isMainMarker+ ? "border-l border-muted-foreground/40"+ : "border-l border-muted-foreground/20"+ }`}+ style={{+ left: `${time * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel}px`,+ }}+ >+ <span+ className={`absolute top-1 left-1 text-[0.6rem] ${+ isMainMarker+ ? "text-muted-foreground font-medium"+ : "text-muted-foreground/70"+ }`}+ >+ {(() => {+ const formatTime = (seconds: number) => {+ const hours = Math.floor(seconds / 3600);+ const minutes = Math.floor((seconds % 3600) / 60);+ const secs = seconds % 60;++ if (hours > 0) {+ return `${hours}:${minutes.toString().padStart(2, "0")}:${Math.floor(secs).toString().padStart(2, "0")}`;+ } else if (minutes > 0) {+ return `${minutes}:${Math.floor(secs).toString().padStart(2, "0")}`;+ } else if (interval >= 1) {+ return `${Math.floor(secs)}s`;+ } else {+ return `${secs.toFixed(1)}s`;+ }+ };+ return formatTime(time);+ })()}+ </span>+ </div>+ );+ }).filter(Boolean);+ })()}+ </div>+ </ScrollArea>+ </div>+ </div>++ {/* Tracks Area */}+ <div className="flex-1 flex overflow-hidden">+ {/* Track Labels */}+ {tracks.length > 0 && (+ <div+ ref={trackLabelsRef}+ className="w-48 flex-shrink-0 border-r border-black overflow-y-auto"+ data-track-labels+ >+ <ScrollArea className="w-full h-full" ref={trackLabelsScrollRef}>+ <div className="flex flex-col gap-1">+ {tracks.map((track) => (+ <div+ key={track.id}+ className="flex items-center px-3 border-b border-muted/30 group bg-foreground/5"+ style={{ height: `${getTrackHeight(track.type)}px` }}+ >+ <div className="flex items-center flex-1 min-w-0">+ <TrackIcon track={track} />+ </div>+ {track.muted && (+ <span className="ml-2 text-xs text-red-500 font-semibold flex-shrink-0">+ Muted+ </span>+ )}+ </div>+ ))}+ </div>+ </ScrollArea>+ </div>+ )}++ {/* Timeline Tracks Content */}+ <div+ className="flex-1 relative overflow-hidden"+ onWheel={handleWheel}+ onMouseDown={(e) => {+ handleTimelineMouseDown(e);+ handleSelectionMouseDown(e);+ }}+ onClick={handleTimelineContentClick}+ ref={tracksContainerRef}+ >+ <SelectionBox+ startPos={selectionBox?.startPos || null}+ currentPos={selectionBox?.currentPos || null}+ containerRef={tracksContainerRef}+ isActive={selectionBox?.isActive || false}+ />+ <ScrollArea className="w-full h-full" ref={tracksScrollRef}>+ <div+ className="relative flex-1"+ style={{+ height: `${Math.max(200, Math.min(800, getTotalTracksHeight(tracks)))}px`,+ width: `${dynamicTimelineWidth}px`,+ }}+ >+ {tracks.length === 0 ? (+ <div></div>+ ) : (+ <>+ {tracks.map((track, index) => (+ <ContextMenu key={track.id}>+ <ContextMenuTrigger asChild>+ <div+ className="absolute left-0 right-0 border-b border-muted/30 py-[0.05rem]"+ style={{+ top: `${getCumulativeHeightBefore(tracks, index)}px`,+ height: `${getTrackHeight(track.type)}px`,+ }}+ onClick={(e) => {+ // If clicking empty area (not on a element), deselect all elements+ if (+ !(e.target as HTMLElement).closest(+ ".timeline-element"+ )+ ) {+ clearSelectedElements();+ }+ }}+ >+ <TimelineTrackContent+ track={track}+ zoomLevel={zoomLevel}+ onSnapPointChange={handleSnapPointChange}+ />+ </div>+ </ContextMenuTrigger>+ <ContextMenuContent>+ <ContextMenuItem+ onClick={() => toggleTrackMute(track.id)}+ >+ {track.muted ? "Unmute Track" : "Mute Track"}+ </ContextMenuItem>+ <ContextMenuItem>+ Track settings (soon)+ </ContextMenuItem>+ </ContextMenuContent>+ </ContextMenu>+ ))}+ </>+ )}+ </div>+ </ScrollArea>+ </div>+ </div>+ </div>+ </div>+ );+}++function TrackIcon({ track }: { track: TimelineTrack }) {+ return (+ <>+ {track.type === "media" && (+ <Video className="w-4 h-4 flex-shrink-0 text-muted-foreground" />+ )}+ {track.type === "text" && (+ <TypeIcon className="w-4 h-4 flex-shrink-0 text-muted-foreground" />+ )}+ {track.type === "audio" && (+ <Music className="w-4 h-4 flex-shrink-0 text-muted-foreground" />+ )}+ </>+ );+}diff --git a/apps/web/src/lib/timeline.ts b/apps/web/src/lib/timeline.tsnew file mode 100644index 00000000..531defac--- /dev/null+++ b/apps/web/src/lib/timeline.ts@@ -0,0 +1,54 @@+import { TimelineElement } from "@/types/timeline";++// Helper function to check for element overlaps and prevent invalid timeline states+export const checkElementOverlaps = (elements: TimelineElement[]): boolean => {+ // Sort elements by start time+ const sortedElements = [...elements].sort(+ (a, b) => a.startTime - b.startTime+ );++ for (let i = 0; i < sortedElements.length - 1; i++) {+ const current = sortedElements[i];+ const next = sortedElements[i + 1];++ const currentEnd =+ current.startTime ++ (current.duration - current.trimStart - current.trimEnd);++ // Check if current element overlaps with next element+ if (currentEnd > next.startTime) return true; // Overlap detected+ }++ return false; // No overlaps+};++// Helper function to resolve overlaps by adjusting element positions+export const resolveElementOverlaps = (+ elements: TimelineElement[]+): TimelineElement[] => {+ // Sort elements by start time+ const sortedElements = [...elements].sort(+ (a, b) => a.startTime - b.startTime+ );+ const resolvedElements: TimelineElement[] = [];++ for (let i = 0; i < sortedElements.length; i++) {+ const current = { ...sortedElements[i] };++ if (resolvedElements.length > 0) {+ const previous = resolvedElements[resolvedElements.length - 1];+ const previousEnd =+ previous.startTime ++ (previous.duration - previous.trimStart - previous.trimEnd);++ // If current element would overlap with previous, push it after previous ends+ if (current.startTime < previousEnd) {+ current.startTime = previousEnd;+ }+ }++ resolvedElements.push(current);+ }++ return resolvedElements;+};diff --git a/apps/web/src/stores/timeline-store.ts b/apps/web/src/stores/timeline-store.tsindex 9a2c7361..1fcfc60e 100644--- a/apps/web/src/stores/timeline-store.ts+++ b/apps/web/src/stores/timeline-store.ts@@ -21,6 +21,7 @@ import { useProjectStore } from "./project-store";import { generateUUID } from "@/lib/utils";import { TIMELINE_CONSTANTS } from "@/constants/timeline-constants";import { toast } from "sonner";+import { checkElementOverlaps, resolveElementOverlaps } from "@/lib/timeline";// Helper function to manage element naming with suffixesconst getElementNameWithSuffix = (@@ -55,6 +56,10 @@ interface TimelineStore {// Snapping actionstoggleSnapping: () => void;+ // Ripple editing mode+ rippleEditingEnabled: boolean;+ toggleRippleEditing: () => void;+// Multi-selectionselectedElements: { trackId: string; elementId: string }[];selectElement: (trackId: string, elementId: string, multi?: boolean) => void;@@ -89,6 +94,7 @@ interface TimelineStore {addTrack: (type: TrackType) => string;insertTrackAt: (type: TrackType, index: number) => string;removeTrack: (trackId: string) => void;+ removeTrackWithRipple: (trackId: string) => void;addElementToTrack: (trackId: string, element: CreateTimelineElement) => void;removeElementFromTrack: (trackId: string, elementId: string) => void;moveElementToTrack: (@@ -139,6 +145,17 @@ interface TimelineStore {newFile: File) => Promise<boolean>;+ // Ripple editing functions+ updateElementStartTimeWithRipple: (+ trackId: string,+ elementId: string,+ newStartTime: number+ ) => void;+ removeElementFromTrackWithRipple: (+ trackId: string,+ elementId: string+ ) => void;+// Computed valuesgetTotalDuration: () => number;@@ -226,6 +243,7 @@ export const useTimelineStore = create<TimelineStore>((set, get) => {history: [],redoStack: [],selectedElements: [],+ rippleEditingEnabled: false,// Snapping settings defaultssnappingEnabled: true,@@ -346,10 +364,107 @@ export const useTimelineStore = create<TimelineStore>((set, get) => {},removeTrack: (trackId) => {+ const { rippleEditingEnabled } = get();++ if (rippleEditingEnabled) {+ get().removeTrackWithRipple(trackId);+ } else {+ get().pushHistory();+ updateTracksAndSave(+ get()._tracks.filter((track) => track.id !== trackId)+ );+ }+ },++ removeTrackWithRipple: (trackId) => {+ const { _tracks } = get();+ const trackToRemove = _tracks.find((t) => t.id === trackId);++ if (!trackToRemove) return;+get().pushHistory();- updateTracksAndSave(- get()._tracks.filter((track) => track.id !== trackId)- );++ // If track has no elements, just remove it normally+ if (trackToRemove.elements.length === 0) {+ updateTracksAndSave(_tracks.filter((track) => track.id !== trackId));+ return;+ }++ // Find all the time ranges occupied by elements in the track being removed+ const occupiedRanges = trackToRemove.elements.map((element) => ({+ startTime: element.startTime,+ endTime:+ element.startTime ++ (element.duration - element.trimStart - element.trimEnd),+ }));++ // Sort ranges by start time+ occupiedRanges.sort((a, b) => a.startTime - b.startTime);++ // Merge overlapping ranges to get consolidated gaps+ const mergedRanges: Array<{+ startTime: number;+ endTime: number;+ duration: number;+ }> = [];++ for (const range of occupiedRanges) {+ if (mergedRanges.length === 0) {+ mergedRanges.push({+ startTime: range.startTime,+ endTime: range.endTime,+ duration: range.endTime - range.startTime,+ });+ } else {+ const lastRange = mergedRanges[mergedRanges.length - 1];+ if (range.startTime <= lastRange.endTime) {+ // Overlapping or adjacent ranges, merge them+ lastRange.endTime = Math.max(lastRange.endTime, range.endTime);+ lastRange.duration = lastRange.endTime - lastRange.startTime;+ } else {+ // Non-overlapping range, add as new+ mergedRanges.push({+ startTime: range.startTime,+ endTime: range.endTime,+ duration: range.endTime - range.startTime,+ });+ }+ }+ }++ // Remove the track and apply ripple effects to remaining tracks+ const updatedTracks = _tracks+ .filter((track) => track.id !== trackId)+ .map((track) => {+ const updatedElements = track.elements.map((element) => {+ let newStartTime = element.startTime;++ // Process gaps from right to left (latest to earliest) to avoid cumulative shifts+ for (let i = mergedRanges.length - 1; i >= 0; i--) {+ const gap = mergedRanges[i];+ // If this element starts after the gap, shift it left by the gap duration+ if (newStartTime >= gap.endTime) {+ newStartTime -= gap.duration;+ }+ }++ return {+ ...element,+ startTime: Math.max(0, newStartTime),+ };+ });++ // Check for overlaps and resolve them if necessary+ const hasOverlaps = checkElementOverlaps(updatedElements);+ if (hasOverlaps) {+ const resolvedElements = resolveElementOverlaps(updatedElements);+ return { ...track, elements: resolvedElements };+ }++ return { ...track, elements: updatedElements };+ });++ updateTracksAndSave(updatedTracks);},addElementToTrack: (trackId, elementData) => {@@ -434,21 +549,99 @@ export const useTimelineStore = create<TimelineStore>((set, get) => {},removeElementFromTrack: (trackId, elementId) => {+ const { rippleEditingEnabled } = get();++ if (rippleEditingEnabled) {+ get().removeElementFromTrackWithRipple(trackId, elementId);+ } else {+ get().pushHistory();+ updateTracksAndSave(+ get()+ ._tracks.map((track) =>+ track.id === trackId+ ? {+ ...track,+ elements: track.elements.filter(+ (element) => element.id !== elementId+ ),+ }+ : track+ )+ .filter((track) => track.elements.length > 0)+ );+ }+ },++ removeElementFromTrackWithRipple: (trackId, elementId) => {+ const { _tracks, rippleEditingEnabled } = get();++ if (!rippleEditingEnabled) {+ // If ripple editing is disabled, use regular removal+ get().removeElementFromTrack(trackId, elementId);+ return;+ }++ const track = _tracks.find((t) => t.id === trackId);+ const element = track?.elements.find((e) => e.id === elementId);++ if (!element || !track) return;+get().pushHistory();- updateTracksAndSave(- get()- ._tracks.map((track) =>- track.id === trackId- ? {- ...track,- elements: track.elements.filter(- (element) => element.id !== elementId++ const elementStartTime = element.startTime;+ const elementDuration =+ element.duration - element.trimStart - element.trimEnd;+ const elementEndTime = elementStartTime + elementDuration;++ // Remove the element and shift all elements that come after it+ const updatedTracks = _tracks+ .map((currentTrack) => {+ // Only apply ripple effects to the same track unless multi-track ripple is enabled+ const shouldApplyRipple = currentTrack.id === trackId;++ const updatedElements = currentTrack.elements+ .filter((currentElement) => {+ // Remove the target element+ if (+ currentElement.id === elementId &&+ currentTrack.id === trackId+ ) {+ return false;+ }+ return true;+ })+ .map((currentElement) => {+ // Only apply ripple effects if we should process this track+ if (!shouldApplyRipple) {+ return currentElement;+ }++ // Shift elements that start after the removed element+ if (currentElement.startTime >= elementEndTime) {+ return {+ ...currentElement,+ startTime: Math.max(+ 0,+ currentElement.startTime - elementDuration),- }- : track- )- .filter((track) => track.elements.length > 0)- );+ };+ }+ return currentElement;+ });++ // Check for overlaps and resolve them if necessary+ const hasOverlaps = checkElementOverlaps(updatedElements);+ if (hasOverlaps) {+ // Resolve overlaps by adjusting element positions+ const resolvedElements = resolveElementOverlaps(updatedElements);+ return { ...currentTrack, elements: resolvedElements };+ }++ return { ...currentTrack, elements: updatedElements };+ })+ .filter((track) => track.elements.length > 0 || track.isMain);++ updateTracksAndSave(updatedTracks);},moveElementToTrack: (fromTrackId, toTrackId, elementId) => {@@ -544,6 +737,95 @@ export const useTimelineStore = create<TimelineStore>((set, get) => {);},+ updateElementStartTimeWithRipple: (trackId, elementId, newStartTime) => {+ const { _tracks, rippleEditingEnabled } = get();++ if (!rippleEditingEnabled) {+ // If ripple editing is disabled, use regular update+ get().updateElementStartTime(trackId, elementId, newStartTime);+ return;+ }++ const track = _tracks.find((t) => t.id === trackId);+ const element = track?.elements.find((e) => e.id === elementId);++ if (!element || !track) return;++ get().pushHistory();++ const oldStartTime = element.startTime;+ const oldEndTime =+ element.startTime ++ (element.duration - element.trimStart - element.trimEnd);+ const newEndTime =+ newStartTime + (element.duration - element.trimStart - element.trimEnd);+ const timeDelta = newStartTime - oldStartTime;++ // Update tracks based on multi-track ripple setting+ const updatedTracks = _tracks.map((currentTrack) => {+ // Only apply ripple effects to the same track unless multi-track ripple is enabled+ const shouldApplyRipple = currentTrack.id === trackId;++ const updatedElements = currentTrack.elements.map((currentElement) => {+ if (currentElement.id === elementId && currentTrack.id === trackId) {+ // Update the moved element+ return { ...currentElement, startTime: newStartTime };+ }++ // Only apply ripple effects if we should process this track+ if (!shouldApplyRipple) {+ return currentElement;+ }++ // For ripple editing, we need to move elements that come after the moved element+ const currentElementStart = currentElement.startTime;+ const currentElementEnd =+ currentElement.startTime ++ (currentElement.duration -+ currentElement.trimStart -+ currentElement.trimEnd);++ // If moving element to the right (positive delta)+ if (timeDelta > 0) {+ // Move elements that start after the original position of the moved element+ if (currentElementStart >= oldEndTime) {+ return {+ ...currentElement,+ startTime: currentElementStart + timeDelta,+ };+ }+ }+ // If moving element to the left (negative delta)+ else if (timeDelta < 0) {+ // Move elements that start after the new position of the moved element+ if (+ currentElementStart >= newEndTime &&+ currentElementStart >= oldStartTime+ ) {+ return {+ ...currentElement,+ startTime: Math.max(0, currentElementStart + timeDelta),+ };+ }+ }++ return currentElement;+ });++ // Check for overlaps and resolve them if necessary+ const hasOverlaps = checkElementOverlaps(updatedElements);+ if (hasOverlaps) {+ // Resolve overlaps by adjusting element positions+ const resolvedElements = resolveElementOverlaps(updatedElements);+ return { ...currentTrack, elements: resolvedElements };+ }++ return { ...currentTrack, elements: updatedElements };+ });++ updateTracksAndSave(updatedTracks);+ },+toggleTrackMute: (trackId) => {get().pushHistory();updateTracksAndSave(@@ -982,6 +1264,13 @@ export const useTimelineStore = create<TimelineStore>((set, get) => {set((state) => ({ snappingEnabled: !state.snappingEnabled }));},+ // Ripple editing functions+ toggleRippleEditing: () => {+ set((state) => ({+ rippleEditingEnabled: !state.rippleEditingEnabled,+ }));+ },+checkElementOverlap: (trackId, startTime, duration, excludeElementId) => {const track = get()._tracks.find((t) => t.id === trackId);if (!track) return false;