Skip to content

refactor: ActionMenuItem - improve layout for consistent click on menu item #749

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

Merged
AbhishekA1509 merged 1 commit into from
May 23, 2025
Merged

refactor: ActionMenuItem - improve layout for consistent click on menu item #749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 28 additions & 18 deletions src/Shared/Components/ActionMenu/ActionMenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { Icon } from '../Icon'
import { getTooltipProps } from '../SelectPicker/common'
import { ActionMenuItemProps } from './types'

const COMMON_ACTION_MENU_ITEM_CLASS = 'flex-grow-1 flex left top dc__gap-8 py-6 px-8'

export const ActionMenuItem = <T extends string | number>({
item,
itemRef,
Expand Down Expand Up @@ -52,19 +54,25 @@ export const ActionMenuItem = <T extends string | number>({

const renderContent = () => (
<>
<Tooltip content={label} placement="right">
<span className={`m-0 fs-13 fw-4 lh-20 dc__truncate ${isNegativeType ? 'cr-5' : 'cn-9'}`}>{label}</span>
</Tooltip>
{description &&
(typeof description === 'string' ? (
<span
className={`m-0 fs-12 fw-4 lh-18 cn-7 ${!disableDescriptionEllipsis ? 'dc__ellipsis-right__2nd-line' : 'dc__word-break'}`}
>
{description}
{renderIcon(startIcon)}
<span>
<Tooltip content={label} placement="right">
<span className={`m-0 fs-13 fw-4 lh-20 dc__truncate ${isNegativeType ? 'cr-5' : 'cn-9'}`}>
{label}
</span>
) : (
description
))}
</Tooltip>
{description &&
(typeof description === 'string' ? (
<span
className={`m-0 fs-12 fw-4 lh-18 cn-7 ${!disableDescriptionEllipsis ? 'dc__ellipsis-right__2nd-line' : 'dc__word-break'}`}
>
{description}
</span>
) : (
description
))}
</span>
{renderIcon(endIcon)}
</>
)

Expand All @@ -74,7 +82,7 @@ export const ActionMenuItem = <T extends string | number>({
return (
<a
ref={itemRef as LegacyRef<HTMLAnchorElement>}
className="flex-grow-1"
className={COMMON_ACTION_MENU_ITEM_CLASS}
href={item.href}
target="_blank"
rel="noreferrer"
Expand All @@ -84,7 +92,11 @@ export const ActionMenuItem = <T extends string | number>({
)
case 'link':
return (
<Link ref={itemRef as Ref<HTMLAnchorElement>} className="flex-grow-1" to={item.to}>
<Link
ref={itemRef as Ref<HTMLAnchorElement>}
className={COMMON_ACTION_MENU_ITEM_CLASS}
to={item.to}
>
{renderContent()}
</Link>
)
Expand All @@ -94,7 +106,7 @@ export const ActionMenuItem = <T extends string | number>({
<button
ref={itemRef as LegacyRef<HTMLButtonElement>}
type="button"
className="dc__transparent p-0 flex-grow-1"
className={`dc__transparent ${COMMON_ACTION_MENU_ITEM_CLASS}`}
>
{renderContent()}
</button>
Expand All @@ -111,13 +123,11 @@ export const ActionMenuItem = <T extends string | number>({
onMouseEnter={onMouseEnter}
tabIndex={-1}
// Intentionally added margin to the left and right to have the gap on the edges of the options
className={`action-menu__option br-4 flex left top dc__gap-8 mr-4 ml-4 py-6 px-8 ${isDisabled ? 'dc__disabled' : 'cursor'} ${isNegativeType ? 'dc__hover-r50' : 'dc__hover-n50'} ${isFocused ? `action-menu__option--focused${isNegativeType ? '-negative' : ''}` : ''}`}
className={`action-menu__option br-4 mr-4 ml-4 ${isDisabled ? 'dc__disabled' : 'cursor'} ${isNegativeType ? 'dc__hover-r50' : 'dc__hover-n50'} ${isFocused ? `action-menu__option--focused${isNegativeType ? '-negative' : ''}` : ''}`}
onClick={!isDisabled ? handleClick : undefined}
aria-disabled={isDisabled}
>
{renderIcon(startIcon)}
{renderComponent()}
{renderIcon(endIcon)}
</li>
</Tooltip>
)
Expand Down