officerdev/src/MusicPlayer/ → plugins/music/web/. Engine, state, bar, favourites, lyrics toggle and the library vocabulary — ten files. The barrel stops exporting a player it no longer has, and DashboardLayout stops rendering one. The reasoning that kept it was removed rather than refuted. It stayed because the dashboard widget imported useMusicPlayer from officerdev and the platform cannot import from a plugin, so the state had to stay whatever was decided about the UI. The owner moved the widget into the plugin in the previous commit, and the constraint went with it: the whole remaining dependency became one line, DashboardLayout.tsx:66. MusicPlayerHost is mounted inside the MusicDetail panel. That reads odd until you notice it already returned null on /music — the mini bar is the transport there, and the host existed purely to own the GaplessEngine. In the panel it does exactly that, and the bar code stays intact for whenever there is a slot. [phase 2] Leaving /music unmounts the host and playback stops. Deferred on the owner's call; the bar was "navigating away must not break the application", and that holds: seekPlayer is optional-chained so a call with no host registered is a no-op, registerPlayerSeek clears only its own registration, the host's cleanup destroys the engine and nulls its ref, and the queue is global state so returning to /music remounts and reloads. Solving it properly needs either a shell slot a plugin can contribute to — which reopens "there is no way to export a component" — or the engine hoisted to module scope, which keeps the rule and loses only the off-route controls. Also: the parked widget now imports the player as a sibling rather than through officerdev, and shared.ts stopped being a re-export shim now that the real file is in the plugin. Verified: tsgo clean, 797 tests / 787 pass / same 7. Server restarts, mounts /example /music /offscale, / and /music both 200, and the player is in the built bundle (music.volume, music:lyrics, now-playing?device=web all present — GaplessEngine is a class name and the production build is minified, so grepping for it proves nothing). Not verified by me: what it looks like in a browser. That needs your eyes.
104 lines
3.9 KiB
TypeScript
104 lines
3.9 KiB
TypeScript
import { useRef } from 'react';
|
|
import { useClient } from 'hooks/useClient';
|
|
import { MicVocal, Pause, Play } from 'lucide-react';
|
|
import { SeekBar } from 'officerdev';
|
|
import { coverUrl, fmtClock } from './shared';
|
|
import { seekPlayer } from './player-time';
|
|
import { useLyricsOpen } from './useLyricsOpen';
|
|
import { useMusicPlayer } from './useMusicPlayer';
|
|
import { usePlayerClock } from './usePlayerClock';
|
|
|
|
/**
|
|
* The player, reduced to what the /music screen does not already show. The album view has the transport
|
|
* and the tracklist, so this is the scrubber — plus play/pause and the lyrics toggle, which are the two
|
|
* controls you can still want while browsing an album that ISN'T the one playing.
|
|
*
|
|
* It sits inside the detail panel, which is why the full dock hides on /music: two bars would be one bar
|
|
* too many, and the dock's own row costs the workspace its height on every screen.
|
|
*/
|
|
export const MusicMiniBar = () => {
|
|
const { token } = useClient();
|
|
const { current, playing, toggle } = useMusicPlayer();
|
|
const [lyricsOpen, toggleLyrics] = useLyricsOpen();
|
|
const { position, duration } = usePlayerClock();
|
|
const barRef = useRef<HTMLDivElement>(null);
|
|
|
|
if (!current) return null;
|
|
|
|
const onSeekDown = (ev: React.MouseEvent<HTMLDivElement>) => {
|
|
const seekAt = (clientX: number) => {
|
|
const bar = barRef.current;
|
|
if (!bar || !duration) return;
|
|
const rect = bar.getBoundingClientRect();
|
|
seekPlayer(Math.max(0, Math.min(1, (clientX - rect.left) / rect.width)) * duration);
|
|
};
|
|
ev.preventDefault();
|
|
seekAt(ev.clientX);
|
|
const onMove = (moveEv: MouseEvent) => seekAt(moveEv.clientX);
|
|
const onUp = () => {
|
|
window.removeEventListener('mousemove', onMove);
|
|
window.removeEventListener('mouseup', onUp);
|
|
};
|
|
window.addEventListener('mousemove', onMove);
|
|
window.addEventListener('mouseup', onUp);
|
|
};
|
|
|
|
return (
|
|
<div className="flex shrink-0 items-center gap-3 border-t border-border bg-card/60 px-4 py-2">
|
|
<div className="flex h-9 w-9 shrink-0 items-center justify-center overflow-hidden rounded bg-muted">
|
|
<img
|
|
src={coverUrl(current.albumRel, token)}
|
|
alt=""
|
|
className="h-full w-full object-cover"
|
|
onError={(ev) => {
|
|
(ev.currentTarget as HTMLImageElement).style.visibility = 'hidden';
|
|
}}
|
|
/>
|
|
</div>
|
|
|
|
<button
|
|
type="button"
|
|
onClick={toggle}
|
|
title={playing ? 'Pause' : 'Play'}
|
|
className="flex h-8 w-8 shrink-0 cursor-pointer items-center justify-center rounded-full bg-primary text-primary-foreground hover:opacity-90 active:scale-95"
|
|
>
|
|
{playing ? <Pause size={15} /> : <Play size={15} className="ml-0.5" />}
|
|
</button>
|
|
|
|
<div className="hidden w-48 min-w-0 shrink-0 sm:block">
|
|
<p className="truncate text-xs font-medium text-foreground">{current.title ?? current.file}</p>
|
|
{current.artist && <p className="truncate text-[11px] text-muted-foreground">{current.artist}</p>}
|
|
</div>
|
|
|
|
<span className="w-10 shrink-0 text-right font-mono text-[10px] tabular-nums text-muted-foreground">
|
|
{fmtClock(position)}
|
|
</span>
|
|
<div className="min-w-0 flex-1">
|
|
<SeekBar
|
|
barRef={barRef}
|
|
onSeekDown={onSeekDown}
|
|
pct={duration ? (position / duration) * 100 : 0}
|
|
trackClass="bg-muted"
|
|
fillClass="bg-primary"
|
|
thumbClass="border-background"
|
|
/>
|
|
</div>
|
|
<span className="w-10 shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">
|
|
{fmtClock(duration)}
|
|
</span>
|
|
|
|
<button
|
|
type="button"
|
|
onClick={toggleLyrics}
|
|
title={lyricsOpen ? 'Hide lyrics' : 'Show lyrics'}
|
|
aria-pressed={lyricsOpen}
|
|
className={`shrink-0 cursor-pointer p-1 hover:text-foreground ${
|
|
lyricsOpen ? 'text-primary' : 'text-muted-foreground'
|
|
}`}
|
|
>
|
|
<MicVocal size={16} />
|
|
</button>
|
|
</div>
|
|
);
|
|
};
|