mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-21 23:05:46 +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)
88 lines
2.6 KiB
TypeScript
88 lines
2.6 KiB
TypeScript
import { create } from 'zustand';
|
|
|
|
/** Page-scoped live search mode — badge in the header search field. */
|
|
export type LiveSearchScope = 'artists' | 'albums' | 'newReleases' | 'tracks' | 'composers';
|
|
|
|
export type LiveSearchSnapshot = {
|
|
query: string;
|
|
scope: LiveSearchScope | null;
|
|
};
|
|
|
|
type LiveSearchMutationOpts = {
|
|
/** Push the current field state onto the search-local undo stack. */
|
|
recordUndo?: boolean;
|
|
};
|
|
|
|
interface LiveSearchScopeStore {
|
|
query: string;
|
|
scope: LiveSearchScope | null;
|
|
undoStack: LiveSearchSnapshot[];
|
|
setQuery: (query: string, options?: LiveSearchMutationOpts) => void;
|
|
setScope: (scope: LiveSearchScope | null, options?: LiveSearchMutationOpts) => void;
|
|
clearScope: (options?: LiveSearchMutationOpts) => void;
|
|
recordUndoSnapshot: () => void;
|
|
undo: () => boolean;
|
|
}
|
|
|
|
const MAX_UNDO = 50;
|
|
|
|
function snapshotsEqual(a: LiveSearchSnapshot, b: LiveSearchSnapshot): boolean {
|
|
return a.query === b.query && a.scope === b.scope;
|
|
}
|
|
|
|
export const useLiveSearchScopeStore = create<LiveSearchScopeStore>((set, get) => ({
|
|
query: '',
|
|
scope: null,
|
|
undoStack: [],
|
|
|
|
recordUndoSnapshot: () => {
|
|
const snap: LiveSearchSnapshot = { query: get().query, scope: get().scope };
|
|
set((s) => {
|
|
const last = s.undoStack[s.undoStack.length - 1];
|
|
if (last && snapshotsEqual(last, snap)) return s;
|
|
return { undoStack: [...s.undoStack, snap].slice(-MAX_UNDO) };
|
|
});
|
|
},
|
|
|
|
setQuery: (query, options) => {
|
|
if (get().query === query) return;
|
|
if (options?.recordUndo) get().recordUndoSnapshot();
|
|
set({ query });
|
|
},
|
|
|
|
setScope: (scope, options) => {
|
|
if (get().scope === scope) return;
|
|
if (options?.recordUndo) get().recordUndoSnapshot();
|
|
set({ scope });
|
|
},
|
|
|
|
clearScope: (options) => {
|
|
if (get().scope == null) return;
|
|
if (options?.recordUndo) get().recordUndoSnapshot();
|
|
set({ scope: null });
|
|
},
|
|
|
|
undo: () => {
|
|
const stack = get().undoStack;
|
|
if (stack.length === 0) return false;
|
|
const prev = stack[stack.length - 1]!;
|
|
set({ query: prev.query, scope: prev.scope, undoStack: stack.slice(0, -1) });
|
|
return true;
|
|
},
|
|
}));
|
|
|
|
/** Browse filter text when the header scope badge matches the page. */
|
|
export function scopedBrowseSearchQuery(
|
|
query: string,
|
|
activeScope: LiveSearchScope | null,
|
|
expectedScope: LiveSearchScope,
|
|
): string {
|
|
return activeScope === expectedScope ? query : '';
|
|
}
|
|
|
|
export function useScopedBrowseSearchQuery(expectedScope: LiveSearchScope): string {
|
|
const query = useLiveSearchScopeStore(s => s.query);
|
|
const scope = useLiveSearchScopeStore(s => s.scope);
|
|
return scopedBrowseSearchQuery(query, scope, expectedScope);
|
|
}
|