fix(ui): propagates sort change events through list query provider (#7968)

packages/ui/src/elements/SortColumn/index.tsx

@@ -1,8 +1,7 @@
 'use client'
 import type { FieldBase } from 'payload'
 
-// TODO: abstract the `next/navigation` dependency out from this component
-import React, { useCallback } from 'react'
+import React from 'react'
 
 import { ChevronIcon } from '../../icons/Chevron/index.js'
 import { useListQuery } from '../../providers/ListQuery/index.js'
@@ -11,10 +10,10 @@ import { useTranslation } from '../../providers/Translation/index.js'
 import './index.scss'
 
 export type SortColumnProps = {
-  Label: React.ReactNode
-  disable?: boolean
-  label?: FieldBase['label']
-  name: string
+  readonly Label: React.ReactNode
+  readonly disable?: boolean
+  readonly label?: FieldBase['label']
+  readonly name: string
 }
 
 const baseClass = 'sort-column'
@@ -22,7 +21,7 @@ const baseClass = 'sort-column'
 export const SortColumn: React.FC<SortColumnProps> = (props) => {
   const { name, Label, disable = false, label } = props
   const { searchParams } = useSearchParams()
-  const { refineListData } = useListQuery()
+  const { handleSortChange } = useListQuery()
   const { t } = useTranslation()
 
   const { sort } = searchParams
@@ -40,15 +39,6 @@ export const SortColumn: React.FC<SortColumnProps> = (props) => {
     descClasses.push(`${baseClass}--active`)
   }
 
-  const setSort = useCallback(
-    async (newSort: string) => {
-      await refineListData({
-        sort: newSort,
-      })
-    },
-    [refineListData],
-  )
-
   return (
     <div className={baseClass}>
       <span className={`${baseClass}__label`}>{Label}</span>
@@ -60,7 +50,7 @@ export const SortColumn: React.FC<SortColumnProps> = (props) => {
               label,
             })}
             className={[...ascClasses, `${baseClass}__button`].filter(Boolean).join(' ')}
-            onClick={() => void setSort(asc)}
+            onClick={() => void handleSortChange(asc)}
             type="button"
           >
             <ChevronIcon direction="up" />
@@ -71,7 +61,7 @@ export const SortColumn: React.FC<SortColumnProps> = (props) => {
               label,
             })}
             className={[...descClasses, `${baseClass}__button`].filter(Boolean).join(' ')}
-            onClick={() => void setSort(desc)}
+            onClick={() => void handleSortChange(desc)}
             type="button"
           >
             <ChevronIcon />

packages/ui/src/providers/ListQuery/index.tsx

@@ -20,6 +20,7 @@ type PropHandlers = {
   handleSortChange?: (sort: string) => Promise<void> | void
   handleWhereChange?: (where: Where) => Promise<void> | void
 }
+
 type ContextHandlers = {
   handlePageChange?: (page: number) => Promise<void>
   handlePerPageChange?: (limit: number) => Promise<void>
@@ -29,12 +30,12 @@ type ContextHandlers = {
 }
 
 export type ListQueryProps = {
-  children: React.ReactNode
-  data: PaginatedDocs
-  defaultLimit?: number
-  defaultSort?: string
-  modifySearchParams?: boolean
-  preferenceKey?: string
+  readonly children: React.ReactNode
+  readonly data: PaginatedDocs
+  readonly defaultLimit?: number
+  readonly defaultSort?: string
+  readonly modifySearchParams?: boolean
+  readonly preferenceKey?: string
 } & PropHandlers
 
 export type ListQueryContext = {
@@ -81,6 +82,7 @@ export const ListQueryProvider: React.FC<ListQueryProps> = ({
       }
 
       let pageQuery = 'page' in query ? query.page : currentQuery?.page
+
       if ('where' in query || 'search' in query) {
         pageQuery = '1'
       }
@@ -92,10 +94,12 @@ export const ListQueryProvider: React.FC<ListQueryProps> = ({
         updatedPreferences.limit = query.limit
         updatePreferences = true
       }
+
       if ('sort' in query) {
         updatedPreferences.sort = query.sort
         updatePreferences = true
       }
+
       if (updatePreferences && preferenceKey) {
         await setPreference(preferenceKey, updatedPreferences)
       }
@@ -118,42 +122,51 @@ export const ListQueryProvider: React.FC<ListQueryProps> = ({
       if (typeof handlePageChangeFromProps === 'function') {
         await handlePageChangeFromProps(arg)
       }
+
       await refineListData({ page: String(arg) })
     },
     [refineListData, handlePageChangeFromProps],
   )
+
   const handlePerPageChange = React.useCallback(
     async (arg: number) => {
       if (typeof handlePerPageChangeFromProps === 'function') {
         await handlePerPageChangeFromProps(arg)
       }
+
       await refineListData({ limit: String(arg) })
     },
     [refineListData, handlePerPageChangeFromProps],
   )
+
   const handleSearchChange = React.useCallback(
     async (arg: string) => {
       if (typeof handleSearchChangeFromProps === 'function') {
         await handleSearchChangeFromProps(arg)
       }
+
       await refineListData({ search: arg })
     },
     [refineListData, handleSearchChangeFromProps],
   )
+
   const handleSortChange = React.useCallback(
     async (arg: string) => {
       if (typeof handleSortChangeFromProps === 'function') {
         await handleSortChangeFromProps(arg)
       }
+
       await refineListData({ sort: arg })
     },
     [refineListData, handleSortChangeFromProps],
   )
+
   const handleWhereChange = React.useCallback(
     async (arg: Where) => {
       if (typeof handleWhereChangeFromProps === 'function') {
         await handleWhereChangeFromProps(arg)
       }
+
       await refineListData({ where: arg })
     },
     [refineListData, handleWhereChangeFromProps],
@@ -168,10 +181,12 @@ export const ListQueryProvider: React.FC<ListQueryProps> = ({
           currentQuery.limit = String(defaultLimit)
           shouldUpdateQueryString = true
         }
+
         if (defaultSort && !('sort' in currentQuery)) {
           currentQuery.sort = defaultSort
           shouldUpdateQueryString = true
         }
+
         if (shouldUpdateQueryString) {
           router.replace(`?${qs.stringify(currentQuery)}`)
         }