Fix sorting when both sortBy and sortDir change

owncloud · Mar 22, 2023 · 167738d · 167738d
1 parent 67e5ab0
commit 167738d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/packages/web-app-files/src/composables/sort/useSort.ts b/packages/web-app-files/src/composables/sort/useSort.ts
@@ -2,6 +2,7 @@ import { ref, Ref, computed, unref, isRef } from 'vue'
 import { MaybeRef, ReadOnlyRef } from 'web-pkg/src/utils'
 import { useRouteName, useRouteQueryPersisted, QueryValue } from 'web-pkg/src/composables'
 import { SortConstants } from './constants'
+import { useRouter } from 'vue-router'
 
 export interface SortableItem {
   type?: string
@@ -37,6 +38,7 @@ export interface SortResult<T> {
 }
 
 export function useSort<T extends SortableItem>(options: SortOptions<T>): SortResult<T> {
+  const router = useRouter()
   const sortByRef = createSortByQueryRef(options)
   const sortDirRef = createSortDirQueryRef(options)
 
@@ -63,8 +65,13 @@ export function useSort<T extends SortableItem>(options: SortOptions<T>): SortRe
   })
 
   const handleSort = ({ sortBy, sortDir }: { sortBy: string; sortDir: SortDir }) => {
-    sortByRef.value = sortBy
-    sortDirRef.value = sortDir
+    return router.replace({
+      query: {
+        ...unref(router.currentRoute).query,
+        'sort-by': sortBy,
+        'sort-dir': sortDir
+      }
+    })
   }
 
   return {