The open-source CapCut alternative
Merge branch 'staging' into pr/vishesh711/284
Maze Winther49d467cd8352
diff --cc apps/web/src/components/editor/timeline.tsxindex ca5bb672,4a770627..6775e845--- a/apps/web/src/components/editor/timeline.tsx+++ b/apps/web/src/components/editor/timeline.tsx@@@ -571,32 -377,10 +572,10 @@@ export function Timeline()if (dragData.type === "text") {// Always create new text track to avoid overlaps- const newTrackId = addTrack("text");-- addElementToTrack(newTrackId, {- type: "text",- name: dragData.name || "Text",- content: dragData.content || "Default Text",- duration: TIMELINE_CONSTANTS.DEFAULT_TEXT_DURATION,- startTime: 0,- trimStart: 0,- trimEnd: 0,- fontSize: 48,- fontFamily: "Arial",- color: "#ffffff",- backgroundColor: "transparent",- textAlign: "center",- fontWeight: "normal",- fontStyle: "normal",- textDecoration: "none",- x: 0,- y: 0,- rotation: 0,- opacity: 1,- });+ useTimelineStore.getState().addTextToNewTrack(dragData);} else {// Handle media items- const mediaItem = mediaItems.find((item) => item.id === dragData.id);+ const mediaItem = mediaItems.find((item: any) => item.id === dragData.id);if (!mediaItem) {toast.error("Media item not found");return;