Skip to content

AI media harness for planning, generating, and editing locally

TypeScript

Keep music player beneath song library

Bittibd4c36289e13
diff --git a/src/components/workspace/MusicView.tsx b/src/components/workspace/MusicView.tsx
index 66b5331..803355c 100644
--- a/src/components/workspace/MusicView.tsx
+++ b/src/components/workspace/MusicView.tsx
@@ -236,20 +236,20 @@ export function MusicView({ config, folderPath, onChange, onGenerate, onCancel,
</div>
</> : <p className="music-inspector__empty">Add a song to edit its lyrics, style and generation settings.</p>}
</aside>
- </div>
- <div className="music-player" aria-label="Music player">
- <div className="music-player__now"><Audio16 /><div><strong>{playerAsset?.name ?? "No song playing"}</strong><span>{playing ? "Playing" : playerAsset ? "Paused" : "Choose a generated song"}</span></div></div>
- <div className="music-player__transport">
- <div className="music-player__buttons"><button type="button" className="icon-button" aria-label="Previous song" disabled={!playable.length} onClick={() => move(-1)}><GoToStart16 /></button><button type="button" className="music-player__toggle primary-button" aria-label={playing ? "Pause music" : "Play music"} disabled={!playable.length && !playerAsset} onClick={toggle}>{playing ? <Pause16 /> : <Play16 />}</button><button type="button" className="icon-button" aria-label="Next song" disabled={!playable.length} onClick={() => move(1)}><GoToEnd16 /></button></div>
- <div className="music-player__seek"><span>{time(position)}</span><Slider aria-label="Song playback position" min={0} max={length || 1} step={0.1} value={position} disabled={!url || !length} onChange={(value) => { if (audio.current) audio.current.currentTime = value; setPosition(value); }} /><span>{time(length)}</span></div>
+ <div className="music-player" aria-label="Music player">
+ <div className="music-player__now"><Audio16 /><div><strong>{playerAsset?.name ?? "No song playing"}</strong><span>{playing ? "Playing" : playerAsset ? "Paused" : "Choose a generated song"}</span></div></div>
+ <div className="music-player__transport">
+ <div className="music-player__buttons"><button type="button" className="icon-button" aria-label="Previous song" disabled={!playable.length} onClick={() => move(-1)}><GoToStart16 /></button><button type="button" className="music-player__toggle primary-button" aria-label={playing ? "Pause music" : "Play music"} disabled={!playable.length && !playerAsset} onClick={toggle}>{playing ? <Pause16 /> : <Play16 />}</button><button type="button" className="icon-button" aria-label="Next song" disabled={!playable.length} onClick={() => move(1)}><GoToEnd16 /></button></div>
+ <div className="music-player__seek"><span>{time(position)}</span><Slider aria-label="Song playback position" min={0} max={length || 1} step={0.1} value={position} disabled={!url || !length} onChange={(value) => { if (audio.current) audio.current.currentTime = value; setPosition(value); }} /><span>{time(length)}</span></div>
+ </div>
+ <div className="music-player__volume"><Speaker14 /><Slider aria-label="Music volume" min={0} max={1} step={0.01} value={volume} onChange={setVolume} /></div>
+ {playbackError && <p className="music-player__error" role="alert">{playbackError}</p>}
+ <audio ref={audio} src={url ?? undefined} preload="metadata" onPlay={() => setPlaying(true)} onPause={() => setPlaying(false)}
+ onLoadedMetadata={(event) => { const duration = event.currentTarget.duration; setLength(Number.isFinite(duration) ? duration : 0); }}
+ onCanPlay={() => { if (playWhenReady.current) { playWhenReady.current = false; void play(); } }}
+ onTimeUpdate={(event) => setPosition(event.currentTarget.currentTime)} onEnded={() => { setPlaying(false); const index = playable.findIndex(({ asset }) => asset.id === playerId); if (index >= 0 && index + 1 < playable.length) playAsset(playable[index + 1].asset); }}
+ onError={() => { if (url) { playWhenReady.current = false; setPlaying(false); setPlaybackError("This song could not be played."); } }} />
</div>
- <div className="music-player__volume"><Speaker14 /><Slider aria-label="Music volume" min={0} max={1} step={0.01} value={volume} onChange={setVolume} /></div>
- {playbackError && <p className="music-player__error" role="alert">{playbackError}</p>}
- <audio ref={audio} src={url ?? undefined} preload="metadata" onPlay={() => setPlaying(true)} onPause={() => setPlaying(false)}
- onLoadedMetadata={(event) => { const duration = event.currentTarget.duration; setLength(Number.isFinite(duration) ? duration : 0); }}
- onCanPlay={() => { if (playWhenReady.current) { playWhenReady.current = false; void play(); } }}
- onTimeUpdate={(event) => setPosition(event.currentTarget.currentTime)} onEnded={() => { setPlaying(false); const index = playable.findIndex(({ asset }) => asset.id === playerId); if (index >= 0 && index + 1 < playable.length) playAsset(playable[index + 1].asset); }}
- onError={() => { if (url) { playWhenReady.current = false; setPlaying(false); setPlaybackError("This song could not be played."); } }} />
</div>
<ProjectStatus label="Music status">
<span>{config.musicSongs?.length ?? 0} songs</span>
diff --git a/src/styles/music.css b/src/styles/music.css
index e259a97..77395f4 100644
--- a/src/styles/music.css
+++ b/src/styles/music.css
@@ -3,8 +3,9 @@
.music-toolbar > .generator-runtime { flex: 0 1 auto; }
.music-toolbar__views { display: flex; gap: var(--space-1); margin-left: auto; }
.music-toolbar__views [aria-pressed="true"] { background: var(--fill-subtle-hover); color: var(--accent); }
-.music-body { display: grid; grid-template-columns: minmax(180px, 1fr) auto minmax(280px, var(--pane-music-inspector)); min-height: 0; }
-.music-library { min-width: 0; overflow: auto; padding: var(--space-4); }
+.music-body { display: grid; grid-template-columns: minmax(180px, 1fr) auto minmax(280px, var(--pane-music-inspector)); grid-template-rows: minmax(0, 1fr) auto; min-height: 0; }
+.music-body > .ui-splitter { grid-column: 2; grid-row: 1 / -1; }
+.music-library { grid-column: 1; grid-row: 1; min-width: 0; overflow: auto; padding: var(--space-4); }
.music-library__heading { display: flex; align-items: center; justify-content: space-between; gap: var(--space-2); margin-bottom: var(--space-4); }
.music-library__heading h2 { margin: 0; font-size: var(--text-lg); min-width: 0; overflow-wrap: anywhere; }
.music-folders { display: flex; flex-wrap: wrap; gap: var(--space-1); max-height: 128px; overflow-y: auto; margin-bottom: var(--space-3); }
@@ -39,23 +40,23 @@
.music-empty { display: flex; flex-direction: column; align-items: center; justify-content: center; min-height: 260px; padding: var(--space-4); text-align: center; }
.music-empty > svg { width: 48px; height: 48px; color: var(--text-secondary); }
.music-empty p { max-width: 340px; color: var(--text-secondary); }
-.music-inspector { display: flex; flex-direction: column; min-width: 0; min-height: 0; background: var(--surface-pane); }
+.music-inspector { grid-column: 3; grid-row: 1 / -1; display: flex; flex-direction: column; min-width: 0; min-height: 0; background: var(--surface-pane); }
.music-inspector__fields { overflow-y: auto; min-height: 0; flex: 1; }
.music-prompt { display: flex; flex-direction: column; gap: var(--space-1); color: var(--text-secondary); margin-top: var(--space-2); }
.music-prompt textarea { width: 100%; height: auto; padding: var(--space-2); line-height: var(--leading-normal); resize: vertical; }
.music-inspector > .inspector-actions p, .music-inspector__empty { color: var(--text-secondary); font-size: var(--text-xs); }
.music-inspector__empty { padding: var(--space-3); }
.music-inspector > .inspector-actions progress { width: 100%; }
-.music-player { display: grid; grid-template-columns: minmax(100px, 1fr) minmax(200px, 2fr) minmax(90px, 1fr); align-items: center; gap: var(--space-4); padding: var(--space-1) var(--space-4); border-top: 1px solid var(--line); background: var(--surface-pane); }
-.music-player__now { display: flex; align-items: center; gap: var(--space-3); min-width: 0; }
+.music-player { grid-column: 1; grid-row: 2; display: grid; grid-template-columns: minmax(0, 1fr) minmax(140px, 2fr) minmax(0, 1fr); min-width: 0; align-items: center; gap: var(--space-2); padding: var(--space-1) var(--space-2); border-top: 1px solid var(--line); background: var(--surface-pane); }
+.music-player__now { display: flex; align-items: center; gap: var(--space-3); min-width: 0; overflow: hidden; }
.music-player__now > div { display: grid; gap: var(--space-1); min-width: 0; }
-.music-player__now strong { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.music-player__now strong, .music-player__now span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.music-player__transport { display: grid; gap: 0; }
.music-player__buttons { display: flex; justify-content: center; align-items: center; gap: var(--space-3); }
.music-player__toggle { min-width: 40px; }
.music-player__seek { display: flex; align-items: center; gap: var(--space-2); font-size: var(--text-xs); font-variant-numeric: tabular-nums; }
.music-player__seek .ui-slider { flex: 1; min-width: 0; }
-.music-player__volume { display: flex; align-items: center; justify-self: end; gap: var(--space-2); width: min(130px, 100%); }
+.music-player__volume { display: flex; align-items: center; justify-self: end; gap: var(--space-2); width: min(130px, 100%); min-width: 0; overflow: hidden; }
.music-player__volume .ui-slider { width: 100%; min-width: 0; }
.music-player__error { grid-column: 1 / -1; margin: 0; color: var(--text-secondary); }
.project-content--music { overflow: hidden; }