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

DataViews list layout: hide actions menu when there is only one action and is primary #67015

Merged
merged 2 commits into from
Nov 15, 2024
Merged

DataViews list layout: hide actions menu when there is only one action and is primary #67015

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fb8ef7
If there is only one action and is primary, hide the actions menu
oandregal Nov 14, 2024
6f9eaff
Remove unnecessary optional chaining
oandregal Nov 15, 2024
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
58 changes: 31 additions & 27 deletions packages/dataviews/src/dataviews-layouts/list/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,13 @@ function ListItem< Item >( {
( action ) => action.isPrimary && !! action.icon
);
return {
primaryAction: _primaryActions?.[ 0 ],
primaryAction: _primaryActions[ 0 ],
eligibleActions: _eligibleActions,
};
}, [ actions, item ] );

const hasOnlyOnePrimaryAction = primaryAction && actions.length === 1;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note this checks actions, not eligibleActions. This is intentional to make sure that we only hide the item menu when all the items has a single action. We wouldn't want to show only the icon for some and the icon + the actions menu for others.


const renderedMediaField = mediaField?.render ? (
<div className="dataviews-view-list__media-wrapper">
<mediaField.render item={ item } />
Expand All @@ -194,33 +196,35 @@ function ListItem< Item >( {
item={ item }
/>
) }
<div role="gridcell">
<Menu
trigger={
<Composite.Item
id={ generateDropdownTriggerCompositeId(
idPrefix
) }
render={
<Button
size="small"
icon={ moreVertical }
label={ __( 'Actions' ) }
accessibleWhenDisabled
disabled={ ! actions.length }
onKeyDown={ onDropdownTriggerKeyDown }
/>
}
{ ! hasOnlyOnePrimaryAction && (
<div role="gridcell">
<Menu
trigger={
<Composite.Item
id={ generateDropdownTriggerCompositeId(
idPrefix
) }
render={
<Button
size="small"
icon={ moreVertical }
label={ __( 'Actions' ) }
accessibleWhenDisabled
disabled={ ! actions.length }
onKeyDown={ onDropdownTriggerKeyDown }
/>
}
/>
}
placement="bottom-end"
>
<ActionsMenuGroup
actions={ eligibleActions }
item={ item }
/>
}
placement="bottom-end"
>
<ActionsMenuGroup
actions={ eligibleActions }
item={ item }
/>
</Menu>
</div>
</Menu>
</div>
) }
</HStack>
);

Expand Down
Loading