pastilhas
0a55964db5
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.
50 lines
2.1 KiB
TypeScript
50 lines
2.1 KiB
TypeScript
import { useClient } from 'hooks/useClient';
|
|
import { MicVocal } from 'lucide-react';
|
|
import { LyricsPane } from './LyricsPane';
|
|
import { useLyrics } from './useLyrics';
|
|
import { useLyricsOpen } from './useLyricsOpen';
|
|
import { useMusicPlayer } from './useMusicPlayer';
|
|
|
|
/**
|
|
* The right-hand half of the /music detail panel when lyrics are on. It follows the PLAYING track, not
|
|
* the browsed album — which is why it reads the player rather than taking props from the album view.
|
|
*/
|
|
export const LyricsPanel = () => {
|
|
const { token } = useClient();
|
|
const { current } = useMusicPlayer();
|
|
const [, toggleLyrics] = useLyricsOpen();
|
|
const lyrics = useLyrics(current?.albumRel ?? '', current?.file ?? '', true, token);
|
|
|
|
// `dark` is not decoration: the theme tokens are CSS variables scoped to a `.dark` ancestor, so marking
|
|
// this subtree re-points foreground/muted-foreground/border at their dark values. Without it a light
|
|
// theme would paint near-black text on the black sheet.
|
|
return (
|
|
<div className="dark flex h-full flex-col bg-black">
|
|
<div className="flex shrink-0 items-center gap-2 border-b border-border px-4 py-2">
|
|
<MicVocal size={15} className="shrink-0 text-muted-foreground" />
|
|
<div className="min-w-0 flex-1">
|
|
<p className="truncate text-sm font-medium text-foreground">{current?.title ?? current?.file ?? 'Lyrics'}</p>
|
|
{current?.artist && <p className="truncate text-xs text-muted-foreground">{current.artist}</p>}
|
|
</div>
|
|
<button
|
|
type="button"
|
|
onClick={toggleLyrics}
|
|
title="Hide lyrics"
|
|
className="shrink-0 cursor-pointer text-xs text-muted-foreground hover:text-foreground"
|
|
>
|
|
Close
|
|
</button>
|
|
</div>
|
|
<div className="min-h-0 flex-1">
|
|
{current ? (
|
|
<LyricsPane lines={lyrics.lines} synced={lyrics.synced} loading={lyrics.loading} />
|
|
) : (
|
|
<div className="flex h-full items-center justify-center px-6 text-center text-sm text-muted-foreground">
|
|
Play something to see its lyrics.
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
);
|
|
};
|