Don't use the callback function

WordPress · Jun 26, 2024 · 7c92c8e · 7c92c8e
1 parent b86375d
commit 7c92c8e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/packages/dataviews/src/dataviews.tsx b/packages/dataviews/src/dataviews.tsx
@@ -80,12 +80,12 @@ export default function DataViews< Item extends AnyItem >( {
 	onSelectionChange = defaultOnSelectionChange,
 }: DataViewsProps< Item > ) {
 	const [ selectionState, setSelectionState ] = useState< string[] >( [] );
-	const selection =
-		selectionProperty === undefined ? selectionState : selectionProperty;
-	const setSelection =
-		setSelectionProperty === undefined
-			? setSelectionState
-			: setSelectionProperty;
+	const isUncontrolled =
+		selectionProperty === undefined || setSelectionProperty === undefined;
+	const selection = isUncontrolled ? selectionState : selectionProperty;
+	const setSelection = isUncontrolled
+		? setSelectionState
+		: setSelectionProperty;
 	const [ openedFilter, setOpenedFilter ] = useState< string | null >( null );
 
 	function setSelectionWithChange( value: SelectionOrUpdater ) {

diff --git a/packages/dataviews/src/single-selection-checkbox.tsx b/packages/dataviews/src/single-selection-checkbox.tsx
@@ -54,10 +54,10 @@ export default function SingleSelectionCheckbox< Item extends AnyItem >( {
 					return;
 				}
 
-				onSelectionChange( ( state ) =>
-					state.includes( id )
-						? state.filter( ( itemId ) => id !== itemId )
-						: [ ...state, id ]
+				onSelectionChange(
+					selection.includes( id )
+						? selection.filter( ( itemId ) => id !== itemId )
+						: [ ...selection, id ]
 				);
 			} }
 		/>

diff --git a/packages/dataviews/src/view-grid.tsx b/packages/dataviews/src/view-grid.tsx
@@ -67,10 +67,10 @@ function GridItem< Item extends AnyItem >( {
 					if ( ! hasBulkAction ) {
 						return;
 					}
-					onSelectionChange( ( state ) =>
-						state.includes( id )
-							? state.filter( ( itemId ) => id !== itemId )
-							: [ ...state, id ]
+					onSelectionChange(
+						selection.includes( id )
+							? selection.filter( ( itemId ) => id !== itemId )
+							: [ ...selection, id ]
 					);
 				}
 			} }

diff --git a/packages/dataviews/src/view-table.tsx b/packages/dataviews/src/view-table.tsx
@@ -338,10 +338,10 @@ function TableRow< Item extends AnyItem >( {
 					! isTouchDevice.current &&
 					document.getSelection()?.type !== 'Range'
 				) {
-					onSelectionChange( ( state ) =>
-						state.includes( id )
-							? state.filter( ( itemId ) => id !== itemId )
-							: [ ...state, id ]
+					onSelectionChange(
+						selection.includes( id )
+							? selection.filter( ( itemId ) => id !== itemId )
+							: [ ...selection, id ]
 					);
 				}
 			} }