External/OpenCut
1
0
Fork 0
mirror of https://github.com/OpenCut-app/OpenCut.git synced 2026-07-13 21:52:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: ensure text tracks are always created above media tracks

Browse Source
This commit is contained in:
Maze Winther
2025-07-22 01:01:54 +02:00
parent 550f5363fd
commit c783062121
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/src/stores/timeline-store.ts
+4 -3
View File
@@ -1317,8 +1317,9 @@ export const useTimelineStore = create<TimelineStore>((set, get) => {
findOrCreateTrack: (trackType) => { findOrCreateTrack: (trackType) => {
// Always create new text track to allow multiple text elements // Always create new text track to allow multiple text elements
// Insert text tracks at the top
if (trackType === "text") { if (trackType === "text") {
return get().addTrack(trackType); return get().insertTrackAt(trackType, 0);
} }
const existingTrack = get()._tracks.find((t) => t.type === trackType); const existingTrack = get()._tracks.find((t) => t.type === trackType);
@@ -1356,7 +1357,7 @@ export const useTimelineStore = create<TimelineStore>((set, get) => {
}, },
addTextAtTime: (item, currentTime = 0) => { addTextAtTime: (item, currentTime = 0) => {
const targetTrackId = get().addTrack("text"); // Always create new text track to allow multiple text elements const targetTrackId = get().insertTrackAt("text", 0); // Always create new text track at the top
get().addElementToTrack(targetTrackId, { get().addElementToTrack(targetTrackId, {
type: "text", type: "text",
@@ -1399,7 +1400,7 @@ export const useTimelineStore = create<TimelineStore>((set, get) => {
}, },
addTextToNewTrack: (item) => { addTextToNewTrack: (item) => {
const targetTrackId = get().addTrack("text"); // Always create new text track to allow multiple text elements const targetTrackId = get().insertTrackAt("text", 0); // Always create new text track at the top
get().addElementToTrack(targetTrackId, { get().addElementToTrack(targetTrackId, {
type: "text", type: "text",
apps/web/src/types/timeline.ts
+9 -3
View File
@@ -89,13 +89,19 @@ export interface TimelineTrack {
export function sortTracksByOrder(tracks: TimelineTrack[]): TimelineTrack[] { export function sortTracksByOrder(tracks: TimelineTrack[]): TimelineTrack[] {
return [...tracks].sort((a, b) => { return [...tracks].sort((a, b) => {
// Text tracks always go to the top
if (a.type === "text" && b.type !== "text") return -1;
if (b.type === "text" && a.type !== "text") return 1;
// Audio tracks always go to bottom // Audio tracks always go to bottom
if (a.type === "audio" && b.type !== "audio") return 1; if (a.type === "audio" && b.type !== "audio") return 1;
if (b.type === "audio" && a.type !== "audio") return -1; if (b.type === "audio" && a.type !== "audio") return -1;
// Main track goes above audio but below other tracks // Main track goes above audio but below text tracks
if (a.isMain && !b.isMain && b.type !== "audio") return 1; if (a.isMain && !b.isMain && b.type !== "audio" && b.type !== "text")
if (b.isMain && !a.isMain && a.type !== "audio") return -1; return 1;
if (b.isMain && !a.isMain && a.type !== "audio" && a.type !== "text")
return -1;
// Within same category, maintain creation order // Within same category, maintain creation order
return 0; return 0;