Pass item & value to sort function

WordPress · Jul 30, 2024 · eaa0b63 · eaa0b63
1 parent bcf814a
commit eaa0b63
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 25 deletions.
diff --git a/packages/dataviews/src/field-types/integer.tsx b/packages/dataviews/src/field-types/integer.tsx
@@ -4,15 +4,17 @@
 import type { SortDirection } from '../types';
 
 function sort< Item >(
-	itemA: Item,
-	itemB: Item,
-	direction: SortDirection,
-	getValue: ( args: { item: Item } ) => any
+	a: {
+		item: Item;
+		value: any;
+	},
+	b: {
+		item: Item;
+		value: any;
+	},
+	direction: SortDirection
 ) {
-	const valueA = getValue( { item: itemA } );
-	const valueB = getValue( { item: itemB } );
-
-	return direction === 'asc' ? valueA - valueB : valueB - valueA;
+	return direction === 'asc' ? a.value - b.value : b.value - a.value;
 }
 
 export default {

diff --git a/packages/dataviews/src/filter-and-sort-data-view.ts b/packages/dataviews/src/filter-and-sort-data-view.ts
@@ -140,18 +140,24 @@ export function filterSortAndPaginate< Item >(
 		} );
 		if ( fieldToSort ) {
 			filteredData.sort( ( a, b ) => {
+				const valueA = fieldToSort.getValue( { item: a } ) ?? '';
+				const valueB = fieldToSort.getValue( { item: b } ) ?? '';
+
 				if ( fieldToSort.type === 'integer' ) {
 					return fieldToSort.sort(
-						a,
-						b,
-						view.sort?.direction ?? 'desc',
-						fieldToSort.getValue
+						{
+							item: a,
+							value: valueA,
+						},
+						{
+							item: b,
+							value: valueB,
+						},
+						view.sort?.direction ?? 'desc'
 					);
 				}
 
 				// When/if types become required, we can remove the following logic.
-				const valueA = fieldToSort.getValue( { item: a } ) ?? '';
-				const valueB = fieldToSort.getValue( { item: b } ) ?? '';
 				if (
 					typeof valueA === 'number' &&
 					typeof valueB === 'number'

diff --git a/packages/dataviews/src/types.ts b/packages/dataviews/src/types.ts
@@ -84,10 +84,15 @@ export type Field< Item > = {
 	 * Callback used to sort the field.
 	 */
 	sort?: (
-		a: Item,
-		b: Item,
-		direction: SortDirection,
-		getValue: ( args: { item: Item } ) => any
+		a: {
+			item: Item;
+			value: any;
+		},
+		b: {
+			item: Item;
+			value: any;
+		},
+		direction: SortDirection
 	) => number;
 
 	/**
@@ -135,10 +140,15 @@ export type NormalizedField< Item > = Field< Item > & {
 	getValue: ( args: { item: Item } ) => any;
 	render: ComponentType< { item: Item } >;
 	sort: (
-		a: Item,
-		b: Item,
-		direction: SortDirection,
-		getValue: ( args: { item: Item } ) => any
+		a: {
+			item: Item;
+			value: any;
+		},
+		b: {
+			item: Item;
+			value: any;
+		},
+		direction: SortDirection
 	) => number;
 };
 

diff --git a/packages/edit-site/src/components/post-fields/index.js b/packages/edit-site/src/components/post-fields/index.js
@@ -242,9 +242,9 @@ function usePostFields( viewType ) {
 						label: name,
 					} ) ) || [],
 				render: PostAuthorField,
-				sort: ( fieldA, fieldB, direction ) => {
-					const nameA = fieldA._embedded?.author?.[ 0 ]?.name || '';
-					const nameB = fieldB._embedded?.author?.[ 0 ]?.name || '';
+				sort: ( { item: a }, { item: b }, direction ) => {
+					const nameA = a._embedded?.author?.[ 0 ]?.name || '';
+					const nameB = b._embedded?.author?.[ 0 ]?.name || '';
 
 					return direction === 'asc'
 						? nameA.localeCompare( nameB )