fix(VDataTable): use item.raw and columns in sorting transform (#20077)

fixes #20045
vuetifyjs · Jul 16, 2024 · e33b951 · e33b951
1 parent a88a2ee
commit e33b951
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/vuetify/src/components/VDataTable/VDataTable.tsx b/packages/vuetify/src/components/VDataTable/VDataTable.tsx
@@ -156,7 +156,7 @@ export const VDataTable = genericComponent<new <T extends readonly any[], V>(
     const { sortByWithGroups, opened, extractRows, isGroupOpen, toggleGroup } = provideGroupBy({ groupBy, sortBy, disableSort })
 
     const { sortedItems } = useSortedItems(props, filteredItems, sortByWithGroups, {
-      transform: item => item.columns,
+      transform: item => ({ ...item.raw, ...item.columns }),
       sortFunctions,
       sortRawFunctions,
     })

diff --git a/packages/vuetify/src/components/VDataTable/VDataTableVirtual.tsx b/packages/vuetify/src/components/VDataTable/VDataTableVirtual.tsx
@@ -110,7 +110,7 @@ export const VDataTableVirtual = genericComponent<new <T extends readonly any[],
     const { sortByWithGroups, opened, extractRows, isGroupOpen, toggleGroup } = provideGroupBy({ groupBy, sortBy, disableSort })
 
     const { sortedItems } = useSortedItems(props, filteredItems, sortByWithGroups, {
-      transform: item => item.columns,
+      transform: item => ({ ...item.raw, ...item.columns }),
       sortFunctions,
       sortRawFunctions,
     })

diff --git a/packages/vuetify/src/components/VDataTable/composables/sort.ts b/packages/vuetify/src/components/VDataTable/composables/sort.ts
@@ -4,7 +4,7 @@ import { useProxiedModel } from '@/composables/proxiedModel'
 
 // Utilities
 import { computed, inject, provide, toRef } from 'vue'
-import { isEmpty, propsFactory } from '@/util'
+import { getObjectValueByPath, isEmpty, propsFactory } from '@/util'
 
 // Types
 import type { InjectionKey, PropType, Ref } from 'vue'
@@ -148,8 +148,8 @@ export function sortItems<T extends InternalItem> (
 
       if (sortOrder === false) continue
 
-      let sortA = a[1][sortKey]
-      let sortB = b[1][sortKey]
+      let sortA = getObjectValueByPath(a[1], sortKey)
+      let sortB = getObjectValueByPath(b[1], sortKey)
       let sortARaw = a[0].raw
       let sortBRaw = b[0].raw