The open-source CapCut alternative
Merge branch 'main' into feature/optimize-timeline-ruler
Khắc Tuấn2974fd89a942
diff --cc apps/web/src/app/editor/[project_id]/page.tsxindex f48d032a,65667106..d9d8a08c--- a/apps/web/src/app/editor/[project_id]/page.tsx+++ b/apps/web/src/app/editor/[project_id]/page.tsx@@@ -34,9 -33,10 +34,11 @@@ export default function Editor()const { activeProject, loadProject, createNewProject } = useProjectStore();const params = useParams();+ const router = useRouter();const projectId = params.project_id as string;+ const handledProjectIds = useRef<Set<string>>(new Set());+ useDisableBrowserZoom();usePlaybackControls();useEffect(() => {diff --cc apps/web/src/components/editor/timeline.tsxindex 7b7455e0,4a770627..c6e6a331--- a/apps/web/src/components/editor/timeline.tsx+++ b/apps/web/src/components/editor/timeline.tsx@@@ -15,9 -15,9 +15,10 @@@ importVideo,Music,TypeIcon,- Magnet,Lock,+ ZoomIn,+ ZoomOut,+ LockOpen,} from "lucide-react";import {Tooltip,diff --cc apps/web/src/constants/timeline-constants.tsindex f012db7b,8c76a2e8..05e44e2f--- a/apps/web/src/constants/timeline-constants.ts+++ b/apps/web/src/constants/timeline-constants.ts@@@ -74,12 -74,8 +74,13 @@@ export const TIMELINE_CONSTANTS =PIXELS_PER_SECOND: 50,TRACK_HEIGHT: 60, // Default fallbackDEFAULT_TEXT_DURATION: 5,+ DEFAULT_IMAGE_DURATION: 5,ZOOM_LEVELS: [0.25, 0.5, 1, 1.5, 2, 3, 4],+ ZOOM_LEVEL_MIN: 0.1,+ ZOOM_LEVEL_MAX: 10,+ ZOOM_STEP_BASE: 0.15,+ MAX_ZOOM_STEP: 66,+ ZOOM_STEP: 1,} as const;// FPS presets for project settings