Fixed multiple issues with the track layout system: 1. Effect cards now expandable/collapsible - Added onToggleExpanded callback to EffectDevice - Effect expansion state is properly toggled and persisted 2. Removed left column spacers causing misalignment - Removed automation lane spacer (h-32) - Removed effects section spacer (h-64/h-8) - Automation lanes and effects now only in waveform column - This eliminates the height mismatch between columns 3. Layout now cleaner - Left column stays fixed with only track controls - Right column contains waveforms, automation, and effects - No artificial spacers needed for alignment The automation lanes and effects sections now appear properly in the waveform area without creating alignment issues in the controls column. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
416 lines
17 KiB
TypeScript
416 lines
17 KiB
TypeScript
'use client';
|
|
|
|
import * as React from 'react';
|
|
import { Plus, Upload } from 'lucide-react';
|
|
import { Button } from '@/components/ui/Button';
|
|
import { Track } from './Track';
|
|
import { TrackExtensions } from './TrackExtensions';
|
|
import { ImportTrackDialog } from './ImportTrackDialog';
|
|
import type { Track as TrackType } from '@/types/track';
|
|
import { createEffect, type EffectType, EFFECT_NAMES } from '@/lib/audio/effects/chain';
|
|
import { AutomationLane } from '@/components/automation/AutomationLane';
|
|
import type { AutomationPoint as AutomationPointType } from '@/types/automation';
|
|
import { createAutomationPoint } from '@/lib/audio/automation/utils';
|
|
|
|
export interface TrackListProps {
|
|
tracks: TrackType[];
|
|
zoom: number;
|
|
currentTime: number;
|
|
duration: number;
|
|
selectedTrackId?: string | null;
|
|
onSelectTrack?: (trackId: string | null) => void;
|
|
onAddTrack: () => void;
|
|
onImportTrack?: (buffer: AudioBuffer, name: string) => void;
|
|
onRemoveTrack: (trackId: string) => void;
|
|
onUpdateTrack: (trackId: string, updates: Partial<TrackType>) => void;
|
|
onSeek?: (time: number) => void;
|
|
onSelectionChange?: (trackId: string, selection: { start: number; end: number } | null) => void;
|
|
onToggleRecordEnable?: (trackId: string) => void;
|
|
recordingTrackId?: string | null;
|
|
recordingLevel?: number;
|
|
trackLevels?: Record<string, number>;
|
|
onParameterTouched?: (trackId: string, laneId: string, touched: boolean) => void;
|
|
isPlaying?: boolean;
|
|
}
|
|
|
|
export function TrackList({
|
|
tracks,
|
|
zoom,
|
|
currentTime,
|
|
duration,
|
|
selectedTrackId,
|
|
onSelectTrack,
|
|
onAddTrack,
|
|
onImportTrack,
|
|
onRemoveTrack,
|
|
onUpdateTrack,
|
|
onSeek,
|
|
onSelectionChange,
|
|
onToggleRecordEnable,
|
|
recordingTrackId,
|
|
recordingLevel = 0,
|
|
trackLevels = {},
|
|
onParameterTouched,
|
|
isPlaying = false,
|
|
}: TrackListProps) {
|
|
const [importDialogOpen, setImportDialogOpen] = React.useState(false);
|
|
const waveformScrollRef = React.useRef<HTMLDivElement>(null);
|
|
const controlsScrollRef = React.useRef<HTMLDivElement>(null);
|
|
|
|
// Synchronize vertical scroll between controls and waveforms
|
|
const handleWaveformScroll = React.useCallback(() => {
|
|
if (waveformScrollRef.current && controlsScrollRef.current) {
|
|
controlsScrollRef.current.scrollTop = waveformScrollRef.current.scrollTop;
|
|
}
|
|
}, []);
|
|
|
|
const handleImportTrack = (buffer: AudioBuffer, name: string) => {
|
|
if (onImportTrack) {
|
|
onImportTrack(buffer, name);
|
|
}
|
|
};
|
|
|
|
if (tracks.length === 0) {
|
|
return (
|
|
<>
|
|
<div className="flex-1 flex flex-col items-center justify-center gap-4 text-muted-foreground">
|
|
<p className="text-sm">No tracks yet. Add a track to get started.</p>
|
|
<div className="flex gap-2">
|
|
<Button onClick={onAddTrack} variant="secondary">
|
|
<Plus className="h-4 w-4 mr-2" />
|
|
Add Empty Track
|
|
</Button>
|
|
{onImportTrack && (
|
|
<Button onClick={() => setImportDialogOpen(true)} variant="secondary">
|
|
<Upload className="h-4 w-4 mr-2" />
|
|
Import Audio Files
|
|
</Button>
|
|
)}
|
|
</div>
|
|
</div>
|
|
{onImportTrack && (
|
|
<ImportTrackDialog
|
|
open={importDialogOpen}
|
|
onClose={() => setImportDialogOpen(false)}
|
|
onImportTrack={handleImportTrack}
|
|
/>
|
|
)}
|
|
</>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<div className="flex-1 flex flex-col overflow-hidden">
|
|
{/* Track List - Two Column Layout */}
|
|
<div className="flex-1 flex overflow-hidden">
|
|
{/* Left Column: Track Controls (Fixed Width, No Scroll - synced with waveforms) */}
|
|
<div ref={controlsScrollRef} className="w-48 flex-shrink-0 overflow-hidden pb-3 border-r border-border">
|
|
{tracks.map((track) => (
|
|
<React.Fragment key={track.id}>
|
|
{/* Track Controls */}
|
|
<Track
|
|
track={track}
|
|
zoom={zoom}
|
|
currentTime={currentTime}
|
|
duration={duration}
|
|
isSelected={selectedTrackId === track.id}
|
|
onSelect={onSelectTrack ? () => onSelectTrack(track.id) : undefined}
|
|
onToggleMute={() =>
|
|
onUpdateTrack(track.id, { mute: !track.mute })
|
|
}
|
|
onToggleSolo={() =>
|
|
onUpdateTrack(track.id, { solo: !track.solo })
|
|
}
|
|
onToggleCollapse={() =>
|
|
onUpdateTrack(track.id, { collapsed: !track.collapsed })
|
|
}
|
|
onVolumeChange={(volume) =>
|
|
onUpdateTrack(track.id, { volume })
|
|
}
|
|
onPanChange={(pan) =>
|
|
onUpdateTrack(track.id, { pan })
|
|
}
|
|
onRemove={() => onRemoveTrack(track.id)}
|
|
onNameChange={(name) =>
|
|
onUpdateTrack(track.id, { name })
|
|
}
|
|
onUpdateTrack={onUpdateTrack}
|
|
onSeek={onSeek}
|
|
onLoadAudio={(buffer) =>
|
|
onUpdateTrack(track.id, { audioBuffer: buffer })
|
|
}
|
|
onToggleEffect={(effectId) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.map((e) =>
|
|
e.id === effectId ? { ...e, enabled: !e.enabled } : e
|
|
),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onRemoveEffect={(effectId) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.filter((e) => e.id !== effectId),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onUpdateEffect={(effectId, parameters) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.map((e) =>
|
|
e.id === effectId ? { ...e, parameters } : e
|
|
),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onAddEffect={(effectType) => {
|
|
const newEffect = createEffect(
|
|
effectType,
|
|
EFFECT_NAMES[effectType]
|
|
);
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: [...track.effectChain.effects, newEffect],
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onSelectionChange={
|
|
onSelectionChange
|
|
? (selection) => onSelectionChange(track.id, selection)
|
|
: undefined
|
|
}
|
|
onToggleRecordEnable={
|
|
onToggleRecordEnable
|
|
? () => onToggleRecordEnable(track.id)
|
|
: undefined
|
|
}
|
|
isRecording={recordingTrackId === track.id}
|
|
recordingLevel={recordingTrackId === track.id ? recordingLevel : 0}
|
|
playbackLevel={trackLevels[track.id] || 0}
|
|
onParameterTouched={onParameterTouched}
|
|
isPlaying={isPlaying}
|
|
renderControlsOnly={true}
|
|
/>
|
|
</React.Fragment>
|
|
))}
|
|
</div>
|
|
|
|
{/* Right Column: Waveforms (Flexible Width, Shared Horizontal & Vertical Scroll) */}
|
|
<div
|
|
ref={waveformScrollRef}
|
|
onScroll={handleWaveformScroll}
|
|
className="flex-1 overflow-auto custom-scrollbar"
|
|
>
|
|
<div className="flex flex-col">
|
|
{tracks.map((track) => (
|
|
<React.Fragment key={track.id}>
|
|
{/* Track Waveform Row */}
|
|
<Track
|
|
track={track}
|
|
zoom={zoom}
|
|
currentTime={currentTime}
|
|
duration={duration}
|
|
isSelected={selectedTrackId === track.id}
|
|
onSelect={onSelectTrack ? () => onSelectTrack(track.id) : undefined}
|
|
onToggleMute={() =>
|
|
onUpdateTrack(track.id, { mute: !track.mute })
|
|
}
|
|
onToggleSolo={() =>
|
|
onUpdateTrack(track.id, { solo: !track.solo })
|
|
}
|
|
onToggleCollapse={() =>
|
|
onUpdateTrack(track.id, { collapsed: !track.collapsed })
|
|
}
|
|
onVolumeChange={(volume) =>
|
|
onUpdateTrack(track.id, { volume })
|
|
}
|
|
onPanChange={(pan) =>
|
|
onUpdateTrack(track.id, { pan })
|
|
}
|
|
onRemove={() => onRemoveTrack(track.id)}
|
|
onNameChange={(name) =>
|
|
onUpdateTrack(track.id, { name })
|
|
}
|
|
onUpdateTrack={onUpdateTrack}
|
|
onSeek={onSeek}
|
|
onLoadAudio={(buffer) =>
|
|
onUpdateTrack(track.id, { audioBuffer: buffer })
|
|
}
|
|
onToggleEffect={(effectId) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.map((e) =>
|
|
e.id === effectId ? { ...e, enabled: !e.enabled } : e
|
|
),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onRemoveEffect={(effectId) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.filter((e) => e.id !== effectId),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onUpdateEffect={(effectId, parameters) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.map((e) =>
|
|
e.id === effectId ? { ...e, parameters } : e
|
|
),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onAddEffect={(effectType) => {
|
|
const newEffect = createEffect(
|
|
effectType,
|
|
EFFECT_NAMES[effectType]
|
|
);
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: [...track.effectChain.effects, newEffect],
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onSelectionChange={
|
|
onSelectionChange
|
|
? (selection) => onSelectionChange(track.id, selection)
|
|
: undefined
|
|
}
|
|
onToggleRecordEnable={
|
|
onToggleRecordEnable
|
|
? () => onToggleRecordEnable(track.id)
|
|
: undefined
|
|
}
|
|
isRecording={recordingTrackId === track.id}
|
|
recordingLevel={recordingTrackId === track.id ? recordingLevel : 0}
|
|
playbackLevel={trackLevels[track.id] || 0}
|
|
onParameterTouched={onParameterTouched}
|
|
isPlaying={isPlaying}
|
|
renderWaveformOnly={true}
|
|
/>
|
|
|
|
{/* Automation Lane Section */}
|
|
{!track.collapsed && track.automation?.showAutomation && (
|
|
<div className="bg-muted/30 border-b border-border">
|
|
{track.automation.lanes
|
|
.filter((lane) => lane.parameterId === track.automation.selectedParameterId)
|
|
.map((lane) => (
|
|
<AutomationLane
|
|
key={lane.id}
|
|
lane={lane}
|
|
trackId={track.id}
|
|
zoom={zoom}
|
|
currentTime={currentTime}
|
|
duration={duration}
|
|
isPlaying={isPlaying}
|
|
onAddPoint={(time, value) => {
|
|
const newPoint = createAutomationPoint(time, value);
|
|
const updatedLanes = track.automation.lanes.map((l) =>
|
|
l.id === lane.id
|
|
? { ...l, points: [...l.points, newPoint].sort((a, b) => a.time - b.time) }
|
|
: l
|
|
);
|
|
onUpdateTrack(track.id, {
|
|
automation: { ...track.automation, lanes: updatedLanes },
|
|
});
|
|
}}
|
|
onUpdatePoint={(pointId, updates) => {
|
|
const updatedLanes = track.automation.lanes.map((l) =>
|
|
l.id === lane.id
|
|
? {
|
|
...l,
|
|
points: l.points.map((p) =>
|
|
p.id === pointId ? { ...p, ...updates } : p
|
|
),
|
|
}
|
|
: l
|
|
);
|
|
onUpdateTrack(track.id, {
|
|
automation: { ...track.automation, lanes: updatedLanes },
|
|
});
|
|
}}
|
|
onRemovePoint={(pointId) => {
|
|
const updatedLanes = track.automation.lanes.map((l) =>
|
|
l.id === lane.id
|
|
? { ...l, points: l.points.filter((p) => p.id !== pointId) }
|
|
: l
|
|
);
|
|
onUpdateTrack(track.id, {
|
|
automation: { ...track.automation, lanes: updatedLanes },
|
|
});
|
|
}}
|
|
onUpdateLane={(updates) => {
|
|
const updatedLanes = track.automation.lanes.map((l) =>
|
|
l.id === lane.id ? { ...l, ...updates } : l
|
|
);
|
|
onUpdateTrack(track.id, {
|
|
automation: { ...track.automation, lanes: updatedLanes },
|
|
});
|
|
}}
|
|
onSeek={onSeek}
|
|
/>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
{/* Effects Section */}
|
|
<TrackExtensions
|
|
track={track}
|
|
onUpdateTrack={onUpdateTrack}
|
|
onToggleEffect={(effectId) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.map((e) =>
|
|
e.id === effectId ? { ...e, enabled: !e.enabled } : e
|
|
),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onRemoveEffect={(effectId) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.filter((e) => e.id !== effectId),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onUpdateEffect={(effectId, parameters) => {
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: track.effectChain.effects.map((e) =>
|
|
e.id === effectId ? { ...e, parameters } : e
|
|
),
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
onAddEffect={(effectType) => {
|
|
const newEffect = createEffect(
|
|
effectType,
|
|
EFFECT_NAMES[effectType]
|
|
);
|
|
const updatedChain = {
|
|
...track.effectChain,
|
|
effects: [...track.effectChain.effects, newEffect],
|
|
};
|
|
onUpdateTrack(track.id, { effectChain: updatedChain });
|
|
}}
|
|
/>
|
|
</React.Fragment>
|
|
))}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Import Dialog */}
|
|
{onImportTrack && (
|
|
<ImportTrackDialog
|
|
open={importDialogOpen}
|
|
onClose={() => setImportDialogOpen(false)}
|
|
onImportTrack={handleImportTrack}
|
|
/>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|