Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dataviews: Update item actions in grid view #56501

Merged
merged 4 commits into from
Nov 27, 2023
Merged

Dataviews: Update item actions in grid view #56501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a51f1a
Dataviews: Update item actions in grid view
ntsekouras Nov 24, 2023
dd53b6d
Use new dropdown
ntsekouras Nov 24, 2023
9e2752d
remove separators and icons
ntsekouras Nov 27, 2023
becb8b3
add `isCompact` prop instead of viewType
ntsekouras Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 98 additions & 39 deletions packages/edit-site/src/components/dataviews/item-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,28 @@
* WordPress dependencies
*/
import {
DropdownMenu,
MenuGroup,
MenuItem,
Button,
Modal,
__experimentalHStack as HStack,
privateApis as componentsPrivateApis,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useMemo, useState } from '@wordpress/element';
import { moreVertical } from '@wordpress/icons';

function PrimaryActionTrigger( { action, onClick } ) {
/**
* Internal dependencies
*/
import { unlock } from '../../lock-unlock';

const {
DropdownMenuV2Ariakit: DropdownMenu,
DropdownMenuGroupV2Ariakit: DropdownMenuGroup,
DropdownMenuItemV2Ariakit: DropdownMenuItem,
DropdownMenuItemLabelV2Ariakit: DropdownMenuItemLabel,
} = unlock( componentsPrivateApis );

function ButtonTrigger( { action, onClick } ) {
return (
<Button
label={ action.label }
Expand All @@ -25,11 +35,11 @@ function PrimaryActionTrigger( { action, onClick } ) {
);
}

function SecondaryActionTrigger( { action, onClick } ) {
function DropdownMenuItemTrigger( { action, onClick } ) {
return (
<MenuItem onClick={ onClick } isDestructive={ action.isDestructive }>
{ action.label }
</MenuItem>
<DropdownMenuItem onClick={ onClick }>
<DropdownMenuItemLabel>{ action.label }</DropdownMenuItemLabel>
</DropdownMenuItem>
);
}

Expand Down Expand Up @@ -62,7 +72,33 @@ function ActionWithModal( { action, item, ActionTrigger } ) {
);
}

export default function ItemActions( { item, actions } ) {
function ActionsDropdownMenuGroup( { actions, item } ) {
return (
<DropdownMenuGroup>
{ actions.map( ( action ) => {
if ( !! action.RenderModal ) {
return (
<ActionWithModal
key={ action.id }
action={ action }
item={ item }
ActionTrigger={ DropdownMenuItemTrigger }
/>
);
}
return (
<DropdownMenuItemTrigger
key={ action.id }
action={ action }
onClick={ () => action.callback( item ) }
/>
);
} ) }
</DropdownMenuGroup>
);
}

export default function ItemActions( { item, actions, isCompact } ) {
const { primaryActions, secondaryActions } = useMemo( () => {
return actions.reduce(
( accumulator, action ) => {
Expand All @@ -84,6 +120,15 @@ export default function ItemActions( { item, actions } ) {
if ( ! primaryActions.length && ! secondaryActions.length ) {
return null;
}
if ( isCompact ) {
return (
<CompactItemActions
item={ item }
primaryActions={ primaryActions }
secondaryActions={ secondaryActions }
/>
);
}
return (
<HStack justify="flex-end">
{ !! primaryActions.length &&
Expand All @@ -94,49 +139,63 @@ export default function ItemActions( { item, actions } ) {
key={ action.id }
action={ action }
item={ item }
ActionTrigger={ PrimaryActionTrigger }
ActionTrigger={ ButtonTrigger }
/>
);
}
return (
<PrimaryActionTrigger
<ButtonTrigger
key={ action.id }
action={ action }
onClick={ () => action.callback( item ) }
/>
);
} ) }
{ !! secondaryActions.length && (
<DropdownMenu icon={ moreVertical } label={ __( 'Actions' ) }>
{ () => (
<MenuGroup>
{ secondaryActions.map( ( action ) => {
if ( !! action.RenderModal ) {
return (
<ActionWithModal
key={ action.id }
action={ action }
item={ item }
ActionTrigger={
SecondaryActionTrigger
}
/>
);
}
return (
<SecondaryActionTrigger
key={ action.id }
action={ action }
onClick={ () =>
action.callback( item )
}
/>
);
} ) }
</MenuGroup>
) }
<DropdownMenu
trigger={
<Button
size="compact"
icon={ moreVertical }
label={ __( 'Actions' ) }
/>
}
placement="bottom-end"
>
<ActionsDropdownMenuGroup
actions={ secondaryActions }
item={ item }
/>
</DropdownMenu>
) }
</HStack>
);
}

function CompactItemActions( { item, primaryActions, secondaryActions } ) {
return (
<DropdownMenu
trigger={
<Button
size="compact"
icon={ moreVertical }
label={ __( 'Actions' ) }
/>
}
placement="bottom-end"
>
{ !! primaryActions.length && (
<ActionsDropdownMenuGroup
actions={ primaryActions }
item={ item }
/>
) }
{ !! secondaryActions.length && (
<ActionsDropdownMenuGroup
actions={ secondaryActions }
item={ item }
/>
) }
</DropdownMenu>
);
}
1 change: 1 addition & 0 deletions packages/edit-site/src/components/dataviews/view-grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export function ViewGrid( { data, fields, view, actions, getItemId } ) {
<ItemActions
item={ item }
actions={ actions }
isCompact
/>
</FlexBlock>
</HStack>
Expand Down
Loading