mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 07:15:47 +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.9 KiB
TypeScript
88 lines
2.9 KiB
TypeScript
import { create } from 'zustand';
|
|
import { ALL_SENTINEL } from '../utils/componentHelpers/artistsHelpers';
|
|
|
|
export type ComposerBrowseViewMode = 'grid' | 'list';
|
|
|
|
/** Browse state restored when returning to Composers via back from composer detail. */
|
|
export interface ComposerBrowseReturnState {
|
|
filter: string;
|
|
letterFilter: string;
|
|
starredOnly: boolean;
|
|
viewMode: ComposerBrowseViewMode;
|
|
scrollTop?: number;
|
|
visibleCount?: number;
|
|
}
|
|
|
|
export const DEFAULT_COMPOSER_BROWSE_RETURN_STATE: ComposerBrowseReturnState = {
|
|
filter: '',
|
|
letterFilter: ALL_SENTINEL,
|
|
starredOnly: false,
|
|
viewMode: 'grid',
|
|
};
|
|
|
|
interface ComposerBrowseSessionStore {
|
|
returnStashByServer: Record<string, ComposerBrowseReturnState>;
|
|
stashReturnState: (serverId: string, state: ComposerBrowseReturnState) => void;
|
|
clearReturnStash: (serverId: string) => void;
|
|
peekReturnStash: (serverId: string) => ComposerBrowseReturnState | null;
|
|
}
|
|
|
|
export const useComposerBrowseSessionStore = create<ComposerBrowseSessionStore>((set, get) => ({
|
|
returnStashByServer: {},
|
|
|
|
stashReturnState: (serverId, state) => {
|
|
if (!serverId) return;
|
|
set((s) => ({
|
|
returnStashByServer: {
|
|
...s.returnStashByServer,
|
|
[serverId]: {
|
|
filter: state.filter,
|
|
letterFilter: state.letterFilter,
|
|
starredOnly: state.starredOnly,
|
|
viewMode: state.viewMode,
|
|
...(typeof state.scrollTop === 'number' ? { scrollTop: state.scrollTop } : {}),
|
|
...(typeof state.visibleCount === 'number' ? { visibleCount: state.visibleCount } : {}),
|
|
},
|
|
},
|
|
}));
|
|
},
|
|
|
|
clearReturnStash: (serverId) => {
|
|
if (!serverId) return;
|
|
const next = { ...get().returnStashByServer };
|
|
delete next[serverId];
|
|
set({ returnStashByServer: next });
|
|
},
|
|
|
|
peekReturnStash: (serverId) => {
|
|
if (!serverId) return null;
|
|
const stash = get().returnStashByServer[serverId];
|
|
if (!stash) return null;
|
|
return {
|
|
filter: stash.filter,
|
|
letterFilter: stash.letterFilter,
|
|
starredOnly: stash.starredOnly,
|
|
viewMode: stash.viewMode,
|
|
...(typeof stash.scrollTop === 'number' ? { scrollTop: stash.scrollTop } : {}),
|
|
...(typeof stash.visibleCount === 'number' ? { visibleCount: stash.visibleCount } : {}),
|
|
};
|
|
},
|
|
}));
|
|
|
|
export function peekComposerBrowseScrollRestore(
|
|
serverId: string,
|
|
): { scrollTop: number; visibleCount: number } | null {
|
|
const stash = useComposerBrowseSessionStore.getState().peekReturnStash(serverId);
|
|
if (!stash) return null;
|
|
if (typeof stash.scrollTop !== 'number' || typeof stash.visibleCount !== 'number') return null;
|
|
return {
|
|
scrollTop: Math.max(0, stash.scrollTop),
|
|
visibleCount: Math.max(0, stash.visibleCount),
|
|
};
|
|
}
|
|
|
|
/** True when pathname is the Composers browse route (`/composers`). */
|
|
export function isComposersBrowsePath(pathname: string): boolean {
|
|
return pathname === '/composers';
|
|
}
|