mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 06:25:41 +00:00
4ac373a65b
* feat(artists): scoped live search badge replaces page filter Move Artists browse text search into the header Live Search with a page scope badge (Users icon), field-local undo, and double-click/backspace to clear scope. Block the live-search dropdown while scoped so results only filter the Artists grid; mobile overlay follows the same rules. * fix(artists): plain grid for scoped search fixes broken card layout Route the browse grid through VirtualCardGrid, switch to non-virtual CSS grid when live search filters the catalog, reset scroll on filter changes, and skip content-visibility on plain tiles to avoid blank/black cards. * fix(search): scope badge double-Backspace and single clear control Require two Backspaces on an empty scoped field after prior text input; one Backspace still clears the badge when the field was never filled. Move live-search clear/advanced controls inside the field pill, drop the extra outer clear button, and use type=text to avoid native search clears. * fix(search): drop duplicate outer live-search clear button Keep the native in-field clear on type=search and the original pill layout; remove only the extra × control outside the search border. Reset dropdown state when the query is cleared via the native control. * refactor(search): generic scoped browse query helper, drop dead code Rename artistsBrowseSearchQuery to scopedBrowseSearchQuery with an expectedScope argument; wire Artists via useScopedBrowseSearchQuery. Remove unused liveSearchScoped dropdown helper (scoped mode blocks it). * feat(search): ghost scope badge and single-click badge remove After clearing the artists scope on /artists, show a faded ghost chip to restore page-only search while keeping the global search placeholder. Active badge removes on one click; tooltips and styles updated. * feat(search): scoped live search for All Albums and New Releases Wire albums and newReleases scope badges with debounced album title search (local index title-only FTS + filtered search3). Plain grid, scroll reset, and session query restore on album grid browse pages. * fix(browse): preserve scroll restore after album/artist detail back Only reset in-page scroll when filter resetKey changes, not when isScrollRestorePending clears after session restore. * feat(search): scoped live search for Tracks browse Wire /tracks to header live search with wide title/artist/album FTS, hide hero and discovery rails while search is active, and remove the inline search field from the browse list. * fix(search): clear header query when leaving scoped browse pages Prevent global live search from firing on album/detail routes after a scoped browse query; browse session stashes still restore on back. * fix(tracks): restore scroll after back from detail during scoped search Hold stashed song results across fetchSongPage churn, defer leave-stash teardown past AppShell scroll reset, restore tracks scroll after the list is ready, and save scroll snapshot when opening artist from song context menu. * fix(tracks): hide discovery headings during scoped search Hide the page subtitle and "Browse all tracks" section title when tracks search is active, matching hero/rails chrome behavior. * feat(search): scoped live search for Composers browse Wire /composers to header live search with composers scope badge, session stash, scroll restore, and plain grid/list during text filter. Remove the in-page filter input; add i18n and navigation helpers. * docs: CHANGELOG and credits for scoped browse live search (PR #938)
421 lines
16 KiB
TypeScript
421 lines
16 KiB
TypeScript
import { search } from '../api/subsonicSearch';
|
|
import type { SearchResults, SubsonicArtist } from '../api/subsonicTypes';
|
|
import { songToTrack } from '../utils/playback/songToTrack';
|
|
import { useLiveSearchScopeStore } from '../store/liveSearchScopeStore';
|
|
import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
|
|
import { createPortal } from 'react-dom';
|
|
import { useLocation, useNavigate } from 'react-router-dom';
|
|
import { navigatePathWithAlbumReturnTo } from '../utils/navigation/albumDetailNavigation';
|
|
import { X, Search, Disc3, Users, Music, Music2, Clock, ChevronRight } from 'lucide-react';
|
|
import { usePlayerStore } from '../store/playerStore';
|
|
import { useAuthStore } from '../store/authStore';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { FETCH_QUEUE_BIAS_SEARCH_ARTIST_OVER_ALBUM } from './CachedImage';
|
|
import { AlbumCoverArtImage } from '../cover/AlbumCoverArtImage';
|
|
import { ArtistCoverArtImage } from '../cover/ArtistCoverArtImage';
|
|
import { CoverArtImage } from '../cover/CoverArtImage';
|
|
import { albumCoverRefForSong } from '../cover/ref';
|
|
import { showToast } from '../utils/ui/toast';
|
|
import { useShareSearch } from '../hooks/useShareSearch';
|
|
import ShareSearchResults from './search/ShareSearchResults';
|
|
import {
|
|
LiveSearchScopeBadge,
|
|
LiveSearchScopeGhostBadge,
|
|
createLiveSearchScopeBackspaceState,
|
|
handleLiveSearchScopeBackspace,
|
|
handleLiveSearchScopeUndo,
|
|
isLiveSearchDropdownBlocked,
|
|
liveSearchScopePlaceholderKey,
|
|
noteLiveSearchScopeQueryInput,
|
|
resetLiveSearchScopeBackspaceState,
|
|
resolveLiveSearchScopeGhost,
|
|
} from './search/liveSearchScopeUi';
|
|
|
|
const STORAGE_KEY = 'psysonic_recent_searches';
|
|
const MAX_RECENT = 6;
|
|
|
|
function loadRecent(): string[] {
|
|
try { return JSON.parse(localStorage.getItem(STORAGE_KEY) || '[]'); } catch { return []; }
|
|
}
|
|
|
|
function saveRecent(q: string, prev: string[]): string[] {
|
|
const updated = [q.trim(), ...prev.filter(s => s !== q.trim())].slice(0, MAX_RECENT);
|
|
localStorage.setItem(STORAGE_KEY, JSON.stringify(updated));
|
|
return updated;
|
|
}
|
|
|
|
function debounce<A extends unknown[]>(
|
|
fn: (...args: A) => void,
|
|
ms: number,
|
|
): (...args: A) => void {
|
|
let timer: ReturnType<typeof setTimeout>;
|
|
return (...args: A) => { clearTimeout(timer); timer = setTimeout(() => fn(...args), ms); };
|
|
}
|
|
|
|
/** Mobile search row thumb — larger than desktop live search (32px). */
|
|
const MOBILE_SEARCH_THUMB_CSS_PX = 80;
|
|
|
|
function MobileSearchSongThumb({
|
|
song,
|
|
}: {
|
|
song: Pick<SearchResults['songs'][number], 'id' | 'albumId' | 'coverArt' | 'discNumber'>;
|
|
}) {
|
|
const coverRef = useMemo(
|
|
() => (song.albumId?.trim() ? albumCoverRefForSong(song) : undefined),
|
|
[song.id, song.albumId, song.coverArt, song.discNumber],
|
|
);
|
|
if (!coverRef) return null;
|
|
return (
|
|
<CoverArtImage
|
|
coverRef={coverRef}
|
|
displayCssPx={MOBILE_SEARCH_THUMB_CSS_PX}
|
|
surface="dense"
|
|
className="mobile-search-thumb"
|
|
alt=""
|
|
ensurePriority="high"
|
|
/>
|
|
);
|
|
}
|
|
|
|
function MobileSearchArtistThumb({ artist }: { artist: Pick<SubsonicArtist, 'id' | 'coverArt'> }) {
|
|
const [failed, setFailed] = useState(false);
|
|
useEffect(() => { setFailed(false); }, [artist.id, artist.coverArt]);
|
|
if (failed) {
|
|
return (
|
|
<div className="mobile-search-avatar mobile-search-avatar--circle">
|
|
<Users size={20} />
|
|
</div>
|
|
);
|
|
}
|
|
return (
|
|
<ArtistCoverArtImage
|
|
artistId={artist.id}
|
|
coverArt={artist.coverArt}
|
|
libraryResolve={false}
|
|
displayCssPx={MOBILE_SEARCH_THUMB_CSS_PX}
|
|
surface="dense"
|
|
className="mobile-search-thumb mobile-search-thumb--artist-round"
|
|
alt=""
|
|
loading="eager"
|
|
fetchQueueBias={FETCH_QUEUE_BIAS_SEARCH_ARTIST_OVER_ALBUM}
|
|
onError={() => setFailed(true)}
|
|
/>
|
|
);
|
|
}
|
|
|
|
export default function MobileSearchOverlay({ onClose }: { onClose: () => void }) {
|
|
const { t } = useTranslation();
|
|
const navigate = useNavigate();
|
|
const location = useLocation();
|
|
const enqueue = usePlayerStore(s => s.enqueue);
|
|
|
|
const query = useLiveSearchScopeStore(s => s.query);
|
|
const setQuery = useLiveSearchScopeStore(s => s.setQuery);
|
|
const scope = useLiveSearchScopeStore(s => s.scope);
|
|
const setScope = useLiveSearchScopeStore(s => s.setScope);
|
|
const clearScope = useLiveSearchScopeStore(s => s.clearScope);
|
|
const undoLiveSearch = useLiveSearchScopeStore(s => s.undo);
|
|
const scopeBackspaceRef = useRef(createLiveSearchScopeBackspaceState());
|
|
const ghostScope = resolveLiveSearchScopeGhost(location.pathname, scope);
|
|
const [results, setResults] = useState<SearchResults | null>(null);
|
|
const [loading, setLoading] = useState(false);
|
|
const [recentSearches, setRecentSearches] = useState<string[]>(loadRecent);
|
|
const inputRef = useRef<HTMLInputElement>(null);
|
|
const musicLibraryFilterVersion = useAuthStore(s => s.musicLibraryFilterVersion);
|
|
const share = useShareSearch(query, onClose);
|
|
|
|
useEffect(() => { inputRef.current?.focus(); }, []);
|
|
|
|
useEffect(() => {
|
|
resetLiveSearchScopeBackspaceState(scopeBackspaceRef.current);
|
|
}, [scope]);
|
|
|
|
useEffect(() => {
|
|
noteLiveSearchScopeQueryInput(scopeBackspaceRef.current, query);
|
|
}, [query]);
|
|
|
|
useEffect(() => {
|
|
const prev = document.body.style.overflow;
|
|
document.body.style.overflow = 'hidden';
|
|
return () => { document.body.style.overflow = prev; };
|
|
}, []);
|
|
|
|
const doSearch = useCallback(
|
|
debounce(async (q: string) => {
|
|
if (!q.trim()) { setResults(null); setLoading(false); return; }
|
|
setLoading(true);
|
|
try {
|
|
setResults(await search(q));
|
|
} finally { setLoading(false); }
|
|
}, 300),
|
|
[musicLibraryFilterVersion],
|
|
);
|
|
|
|
useEffect(() => {
|
|
if (isLiveSearchDropdownBlocked(scope)) {
|
|
setResults(null);
|
|
setLoading(false);
|
|
return;
|
|
}
|
|
if (share.shareMatch) {
|
|
setResults(null);
|
|
setLoading(false);
|
|
return;
|
|
}
|
|
doSearch(query);
|
|
}, [query, scope, doSearch, share.shareMatch]);
|
|
|
|
const commit = (q: string) => {
|
|
if (q.trim()) setRecentSearches(prev => saveRecent(q, prev));
|
|
};
|
|
|
|
const goTo = (path: string) => {
|
|
commit(query);
|
|
navigatePathWithAlbumReturnTo(navigate, location, path);
|
|
onClose();
|
|
};
|
|
const goCategory = (path: string) => { navigate(path); onClose(); };
|
|
const enqueueSong = (song: SearchResults['songs'][number]) => {
|
|
commit(query);
|
|
const track = songToTrack(song);
|
|
enqueue([track]);
|
|
showToast(t('search.addedToQueueToast', { title: track.title }), 2200, 'info');
|
|
onClose();
|
|
};
|
|
const useRecent = (term: string) => {
|
|
setQuery(term, { recordUndo: true });
|
|
inputRef.current?.focus();
|
|
};
|
|
const removeRecent = (term: string, e: React.MouseEvent) => {
|
|
e.stopPropagation();
|
|
setRecentSearches(prev => {
|
|
const updated = prev.filter(s => s !== term);
|
|
localStorage.setItem(STORAGE_KEY, JSON.stringify(updated));
|
|
return updated;
|
|
});
|
|
};
|
|
|
|
const hasResults =
|
|
!isLiveSearchDropdownBlocked(scope)
|
|
&& (
|
|
!!share.shareMatch
|
|
|| (results && (results.artists.length || results.albums.length || results.songs.length))
|
|
);
|
|
const showEmpty = !query && !scope;
|
|
|
|
return createPortal(
|
|
<div className="mobile-search-overlay">
|
|
{/* ── Search bar ── */}
|
|
<div className="mobile-search-bar">
|
|
<div className={`mobile-search-field${scope ? ' mobile-search-field--scoped' : ''}`}>
|
|
{loading ? (
|
|
<div className="mobile-search-spinner" />
|
|
) : (
|
|
<Search size={16} className="mobile-search-icon" />
|
|
)}
|
|
{scope && (
|
|
<LiveSearchScopeBadge
|
|
scope={scope}
|
|
className="mobile-search-scope-badge"
|
|
clearScope={clearScope}
|
|
/>
|
|
)}
|
|
{ghostScope && (
|
|
<LiveSearchScopeGhostBadge
|
|
scope={ghostScope}
|
|
className="mobile-search-scope-badge mobile-search-scope-badge--ghost"
|
|
setScope={setScope}
|
|
/>
|
|
)}
|
|
<input
|
|
ref={inputRef}
|
|
className="mobile-search-input"
|
|
type="search"
|
|
placeholder={t(liveSearchScopePlaceholderKey(scope))}
|
|
data-tooltip={scope ? t(liveSearchScopePlaceholderKey(scope)) : undefined}
|
|
data-tooltip-pos="bottom"
|
|
value={query}
|
|
onChange={e => setQuery(e.target.value, { recordUndo: true })}
|
|
onKeyDown={(e) => {
|
|
if (handleLiveSearchScopeUndo(e, undoLiveSearch)) return;
|
|
if (handleLiveSearchScopeBackspace(e, query, scope, clearScope, scopeBackspaceRef.current)) return;
|
|
}}
|
|
autoComplete="off"
|
|
autoCorrect="off"
|
|
autoCapitalize="off"
|
|
/>
|
|
{query && (
|
|
<button
|
|
className="mobile-search-clear"
|
|
onClick={() => { setQuery('', { recordUndo: true }); setResults(null); inputRef.current?.focus(); }}
|
|
aria-label={t('search.clearLabel')}
|
|
>
|
|
<X size={15} />
|
|
</button>
|
|
)}
|
|
</div>
|
|
<button className="mobile-search-cancel" onClick={onClose}>
|
|
{t('common.cancel')}
|
|
</button>
|
|
</div>
|
|
|
|
<div className="mobile-search-results">
|
|
{/* ── Empty state ── */}
|
|
{showEmpty && (
|
|
<div className="mobile-search-empty-state">
|
|
{recentSearches.length > 0 && (
|
|
<div className="mobile-search-section">
|
|
<div className="mobile-search-section-label">{t('search.recentSearches')}</div>
|
|
{recentSearches.map(term => (
|
|
<button key={term} className="mobile-search-item" onClick={() => useRecent(term)}>
|
|
<div className="mobile-search-avatar">
|
|
<Clock size={18} />
|
|
</div>
|
|
<div className="mobile-search-item-info" style={{ flex: 1 }}>
|
|
<span className="mobile-search-item-title">{term}</span>
|
|
</div>
|
|
<button
|
|
className="mobile-search-recent-remove"
|
|
onClick={e => removeRecent(term, e)}
|
|
aria-label={t('search.clearLabel')}
|
|
>
|
|
<X size={14} />
|
|
</button>
|
|
</button>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
<div className="mobile-search-section">
|
|
<div className="mobile-search-section-label">{t('search.browse')}</div>
|
|
<div className="mobile-search-chips">
|
|
<button className="mobile-search-chip" onClick={() => goCategory('/albums')}>
|
|
<Music2 size={15} /> {t('search.albums')}
|
|
</button>
|
|
<button className="mobile-search-chip" onClick={() => goCategory('/artists')}>
|
|
<Users size={15} /> {t('search.artists')}
|
|
</button>
|
|
<button className="mobile-search-chip" onClick={() => goCategory('/genres')}>
|
|
<Music size={15} /> {t('search.genres')}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="mobile-search-hint">
|
|
<Search size={52} className="mobile-search-hint-icon" />
|
|
<span className="mobile-search-hint-text">{t('search.emptyHint')}</span>
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* ── No results ── */}
|
|
{!loading && query && !hasResults && !isLiveSearchDropdownBlocked(scope) && (
|
|
<div className="mobile-search-noresults">
|
|
{t('search.noResults', { query })}
|
|
</div>
|
|
)}
|
|
|
|
{share.shareMatch && (
|
|
<ShareSearchResults
|
|
variant="mobile"
|
|
shareMatch={share.shareMatch}
|
|
shareServerLabel={share.shareServerLabel}
|
|
shareCoverServer={share.shareCoverServer}
|
|
shareQueueBusy={share.shareQueueBusy}
|
|
onEnqueue={() => void share.enqueueShareMatch()}
|
|
onOpenAlbum={share.openShareAlbum}
|
|
onOpenArtist={share.openShareArtist}
|
|
onOpenComposer={share.openShareComposer}
|
|
shareTrackSong={share.shareTrackSong}
|
|
shareTrackResolving={share.shareTrackResolving}
|
|
shareTrackUnavailable={share.shareTrackUnavailable}
|
|
shareAlbum={share.shareAlbum}
|
|
shareAlbumResolving={share.shareAlbumResolving}
|
|
shareAlbumUnavailable={share.shareAlbumUnavailable}
|
|
shareArtist={share.shareArtist}
|
|
shareArtistResolving={share.shareArtistResolving}
|
|
shareArtistUnavailable={share.shareArtistUnavailable}
|
|
shareComposer={share.shareComposer}
|
|
shareComposerResolving={share.shareComposerResolving}
|
|
shareComposerUnavailable={share.shareComposerUnavailable}
|
|
/>
|
|
)}
|
|
|
|
{/* ── Results ── */}
|
|
{hasResults && !share.shareMatch && (
|
|
<>
|
|
{results!.artists.length > 0 && (
|
|
<div className="mobile-search-section">
|
|
<div className="mobile-search-section-label">{t('search.artists')}</div>
|
|
{results!.artists.map(a => (
|
|
<button key={a.id} className="mobile-search-item" onClick={() => goTo(`/artist/${a.id}`)}>
|
|
<MobileSearchArtistThumb artist={a} />
|
|
<div className="mobile-search-item-info">
|
|
<span className="mobile-search-item-title">{a.name}</span>
|
|
<span className="mobile-search-item-sub">{t('search.artists')}</span>
|
|
</div>
|
|
<ChevronRight size={16} className="mobile-search-item-chevron" />
|
|
</button>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
{results!.albums.length > 0 && (
|
|
<div className="mobile-search-section">
|
|
<div className="mobile-search-section-label">{t('search.albums')}</div>
|
|
{results!.albums.map(a => (
|
|
<button key={a.id} className="mobile-search-item" onClick={() => goTo(`/album/${a.id}`)}>
|
|
{a.coverArt ? (
|
|
<AlbumCoverArtImage
|
|
albumId={a.id}
|
|
coverArt={a.coverArt}
|
|
libraryResolve={false}
|
|
displayCssPx={MOBILE_SEARCH_THUMB_CSS_PX}
|
|
surface="dense"
|
|
className="mobile-search-thumb"
|
|
alt=""
|
|
ensurePriority="high"
|
|
/>
|
|
) : (
|
|
<div className="mobile-search-avatar">
|
|
<Disc3 size={20} />
|
|
</div>
|
|
)}
|
|
<div className="mobile-search-item-info">
|
|
<span className="mobile-search-item-title">{a.name}</span>
|
|
<span className="mobile-search-item-sub">{a.artist}</span>
|
|
</div>
|
|
<ChevronRight size={16} className="mobile-search-item-chevron" />
|
|
</button>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
{results!.songs.length > 0 && (
|
|
<div className="mobile-search-section">
|
|
<div className="mobile-search-section-label">{t('search.songs')}</div>
|
|
{results!.songs.map(s => (
|
|
<button key={s.id} className="mobile-search-item" onClick={() => enqueueSong(s)}>
|
|
{s.albumId && (s.coverArt ?? s.albumId) ? (
|
|
<MobileSearchSongThumb song={s} />
|
|
) : (
|
|
<div className="mobile-search-avatar">
|
|
<Music size={20} />
|
|
</div>
|
|
)}
|
|
<div className="mobile-search-item-info">
|
|
<span className="mobile-search-item-title">{s.title}</span>
|
|
<span className="mobile-search-item-sub">{s.artist}{s.album ? ` · ${s.album}` : ''}</span>
|
|
</div>
|
|
</button>
|
|
))}
|
|
</div>
|
|
)}
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>,
|
|
document.body
|
|
);
|
|
}
|