mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-21 14:05:41 +00:00
418b25914a
* chore(cover): scaffold cover module and rust cover_cache stub Wave 0: src/cover/ skeleton per contracts.md §12, stub IPC commands in cover_cache/mod.rs (no-op returns until phase B). * feat(cover): add unified cover module and tier resolver (phase A) Wave 1A: tiers, storage keys, resolveJs with cold/sibling races, useCoverArt, CoverArtImage, layoutSizes, playback scope helpers, coverSiblings tier ladder, deprecated shims on subsonicStreamUrl. * feat(cover): rust disk cache and tier-ready events (phase B) Wave 1B: cover_cache module with WebP tier encode, HTTP canonical 800 fetch, cover_cache_* commands, cover:tier-ready / cover:evicted events, disk layout tests. * feat(cover): prefetch hook, tier-ready handoff, library backfill IPC (phase B/C) Wave 2: useCoverArtPrefetch, cover:tier-ready/evicted bridge, one-time IDB cover key clear, prefetch registry drain, MainApp wiring. * feat(cover): migrate dense grids to CoverArtImage and prefetch (phase D) Wave 3A: dense surfaces use layout-native displayCssPx, surface=dense, coverPrefetchRegister on Home/Albums/search; AlbumCard cell width from grid. * feat(cover): migrate sparse surfaces and integrations (phase E sparse) Wave 3B: sparse CoverArtImage/useCoverArt, lightbox tier 2000, ArtistHeroCover, MPRIS/Discord/export integrations, playback chrome and detail heroes. * feat(cover): revalidation scheduler and disk pressure gate (phase E+) Wave 4: coverCacheMaxMb settings (en/ru), StorageTab disk usage, cover_cache_configure, useCoverRevalidateScheduler, playbackServer uses cover fetchUrl; pressure watermarks. * docs: CHANGELOG and credits for cover art pipeline PR #869 * fix(cover): stop webview getCoverArt storm on dense grids (429) Dense surfaces no longer put rotating getCoverArt URLs in img src; load disk via Rust ensure + convertFileSrc. Tier-ready notifies listeners instead of invalidating IDB. Throttle background prefetch and cap Home registry. * fix(cover): omit empty img src until cover URL is ready React 19 warns on src=""; CoverArtImage uses undefined until disk/IDB resolves; queue current track shows placeholder when src is still empty. * fix(cover): disk cache by host index key, parallel ensure, asset protocol Bind cover storage to serverIndexKey (library host), rename cover IPC/events, fix REST base URL and Tauri flat args, enable protocol-asset for disk paths, add prioritized ensure queue, and wipe legacy profile-UUID cache once. Limit Vite dep scan to index.html so research/target HTML is ignored. * fix(cover): WebP tiers, disk peek, home cache, asset URLs for mainstage Encode lossy WebP (~82), write only missing tiers, library cover backfill, and cover_cache_peek_batch for fast paint from disk. diskSrcCache + CSP asset protocol; no IDB fallback when server is up. Session Home feed cache with warm peek on return; BecauseYouLike deduped cover hook and high prefetch. * feat(cover): per-server cache strategy and native library backfill Move cover disk cache settings to Offline & cache with Lazy/Aggressive per server, per-server clear, and no size cap. Run full-catalog backfill on the Rust runtime (sync-idle wake, bounded HTTP, bulk 800px writes without flooding the webview). Drop global prefetch limits from auth store and waveform clear from the offline storage block. * fix(build): CSP connect-src for Subsonic API; quieter prod nix build Prod webview blocked axios ping after cover CSP (missing connect-src). Drop cargo tauri -v in flake build, raise Vite chunk limit, ignore tsbuildinfo. * fix(cover): complete WebP ladder in library bulk backfill Aggressive backfill now writes all derived tiers (128–800), skips IDs only when the full ladder exists (not 800 alone), avoids fetch-failed markers on bulk HTTP errors, and stops the pass when the active server changes. * fix(cover,home): navigation-priority backfill and Because You Like UX Pause library cover backfill while navigating; split peek/ensure traffic so grids and rails win over bulk work. Disk src lookup, grid warm hooks, and non-blocking mainstage prime for faster visible covers. Because You Like: session snapshot, staggered horizontal skeleton row, text hidden until cover is ready, and layout aligned with loaded cards. * feat(random-albums,library): local-first album fetch + cover art pipeline Random Albums теперь запрашивает локальный SQLite-индекс (ORDER BY RANDOM() LIMIT N) вместо сетевого запроса к серверу. При готовом индексе спиннер исчезает практически мгновенно; сеть используется только как фолбэк. - advanced_search.rs: добавляет `("random", _) => RANDOM()` в allowlist сортировок - browseTextSearch.ts: runLocalRandomAlbums — SQLite-рандом для Albums - RandomAlbums.tsx: doFetchRandomAlbums local-first для обоих путей (без жанра и с жанром через runLocalAlbumsByGenres + JS-shuffle); speculative reserve прогревает следующий батч в фоне после каждого Refresh Также: обновление пайплайна обложек (coverTraffic, peekQueue, ensureQueue, diskSrcLookup, warmDiskPeek, prefetchRegistry, useCoverArt, useWarmGridCovers, useCoverNavigationPriority, resolveIntersectionScrollRoot и сопутствующие компоненты/хуки). * fix(random-albums): prevent double-load on Zustand rehydration useEffect([selectedGenres, load]) fired twice on every visit: first with default store values, then again ~50 ms later when Zustand rehydrated mixMinRatingFilterEnabled/minAlbum/minArtist from localStorage. Previously this was invisible because the first network fetch took ~1.5 s, so loadingRef.current was still true on the second fire. With the new local-first SQLite path the first load completes in ~50 ms, leaving the guard cleared before rehydration triggers a second random batch. Fix: ref-pattern — keep loadRef.current fresh on every render, effect depends only on selectedGenres. Manual Refresh and genre-filter changes still call the latest closure correctly. * fix(random-albums): stop warmCoverDiskSrcBatch in fillReserve from causing visual flash fillReserve вызывал warmCoverDiskSrcBatch для обложек резервного батча, что вызывало bumpDiskSrcCache() для каждой новой обложки (~30+ вызовов). Это будило всех подписчиков useCoverArt на текущей странице, провоцируя видимую перерисовку примерно через ~1.5 с после загрузки (когда filterAlbumsByMixRatings делает сетевые запросы к рейтингам артистов). - fillReserve: убран warmCoverDiskSrcBatch — обложки прогреваются лениво при consume резерва через primeAlbumCoversForDisplay - reserve-путь в load(): добавлен primeAlbumCoversForDisplay перед setAlbums (аналогично non-reserve пути; при уже прогретом кэше — мгновенно) * feat(because-you-like): reserve-first pattern — instant display on return visits Каждый визит на Mainstage после первого теперь отдаёт готовую заготовку мгновенно, вместо spinner → сетевые запросы → контент. Архитектура: - resolvePicks / fetchBecauseYouLike вынесены на уровень модуля (выход из замыкания useEffect); читают текущий localStorage, возвращают { anchor, recs, nextAnchorHistory, nextPicksHistory } - fillBecauseReserve — fire-and-forget фоновая функция: запускается сразу после отображения результата, кладёт следующий батч в _becauseReserve. Covers намеренно не прогреваются (bumpDiskSrcCache на текущей странице не нужен); они прогреваются через primeAlbumCoversForDisplay при consume. - useLayoutEffect: если reserve готов — не сбрасывает стейт в skeleton (контент появляется без мигания) - useEffect: reserve-first path — consume → primeCovers → setState → fill; full-fetch path сохранён как fallback при первом визите или промахе Поведение: - Визит 1: full fetch (как раньше) → показ → fillReserve R1 - Визит 2+: consume R1 → мгновенный показ → fillReserve R2 - При сетевом сбое: restore из session cache (как раньше) * fix(because-you-like): initialise state from reserve — no skeleton flash on remount При ремаунте компонент стартовал с refreshing=true/anchor=null/recs=[] и показывал skeleton на один тик до того как useEffect отработает. Теперь useState() использует lazy initializers, которые читают _becauseReserve прямо в первом рендере: если reserve валиден — state сразу refreshing=false, anchor=X, recs=[...] и skeleton не показывается вообще. Covers уже в diskSrcCache (из предыдущего показа) и появляются без дополнительных запросов. useLayoutEffect упрощён: вызывает hasValidReserve() и сбрасывает в skeleton только если reserve отсутствует (для случая navigation без ремаунта). * fix(because-you-like): apply reserve in useLayoutEffect to handle async pool arrival Lazy initializers не могли применить reserve при первом рендере, потому что mostPlayed/recentlyPlayed/starred приходят из Home.tsx асинхронно — pool=[] на первом рендере, poolKey не совпадает с reserve. useLayoutEffect теперь активно ставит стейт из reserve (а не просто не сбрасывает): когда pool обновляется до реальных данных, useLayoutEffect срабатывает синхронно до paint, проверяет reserve и сразу применяет anchor/recs/refreshing=false. При отсутствии reserve — сбрасывает в skeleton как прежде. * fix(because-you-like): reserve > cache > skeleton — eliminate skeleton flash on mount Корневая причина: Home.tsx загружает mostPlayed асинхронно через useEffect, поэтому на первом рендере pool=[], poolKey=''. Reserve хранится с реальным poolKey → mismatch → lazy initializers запускали skeleton. Теперь двухуровневый fallback без зависимости от poolKey: 1. reserve (serverId + poolKey совпадают) → мгновенный новый батч 2. becauseYouLikeCache (только serverId) → stale-while-revalidate, контент доступен сразу с mount, обновляется тихо в фоне 3. skeleton → только при полном отсутствии данных (первый визит) Применяется одинаково в lazy useState initializers, useLayoutEffect и full-fetch path useEffect (не сбрасывать в skeleton пока есть cached контент). * fix(because-you-like): key reserve by serverId only; guard useEffect on empty pool Проблема: reserve хранился с poolKey, но на первом рендере pool=[] → poolKey='' → mismatch → показывался кэш (предыдущий набор) ~500ms пока Home.tsx не загружал mostPlayed. Исправления: - BecauseReserve: убран poolKey — reserve валиден для любого pool-состояния на том же сервере. Pool (топ-артисты) меняется медленно; один раз показать reserve с чуть устаревшим anchor лучше чем показывать предыдущий набор 500ms - hasValidReserve: проверяет только serverId - fillBecauseReserve: убран poolKey из сигнатуры и хранилища - useEffect: guard pool.length === 0 → возврат без fetch/consume; effect перезапустится когда pool заполнится (реальные deps изменятся) → reserve применяется из useLayoutEffect ещё до pool, без стале-флэша Итоговый порядок: reserve (instant, serverId) > cache (stale-while-revalidate) > skeleton (только первый визит) * fix(home): remove mix-rating deps from feed useEffect — prevent Zustand rehydration double-fetch Корень: useAuthStore(mixMinRatingFilterEnabled/Album/Artist) были в deps useEffect. Zustand persist реhydrates асинхронно — сначала activeServerId, потом mix-rating значения. Это вызывало двойной запуск эффекта: - Первый запуск: homeFeedCache hit → показывает набор предыдущего просмотра - Второй запуск (после rehydration): cache miss или повторный fetch с реальными mix-настройками → ~500ms → новый набор Итог: Hero, AlbumRow, BecauseYouLikeRail показывали предыдущий набор первые ~500ms при каждом возврате на Mainstage. Fix: убраны mixMinRatingFilterEnabled/Album/Artist из deps. getMixMinRatingsConfigFromAuth() читается внутри эффекта через getState() — всегда актуальные значения без пересоздания замыкания. Mix-настройки по-прежнему применяются при fetch, но не вызывают двойной запуск при rehydration. * feat(home): local-first discover songs via SQLite ORDER BY RANDOM() Добавлена runLocalRandomSongs (аналог runLocalRandomAlbums для треков) в browseTextSearch.ts — использует libraryAdvancedSearch с sort random, field уже поддерживается Rust-кодом через wildcarded ("random", _) ветку. В Home.tsx: discoverSongs теперь сначала пробует локальный индекс, и только при недоступности (индекс не готов, ошибка) падает обратно на getRandomSongs.view. Ускоряет первую загрузку Mainstage — треки берутся из SSD вместо сети. * fix(home): pre-populate state from cache at mount — eliminate empty-state flash on return visits Причина: Home.tsx размонтируется при навигации. При возврате первый рендер всегда с пустыми массивами (heroAlbums=[], mostPlayed=[] и т.д.), потом useEffect читает homeFeedCache и заполняет state. Даже один кадр с пустым состоянием вызывает перерисовку Hero и BecauseYouLikeRail (pool=[]). Решение: getInitialHomeFeed() читает homeFeedCache синхронно через useAuthStore.getState() (не hook) в lazy useState initializers. К моменту повторного визита store уже rehydrated — все state получают кэшированные данные до первого рендера. Дополнительно: wasPrePopulated предотвращает повторный applyFeedSnapshot в useEffect когда state уже заполнен — иначе новые ссылки на массивы вызывали бы ненужные ре-рендеры дочерних компонентов с теми же данными. * fix(mainstage): keep refresh without return flicker Keep Home and Because You Like visually stable during a single visit while still refreshing data for the next re-enter. Improve mainstage cover warmup by ensuring and pre-decoding above-the-fold artwork so hero and top rails appear instantly after navigation. * fix(mainstage): stabilize because rail and hero background framing Measure Because You Like layout before first paint to avoid width snap flicker, and render hero background as centered cover-fit images so the frame no longer jumps from top to middle on mount. * fix(now-playing): prewarm track data and prevent stale carry-over Warm Now Playing fetch caches and playback cover art on track change so entering the page no longer waits on first-load requests. Gate key-based sections (top songs, tour, Last.fm) by the active track/artist keys to avoid briefly rendering values from the previous track. * fix(cover,test): refresh playback scope and default tauri cover mocks Recompute playback cover scope when queue/server context changes so now-playing art resolves against the correct server after handoffs. Add default cover-cache invoke handlers to the shared Tauri test harness to prevent unhandled rejections in suites that mount cover-aware UI. * fix(cover,now-playing,test): align prewarm scopes and tighten tauri mocks Make cover-cache invoke defaults opt-in for tests, align radio prewarm scope with active rendering scope, and add targeted hook tests for prewarm + playback-scope reactivity. Also harden Rust cover URL building to avoid panic on malformed base URLs. * test(cover): hoist mocked useCoverArt and clean EOF whitespace Fix the new playback-scope hook test to use a hoisted vi.mock-safe stub and keep branch-wide diff checks clean by removing an accidental trailing blank line. * fix(cover): align playback ensure auth and harden backfill retry flow Use playback-server credentials for playback-scoped cover ensures, persist fetch-failed markers for bulk library backfill failures, and avoid advancing backfill cursor when UI-priority hold interrupts a batch. * fix(ci): resolve clippy lint and update frontend node runtime Move fetch helper before the test module to satisfy clippy's items-after-test-module rule, and modernize frontend CI to setup-node v6 with lts/* instead of pinned Node 20. * chore(settings): simplify cover and analytics strategy copy Move strategy summaries below tables, simplify Lazy/Aggressive wording, keep analytics warning always visible, and localize Russian texts to plain language without technical jargon.
357 lines
13 KiB
TypeScript
357 lines
13 KiB
TypeScript
import { queueSongStar } from '../store/pendingStarSync';
|
|
import { usePlaybackCoverArt } from '../hooks/usePlaybackCoverArt';
|
|
import { coverArtIdFromRadio } from '../cover/ids';
|
|
import type { SubsonicAlbum } from '../api/subsonicTypes';
|
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
import { createPortal } from 'react-dom';
|
|
import {
|
|
SlidersVertical, X,
|
|
PictureInPicture2, Ellipsis,
|
|
} from 'lucide-react';
|
|
import { invoke } from '@tauri-apps/api/core';
|
|
import { usePlayerStore } from '../store/playerStore';
|
|
import { useShallow } from 'zustand/react/shallow';
|
|
import { useAuthStore } from '../store/authStore';
|
|
import { useThemeStore } from '../store/themeStore';
|
|
import WaveformSeek from './WaveformSeek';
|
|
import Equalizer from './Equalizer';
|
|
import StarRating from './StarRating';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { usePlaybackLibraryNavigate } from '../hooks/usePlaybackLibraryNavigate';
|
|
import { useLyricsStore } from '../store/lyricsStore';
|
|
import MarqueeText from './MarqueeText';
|
|
import LastfmIcon from './LastfmIcon';
|
|
import { useRadioMetadata } from '../hooks/useRadioMetadata';
|
|
import { usePlaybackDelayPress } from '../hooks/usePlaybackDelayPress';
|
|
import PlaybackDelayModal from './PlaybackDelayModal';
|
|
import PlaybackScheduleBadge from './PlaybackScheduleBadge';
|
|
import { usePlaybackScheduleRemaining } from '../utils/format/playbackScheduleFormat';
|
|
import { usePreviewStore } from '../store/previewStore';
|
|
import { usePerfProbeFlags } from '../utils/perf/perfFlags';
|
|
import { formatTrackTime } from '../utils/format/formatDuration';
|
|
import { PlaybackTime, RemainingTime } from './playerBar/PlaybackClock';
|
|
import { PlayerTrackInfo } from './playerBar/PlayerTrackInfo';
|
|
import { PlayerTransportControls } from './playerBar/PlayerTransportControls';
|
|
import { PlayerSeekbarSection } from './playerBar/PlayerSeekbarSection';
|
|
import { PlayerPlaybackRate } from './playerBar/PlayerPlaybackRate';
|
|
import { PlayerVolume } from './playerBar/PlayerVolume';
|
|
import { PlayerOverflowMenu } from './playerBar/PlayerOverflowMenu';
|
|
import { useFloatingPlayerBar } from '../hooks/useFloatingPlayerBar';
|
|
import { useUtilityOverflowMenu } from '../hooks/useUtilityOverflowMenu';
|
|
import {
|
|
usePlayerBarLayoutStore,
|
|
type PlayerBarLayoutItemId,
|
|
} from '../store/playerBarLayoutStore';
|
|
|
|
export default function PlayerBar() {
|
|
const { t } = useTranslation();
|
|
const navigatePlaybackLibrary = usePlaybackLibraryNavigate();
|
|
const layoutItems = usePlayerBarLayoutStore(s => s.items);
|
|
const isLayoutVisible = (id: PlayerBarLayoutItemId) =>
|
|
layoutItems.find(i => i.id === id)?.visible !== false;
|
|
const [eqOpen, setEqOpen] = useState(false);
|
|
const [showVolPct, setShowVolPct] = useState(false);
|
|
const [localShowRemaining, setLocalShowRemaining] = useState(() => useThemeStore.getState().showRemainingTime);
|
|
const premuteVolumeRef = useRef(1);
|
|
const showLyrics = useLyricsStore(s => s.showLyrics);
|
|
const activeTab = useLyricsStore(s => s.activeTab);
|
|
// currentTime is intentionally excluded — PlaybackTime handles it via direct DOM update.
|
|
const {
|
|
currentTrack, currentRadio, isPlaying, volume,
|
|
togglePlay, next, previous, setVolume,
|
|
stop, toggleRepeat, repeatMode, toggleFullscreen,
|
|
lastfmLoved, toggleLastfmLove,
|
|
isQueueVisible, toggleQueue,
|
|
starredOverrides,
|
|
userRatingOverrides,
|
|
openContextMenu,
|
|
} = usePlayerStore(useShallow(s => ({
|
|
currentTrack: s.currentTrack,
|
|
currentRadio: s.currentRadio,
|
|
isPlaying: s.isPlaying,
|
|
volume: s.volume,
|
|
togglePlay: s.togglePlay,
|
|
next: s.next,
|
|
previous: s.previous,
|
|
setVolume: s.setVolume,
|
|
stop: s.stop,
|
|
toggleRepeat: s.toggleRepeat,
|
|
repeatMode: s.repeatMode,
|
|
toggleFullscreen: s.toggleFullscreen,
|
|
lastfmLoved: s.lastfmLoved,
|
|
toggleLastfmLove: s.toggleLastfmLove,
|
|
isQueueVisible: s.isQueueVisible,
|
|
toggleQueue: s.toggleQueue,
|
|
starredOverrides: s.starredOverrides,
|
|
userRatingOverrides: s.userRatingOverrides,
|
|
openContextMenu: s.openContextMenu,
|
|
})));
|
|
const { lastfmSessionKey } = useAuthStore();
|
|
const floatingPlayerBar = useThemeStore(s => s.floatingPlayerBar);
|
|
const playerBarRef = useRef<HTMLElement>(null);
|
|
const perfFlags = usePerfProbeFlags();
|
|
|
|
const floatingStyle = useFloatingPlayerBar(playerBarRef, floatingPlayerBar);
|
|
|
|
const {
|
|
utilityOverflow,
|
|
utilityMenuOpen,
|
|
setUtilityMenuOpen,
|
|
utilityMenuMode,
|
|
setUtilityMenuMode,
|
|
utilityMenuStyle,
|
|
utilityMenuRef,
|
|
utilityBtnRef,
|
|
volumeWheelMenuTimerRef,
|
|
suppressOverflowTooltip,
|
|
setSuppressOverflowTooltip,
|
|
} = useUtilityOverflowMenu(playerBarRef, floatingPlayerBar);
|
|
|
|
useEffect(() => {
|
|
const onToggleEqualizer = () => setEqOpen(v => !v);
|
|
window.addEventListener('psy:toggle-equalizer', onToggleEqualizer);
|
|
return () => window.removeEventListener('psy:toggle-equalizer', onToggleEqualizer);
|
|
}, []);
|
|
|
|
const { delayModalOpen, setDelayModalOpen, playPauseBind } = usePlaybackDelayPress(togglePlay);
|
|
const transportAnchorRef = useRef<HTMLDivElement>(null);
|
|
const playSlotRef = useRef<HTMLSpanElement>(null);
|
|
const scheduleRemaining = usePlaybackScheduleRemaining();
|
|
const isPreviewing = usePreviewStore(s => s.previewingId !== null);
|
|
const previewAudioStarted = usePreviewStore(s => s.audioStarted);
|
|
const previewingTrack = usePreviewStore(s => s.previewingTrack);
|
|
|
|
const isRadio = !!currentRadio;
|
|
|
|
// Radio metadata (ICY or AzuraCast) — only active while a radio station is playing.
|
|
const radioMeta = useRadioMetadata(currentRadio ?? null);
|
|
|
|
|
|
const isStarred = currentTrack
|
|
? (currentTrack.id in starredOverrides ? starredOverrides[currentTrack.id] : !!currentTrack.starred)
|
|
: false;
|
|
|
|
const toggleStar = useCallback(() => {
|
|
if (!currentTrack) return;
|
|
queueSongStar(currentTrack.id, !isStarred);
|
|
}, [currentTrack, isStarred]);
|
|
|
|
const duration = currentTrack?.duration ?? 0;
|
|
|
|
const radioCoverArtId = currentRadio?.coverArt ? coverArtIdFromRadio(currentRadio.id) : undefined;
|
|
// Preview takes visual priority over the queued track in the player-bar info
|
|
// cell, but only when not in radio mode (radio has its own meta layout).
|
|
const showPreviewMeta = isPreviewing && !isRadio && previewingTrack !== null;
|
|
const displayCoverArt = showPreviewMeta ? previewingTrack!.coverArt : currentTrack?.coverArt;
|
|
const displayTitle = showPreviewMeta ? previewingTrack!.title : (currentTrack?.title ?? t('player.noTitle'));
|
|
const displayArtist = showPreviewMeta ? previewingTrack!.artist : (currentTrack?.artist ?? '—');
|
|
const displayArtistRefs = !showPreviewMeta && currentTrack?.artists && currentTrack.artists.length > 0
|
|
? currentTrack.artists
|
|
: undefined;
|
|
|
|
usePlaybackCoverArt(showPreviewMeta ? undefined : displayCoverArt, 128);
|
|
const coverArtId = showPreviewMeta ? previewingTrack?.coverArt : displayCoverArt;
|
|
|
|
const handleVolume = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
|
|
setVolume(parseFloat(e.target.value));
|
|
}, [setVolume]);
|
|
|
|
const handleVolumeWheel = useCallback((e: React.WheelEvent<HTMLElement>) => {
|
|
e.preventDefault();
|
|
const delta = e.deltaY > 0 ? -0.05 : 0.05;
|
|
setVolume(Math.max(0, Math.min(1, volume + delta)));
|
|
|
|
if (utilityOverflow) {
|
|
setSuppressOverflowTooltip(true);
|
|
setUtilityMenuMode('volume');
|
|
setUtilityMenuOpen(true);
|
|
if (volumeWheelMenuTimerRef.current != null) {
|
|
window.clearTimeout(volumeWheelMenuTimerRef.current);
|
|
}
|
|
volumeWheelMenuTimerRef.current = window.setTimeout(() => {
|
|
setUtilityMenuOpen(false);
|
|
setSuppressOverflowTooltip(false);
|
|
volumeWheelMenuTimerRef.current = null;
|
|
}, 1000);
|
|
}
|
|
}, [volume, setVolume, utilityOverflow]);
|
|
|
|
const volumeStyle = {
|
|
background: `linear-gradient(to right, var(--volume-accent, var(--accent)) ${volume * 100}%, var(--ctp-surface2) ${volume * 100}%)`,
|
|
};
|
|
|
|
const playerBarContent = (
|
|
<>
|
|
<footer
|
|
ref={playerBarRef}
|
|
className={`player-bar ${floatingPlayerBar ? 'floating' : ''}${showPreviewMeta ? ' is-previewing' : ''}${showPreviewMeta && previewAudioStarted ? ' audio-started' : ''}`}
|
|
style={floatingPlayerBar ? floatingStyle : undefined}
|
|
role="region"
|
|
aria-label={t('player.regionLabel')}
|
|
>
|
|
|
|
<PlayerTrackInfo
|
|
currentTrack={currentTrack}
|
|
currentRadio={currentRadio}
|
|
isRadio={isRadio}
|
|
radioMeta={radioMeta}
|
|
radioCoverArtId={radioCoverArtId}
|
|
coverArtId={coverArtId}
|
|
displayCoverArt={displayCoverArt}
|
|
displayTitle={displayTitle}
|
|
displayArtist={displayArtist}
|
|
displayArtistRefs={displayArtistRefs}
|
|
showPreviewMeta={showPreviewMeta}
|
|
previewingTrack={previewingTrack}
|
|
isStarred={isStarred}
|
|
toggleStar={toggleStar}
|
|
lastfmSessionKey={lastfmSessionKey}
|
|
lastfmLoved={lastfmLoved}
|
|
toggleLastfmLove={toggleLastfmLove}
|
|
userRatingOverrides={userRatingOverrides}
|
|
toggleFullscreen={toggleFullscreen}
|
|
navigate={navigatePlaybackLibrary}
|
|
openContextMenu={openContextMenu}
|
|
t={t}
|
|
/>
|
|
|
|
<PlayerTransportControls
|
|
isPlaying={isPlaying}
|
|
isRadio={isRadio}
|
|
isPreviewing={isPreviewing}
|
|
stop={stop}
|
|
previous={previous}
|
|
next={next}
|
|
toggleRepeat={toggleRepeat}
|
|
repeatMode={repeatMode}
|
|
playPauseBind={playPauseBind}
|
|
scheduleRemaining={scheduleRemaining}
|
|
transportAnchorRef={transportAnchorRef}
|
|
playSlotRef={playSlotRef}
|
|
t={t}
|
|
/>
|
|
|
|
<PlayerSeekbarSection
|
|
isRadio={isRadio}
|
|
radioMeta={radioMeta}
|
|
trackId={currentTrack?.id}
|
|
duration={duration}
|
|
localShowRemaining={localShowRemaining}
|
|
setLocalShowRemaining={setLocalShowRemaining}
|
|
disableWaveformCanvas={perfFlags.disableWaveformCanvas}
|
|
t={t}
|
|
/>
|
|
|
|
{utilityOverflow ? (
|
|
<div className="player-overflow-wrap">
|
|
<button
|
|
ref={utilityBtnRef}
|
|
className={`player-btn player-btn-sm${utilityMenuOpen ? ' active' : ''}`}
|
|
onClick={() => {
|
|
setUtilityMenuMode('full');
|
|
setUtilityMenuOpen(v => !v);
|
|
if (volumeWheelMenuTimerRef.current != null) {
|
|
window.clearTimeout(volumeWheelMenuTimerRef.current);
|
|
volumeWheelMenuTimerRef.current = null;
|
|
}
|
|
setSuppressOverflowTooltip(false);
|
|
}}
|
|
onWheel={handleVolumeWheel}
|
|
aria-label={t('player.moreOptions')}
|
|
data-tooltip={suppressOverflowTooltip ? undefined : t('player.moreOptions')}
|
|
>
|
|
<Ellipsis size={15} />
|
|
</button>
|
|
</div>
|
|
) : (
|
|
<>
|
|
{isLayoutVisible('playbackRate') && (
|
|
<PlayerPlaybackRate t={t} />
|
|
)}
|
|
|
|
{isLayoutVisible('equalizer') && (
|
|
<button
|
|
className={`player-btn player-btn-sm player-eq-btn ${eqOpen ? 'active' : ''}`}
|
|
onClick={() => setEqOpen(v => !v)}
|
|
aria-label={t('player.equalizer')}
|
|
data-tooltip={t('player.equalizer')}
|
|
>
|
|
<SlidersVertical size={15} />
|
|
</button>
|
|
)}
|
|
|
|
{isLayoutVisible('miniPlayer') && (
|
|
<button
|
|
className="player-btn player-btn-sm"
|
|
onClick={() => invoke('open_mini_player').catch(() => {})}
|
|
aria-label={t('player.miniPlayer')}
|
|
data-tooltip={t('player.miniPlayer')}
|
|
>
|
|
<PictureInPicture2 size={15} />
|
|
</button>
|
|
)}
|
|
|
|
<PlayerVolume
|
|
volume={volume}
|
|
setVolume={setVolume}
|
|
premuteVolumeRef={premuteVolumeRef}
|
|
showVolPct={showVolPct}
|
|
setShowVolPct={setShowVolPct}
|
|
handleVolume={handleVolume}
|
|
handleVolumeWheel={handleVolumeWheel}
|
|
volumeStyle={volumeStyle}
|
|
inputId="player-volume"
|
|
t={t}
|
|
/>
|
|
</>
|
|
)}
|
|
|
|
{utilityMenuOpen && (
|
|
<PlayerOverflowMenu
|
|
utilityMenuRef={utilityMenuRef}
|
|
utilityMenuStyle={utilityMenuStyle}
|
|
utilityMenuMode={utilityMenuMode}
|
|
eqOpen={eqOpen}
|
|
setEqOpen={setEqOpen}
|
|
closeMenu={() => setUtilityMenuOpen(false)}
|
|
volume={volume}
|
|
setVolume={setVolume}
|
|
premuteVolumeRef={premuteVolumeRef}
|
|
showVolPct={showVolPct}
|
|
setShowVolPct={setShowVolPct}
|
|
handleVolume={handleVolume}
|
|
handleVolumeWheel={handleVolumeWheel}
|
|
volumeStyle={volumeStyle}
|
|
t={t}
|
|
/>
|
|
)}
|
|
|
|
{/* EQ Popup — rendered via portal to avoid backdrop-filter containing-block issue */}
|
|
{eqOpen && createPortal(
|
|
<>
|
|
<div className="eq-popup-backdrop" onClick={() => setEqOpen(false)} />
|
|
<div className="eq-popup">
|
|
<div className="eq-popup-header">
|
|
<span className="eq-popup-title">Equalizer</span>
|
|
<button className="eq-popup-close" onClick={() => setEqOpen(false)} aria-label="Close">
|
|
<X size={16} />
|
|
</button>
|
|
</div>
|
|
<Equalizer />
|
|
</div>
|
|
</>,
|
|
document.body
|
|
)}
|
|
|
|
</footer>
|
|
<PlaybackDelayModal open={delayModalOpen} onClose={() => setDelayModalOpen(false)} anchorRef={transportAnchorRef} />
|
|
</>
|
|
);
|
|
|
|
if (floatingPlayerBar) {
|
|
return createPortal(playerBarContent, document.body);
|
|
}
|
|
|
|
return playerBarContent;
|
|
}
|