Fix type errors for default prop values

packages/dataviews/src/dataviews.tsx

@@ -23,27 +23,28 @@ import { normalizeFields } from './normalize-fields';
 import BulkActionsToolbar from './bulk-actions-toolbar';
 import type { Action, Field, View, ViewBaseProps } from './types';
 
-interface DataViewsProps< Item > {
+type ItemWithId = { id: string };
+
+type DataViewsProps< Item > = {
 	view: View;
 	onChangeView: ( view: View ) => void;
 	fields: Field< Item >[];
 	search?: boolean;
 	searchLabel?: string;
 	actions?: Action< Item >[];
 	data: Item[];
-	getItemId?: ( item: Item ) => string;
 	isLoading?: boolean;
 	paginationInfo: {
 		totalItems: number;
 		totalPages: number;
 	};
 	supportedLayouts: string[];
 	onSelectionChange?: ( items: Item[] ) => void;
-}
+} & ( Item extends ItemWithId
+	? { getItemId?: ( item: Item ) => string }
+	: { getItemId: ( item: Item ) => string } );
 
-function defaultGetItemId( item: { id: string } ) {
-	return item.id;
-}
+const defaultGetItemId = ( item: ItemWithId ) => item.id;
 
 const defaultOnSelectionChange = () => {};
 

packages/dataviews/src/normalize-fields.ts

@@ -1,7 +1,10 @@
 /**
  * Internal dependencies
  */
-import type { Field, NormalizedField } from './types';
+import type { Field, NormalizedField, ItemRecord } from './types';
+
+const defaultGetValue = ( field: string ) => ( args: { item: ItemRecord } ) =>
+	args.item[ field ];
 
 /**
  * Apply default values and normalize the fields config.
@@ -13,7 +16,7 @@ export function normalizeFields< Item >(
 	fields: Field< Item >[]
 ): NormalizedField< Item >[] {
 	return fields.map( ( field ) => {
-		const getValue = field.getValue || ( ( { item } ) => item[ field.id ] );
+		const { getValue = defaultGetValue( field.id ) } = field;
 
 		return {
 			...field,

packages/dataviews/src/types.ts

@@ -37,10 +37,12 @@ export type Operator =
 	| 'isAll'
 	| 'isNotAll';
 
+export type ItemRecord = Record< string, unknown >;
+
 /**
  * A dataview field for a specific property of a data type.
  */
-export interface Field< Item > {
+export type Field< Item > = {
 	/**
 	 * The unique identifier of the field.
 	 */
@@ -51,12 +53,6 @@ export interface Field< Item > {
 	 */
 	header?: string;
 
-	/**
-	 * Callback used to retrieve the value of the field from the item.
-	 * Defaults to `item[ field.id ]`.
-	 */
-	getValue?: ( args: { item: Item } ) => any;
-
 	/**
 	 * Callback used to render the field. Defaults to `field.getValue`.
 	 */
@@ -101,10 +97,27 @@ export interface Field< Item > {
 	 * Filter config for the field.
 	 */
 	filterBy?: FilterByConfig | undefined;
-}
-
-export type NormalizedField< Item > = Field< Item > &
-	Required< Pick< Field< Item >, 'header' | 'getValue' | 'render' > >;
+} & ( Item extends ItemRecord
+	? {
+			/**
+			 * Callback used to retrieve the value of the field from the item.
+			 * Defaults to `item[ field.id ]`.
+			 */
+			getValue?: ( args: { item: Item } ) => any;
+	  }
+	: {
+			/**
+			 * Callback used to retrieve the value of the field from the item.
+			 * Defaults to `item[ field.id ]`.
+			 */
+			getValue: ( args: { item: Item } ) => any;
+	  } );
+
+export type NormalizedField< Item > = Field< Item > & {
+	header: string;
+	getValue: ( args: { item: Item } ) => any;
+	render: ( args: { item: Item } ) => ReactNode;
+};
 
 /**
  * A collection of dataview fields for a data type.

packages/dataviews/src/view-list.tsx

@@ -316,7 +316,7 @@ export default function ViewList< Item >( props: ViewListProps< Item > ) {
 	} = props;
 	const baseId = useInstanceId( ViewList, 'view-list' );
 	const selectedItem = data?.findLast( ( item ) =>
-		selection.includes( item.id )
+		selection.includes( getItemId( item ) )
 	);
 
 	const mediaField = fields.find(