Fix rebase

WordPress · May 10, 2024 · b003ae4 · b003ae4
1 parent b4b1760
commit b003ae4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/packages/dataviews/src/item-actions.js b/packages/dataviews/src/item-actions.js
@@ -47,7 +47,13 @@ function DropdownMenuItemTrigger( { action, onClick } ) {
 	);
 }
 
-export function ActionModal( { action, item, closeModal, onActionStart, onActionPerformed } ) {
+export function ActionModal( {
+	action,
+	items,
+	closeModal,
+	onActionStart,
+	onActionPerformed,
+} ) {
 	return (
 		<Modal
 			title={ action.modalHeader || action.label }
@@ -57,13 +63,24 @@ export function ActionModal( { action, item, closeModal, onActionStart, onAction
 				action.id
 			) }` }
 		>
-			<action.RenderModal items={ [ item ] } closeModal={ closeModal } onActionStart={ onActionStart } onActionPerformed={ onActionPerformed }
-/>
+			<action.RenderModal
+				items={ items }
+				closeModal={ closeModal }
+				onActionStart={ onActionStart }
+				onActionPerformed={ onActionPerformed }
+			/>
 		</Modal>
 	);
 }
 
-function ActionWithModal( { action, item, ActionTrigger, onActionStart, onActionPerformed, isBusy } ) {
+export function ActionWithModal( {
+	action,
+	items,
+	ActionTrigger,
+	onActionStart,
+	onActionPerformed,
+	isBusy,
+} ) {
 	const [ isModalOpen, setIsModalOpen ] = useState( false );
 	const actionTriggerProps = {
 		action,
@@ -79,10 +96,10 @@ function ActionWithModal( { action, item, ActionTrigger, onActionStart, onAction
 			{ isModalOpen && (
 				<ActionModal
 					action={ action }
-					item={ item }
+					items={ items }
 					closeModal={ () => setIsModalOpen( false ) }
 					onActionStart={ onActionStart }
-					onActionPerformed={ onActionPerformed}
+					onActionPerformed={ onActionPerformed }
 				/>
 			) }
 		</>

diff --git a/packages/dataviews/src/view-list.tsx b/packages/dataviews/src/view-list.tsx
@@ -234,10 +234,12 @@ function ListItem( {
 									{ isModalOpen && (
 										<ActionModal
 											action={ primaryAction }
-											item={ item }
+											items={ [ item ] }
 											closeModal={ () =>
 												setIsModalOpen( false )
 											}
+											onActionStart={ () => {} }
+											onActionPerformed={ () => {} }
 										/>
 									) }
 								</CompositeItem>