Extract computeDropdownTriggerCompositeId

WordPress · Aug 26, 2024 · a2fe333 · a2fe333
1 parent e0baf77
commit a2fe333
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/packages/dataviews/src/dataviews-layouts/list/index.tsx b/packages/dataviews/src/dataviews-layouts/list/index.tsx
@@ -38,7 +38,7 @@ import type { Action, NormalizedField, ViewListProps } from '../../types';
 
 interface ListViewItemProps< Item > {
 	actions: Action< Item >[];
-	id?: string;
+	id: string;
 	isSelected: boolean;
 	item: Item;
 	mediaField?: NormalizedField< Item >;
@@ -56,6 +56,10 @@ const {
 	DropdownMenuV2: DropdownMenu,
 } = unlock( componentsPrivateApis );
 
+function computeDropdownTriggerCompositeId( domId: string ) {
+	return `${ domId }-dropdown`;
+}
+
 function ListItem< Item >( {
 	actions,
 	id,
@@ -262,7 +266,9 @@ function ListItem< Item >( {
 							<DropdownMenu
 								trigger={
 									<CompositeItem
-										id={ `${ id }-dropdown` }
+										id={ computeDropdownTriggerCompositeId(
+											id
+										) }
 										render={
 											<Button
 												size="small"
@@ -324,8 +330,13 @@ export default function ViewList< Item >( props: ViewListProps< Item > ) {
 	const baseId = useInstanceId( ViewList, 'view-list' );
 
 	const getItemDomId = useCallback(
-		( item?: Item ) =>
-			item ? `${ baseId }-${ getItemId( item ) }` : undefined,
+		( item?: Item ) => {
+			if ( ! item ) {
+				return;
+			}
+
+			return `${ baseId }-${ getItemId( item ) }`;
+		},
 		[ baseId, getItemId ]
 	);
 
@@ -397,7 +408,12 @@ export default function ViewList< Item >( props: ViewListProps< Item > ) {
 
 	const selectItemDropdownTrigger = ( itemIndex: number ) => {
 		const item = data[ itemIndex ];
-		const nextCompositeActiveId = `${ getItemDomId( item ) }-dropdown`;
+		const itemDomId = getItemDomId( item );
+		if ( ! itemDomId ) {
+			return;
+		}
+		const nextCompositeActiveId =
+			computeDropdownTriggerCompositeId( itemDomId );
 		setActiveCompositeId( nextCompositeActiveId );
 		(
 			document.querySelector( `#${ nextCompositeActiveId }` ) as
@@ -443,7 +459,9 @@ export default function ViewList< Item >( props: ViewListProps< Item > ) {
 			setActiveId={ setActiveCompositeId }
 		>
 			{ data.map( ( item ) => {
-				const id = getItemDomId( item );
+				// Since `item` is guaranteed not to be undefined, we can safely
+				// let typescript know that `id` is not undefined either.
+				const id = getItemDomId( item )!;
 				return (
 					<ListItem
 						key={ id }