From 091625d7d9e66775faa7f6a4adef271205329928 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Wed, 3 Dec 2025 20:27:57 -0800
Subject: [PATCH] decouple folder list sort from song list sort

---
 .../folders/components/folder-list-header-filters.tsx       | 4 ++--
 .../features/folders/hooks/use-folder-list-filters.ts       | 6 +++---
 src/shared/types/types.ts                                   | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/renderer/features/folders/components/folder-list-header-filters.tsx b/src/renderer/features/folders/components/folder-list-header-filters.tsx
index 79da6c51f..0b374f95d 100644
--- a/src/renderer/features/folders/components/folder-list-header-filters.tsx
+++ b/src/renderer/features/folders/components/folder-list-header-filters.tsx
@@ -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>
diff --git a/src/renderer/features/folders/hooks/use-folder-list-filters.ts b/src/renderer/features/folders/hooks/use-folder-list-filters.ts
index 8dd48abc8..1a75797bf 100644
--- a/src/renderer/features/folders/hooks/use-folder-list-filters.ts
+++ b/src/renderer/features/folders/hooks/use-folder-list-filters.ts
@@ -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('');
 
diff --git a/src/shared/types/types.ts b/src/shared/types/types.ts
index 040af8050..d50d7e5a4 100644
--- a/src/shared/types/types.ts
+++ b/src/shared/types/types.ts
@@ -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',