vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-09 20:29:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

decouple folder list sort from song list sort

Browse Source
This commit is contained in:
jeffvli
2025-12-03 20:27:57 -08:00
parent a27ddfe746
commit 091625d7d9
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/folders/components/folder-list-header-filters.tsx
+2 -2
View File
@@ -229,12 +229,12 @@ export const FolderListHeaderFilters = () => {
<ListSortByDropdown <ListSortByDropdown
defaultSortByValue={SongListSort.ID} defaultSortByValue={SongListSort.ID}
itemType={LibraryItem.FOLDER} itemType={LibraryItem.FOLDER}
listKey={ItemListKey.SONG} listKey={ItemListKey.FOLDER}
/> />
<Divider orientation="vertical" /> <Divider orientation="vertical" />
<ListSortOrderToggleButton <ListSortOrderToggleButton
defaultSortOrder={SortOrder.ASC} defaultSortOrder={SortOrder.ASC}
listKey={ItemListKey.SONG} listKey={ItemListKey.FOLDER}
/> />
<ListRefreshButton listKey={ItemListKey.SONG} /> <ListRefreshButton listKey={ItemListKey.SONG} />
</Group> </Group>
src/renderer/features/folders/hooks/use-folder-list-filters.ts
+3 -3
View File
@@ -6,7 +6,7 @@ import { useSortByFilter } from '/@/renderer/features/shared/hooks/use-sort-by-f
import { useSortOrderFilter } from '/@/renderer/features/shared/hooks/use-sort-order-filter'; import { useSortOrderFilter } from '/@/renderer/features/shared/hooks/use-sort-order-filter';
import { FILTER_KEYS } from '/@/renderer/features/shared/utils'; import { FILTER_KEYS } from '/@/renderer/features/shared/utils';
import { parseJsonParam, setJsonSearchParam } from '/@/renderer/utils/query-params'; import { parseJsonParam, setJsonSearchParam } from '/@/renderer/utils/query-params';
import { SongListSort } from '/@/shared/types/domain-types'; import { SongListSort, SortOrder } from '/@/shared/types/domain-types';
import { ItemListKey } from '/@/shared/types/types'; import { ItemListKey } from '/@/shared/types/types';
export type FolderPathItem = { export type FolderPathItem = {
@@ -15,9 +15,9 @@ export type FolderPathItem = {
}; };
export const useFolderListFilters = () => { export const useFolderListFilters = () => {
const { sortBy } = useSortByFilter<SongListSort>(null, ItemListKey.SONG); const { sortBy } = useSortByFilter<SongListSort>(SongListSort.ID, ItemListKey.FOLDER);
const { sortOrder } = useSortOrderFilter(null, ItemListKey.SONG); const { sortOrder } = useSortOrderFilter(SortOrder.ASC, ItemListKey.FOLDER);
const { searchTerm, setSearchTerm } = useSearchTermFilter(''); const { searchTerm, setSearchTerm } = useSearchTermFilter('');
src/shared/types/types.ts
+1
View File
@@ -20,6 +20,7 @@ export enum ItemListKey {
ALBUM_ARTIST_SONG = 'albumArtistSong', ALBUM_ARTIST_SONG = 'albumArtistSong',
ALBUM_DETAIL = 'albumDetail', ALBUM_DETAIL = 'albumDetail',
ARTIST = LibraryItem.ARTIST, ARTIST = LibraryItem.ARTIST,
FOLDER = LibraryItem.FOLDER,
FULL_SCREEN = 'fullScreen', FULL_SCREEN = 'fullScreen',
GENRE = LibraryItem.GENRE, GENRE = LibraryItem.GENRE,
GENRE_ALBUM = 'genreAlbum', GENRE_ALBUM = 'genreAlbum',