mirror of
https://github.com/jeffvli/feishin.git
synced 2026-05-07 04:20:12 +02:00
decouple folder list sort from song list sort
This commit is contained in:
@@ -229,12 +229,12 @@ export const FolderListHeaderFilters = () => {
|
||||
<ListSortByDropdown
|
||||
defaultSortByValue={SongListSort.ID}
|
||||
itemType={LibraryItem.FOLDER}
|
||||
listKey={ItemListKey.SONG}
|
||||
listKey={ItemListKey.FOLDER}
|
||||
/>
|
||||
<Divider orientation="vertical" />
|
||||
<ListSortOrderToggleButton
|
||||
defaultSortOrder={SortOrder.ASC}
|
||||
listKey={ItemListKey.SONG}
|
||||
listKey={ItemListKey.FOLDER}
|
||||
/>
|
||||
<ListRefreshButton listKey={ItemListKey.SONG} />
|
||||
</Group>
|
||||
|
||||
@@ -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 { FILTER_KEYS } from '/@/renderer/features/shared/utils';
|
||||
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';
|
||||
|
||||
export type FolderPathItem = {
|
||||
@@ -15,9 +15,9 @@ export type FolderPathItem = {
|
||||
};
|
||||
|
||||
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('');
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ export enum ItemListKey {
|
||||
ALBUM_ARTIST_SONG = 'albumArtistSong',
|
||||
ALBUM_DETAIL = 'albumDetail',
|
||||
ARTIST = LibraryItem.ARTIST,
|
||||
FOLDER = LibraryItem.FOLDER,
|
||||
FULL_SCREEN = 'fullScreen',
|
||||
GENRE = LibraryItem.GENRE,
|
||||
GENRE_ALBUM = 'genreAlbum',
|
||||
|
||||
Reference in New Issue
Block a user