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

fix(overflowmenu): always use button kind=ghost #16970

Merged
merged 9 commits into from
Aug 2, 2024
Merged

fix(overflowmenu): always use button kind=ghost #16970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e6be85a
fix(overflowmenu): always use button kind=ghost
tay1orjones Jul 16, 2024
52c4d61
chore: update snaps
tay1orjones Jul 17, 2024
0b932e0
Merge branch 'main' into overflow-menu-style
tay1orjones Jul 17, 2024
92759e9
Merge branch 'main' into overflow-menu-style
riddhybansal Jul 22, 2024
50906ac
Merge branch 'main' into overflow-menu-style
guidari Jul 26, 2024
cff2cdc
Merge branch 'main' into overflow-menu-style
riddhybansal Jul 29, 2024
7e5290e
Merge branch 'main' into overflow-menu-style
riddhybansal Aug 2, 2024
fe7918c
Merge branch 'main' into overflow-menu-style
tay1orjones Aug 2, 2024
3804036
chore: update snaps
tay1orjones Aug 2, 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
4 changes: 2 additions & 2 deletions packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ exports[`DataTable behaves as expected selection should render and match snapsho
aria-expanded="false"
aria-haspopup="true"
aria-labelledby="tooltip-:r2m:"
class="cds--btn--icon-only cds--toolbar-action cds--overflow-menu cds--overflow-menu cds--overflow-menu--md cds--btn cds--btn--md cds--layout--size-md cds--btn--primary"
class="cds--btn--icon-only cds--toolbar-action cds--overflow-menu cds--overflow-menu cds--overflow-menu--md cds--btn cds--btn--md cds--layout--size-md cds--btn--ghost"
title="Settings"
type="button"
>
Expand Down Expand Up @@ -1003,7 +1003,7 @@ exports[`DataTable renders as expected - Component API should render and match s
aria-expanded="false"
aria-haspopup="true"
aria-labelledby="tooltip-:rk:"
class="cds--btn--icon-only cds--toolbar-action cds--overflow-menu cds--overflow-menu cds--overflow-menu--md cds--btn cds--btn--md cds--layout--size-md cds--btn--primary"
class="cds--btn--icon-only cds--toolbar-action cds--overflow-menu cds--overflow-menu cds--overflow-menu--md cds--btn cds--btn--md cds--layout--size-md cds--btn--ghost"
title="Settings"
type="button"
>
Expand Down
2 changes: 1 addition & 1 deletion ...ages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exports[`TableToolbarMenu renders as expected - Component API should render 1`]
aria-expanded="false"
aria-haspopup="true"
aria-labelledby="tooltip-:r0:"
class="cds--btn--icon-only custom-class cds--toolbar-action cds--overflow-menu cds--overflow-menu cds--overflow-menu--md cds--btn cds--btn--md cds--layout--size-md cds--btn--primary"
class="cds--btn--icon-only custom-class cds--toolbar-action cds--overflow-menu cds--overflow-menu cds--overflow-menu--md cds--btn cds--btn--md cds--layout--size-md cds--btn--ghost"
title="Add"
type="button"
>
Expand Down
15 changes: 15 additions & 0 deletions packages/react/src/components/OverflowMenu/OverflowMenu-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,21 @@ describe('OverflowMenu', () => {
expect(screen.getByRole('button')).toHaveAttribute('data-testid', 'test');
});

it('should always use button kind=ghost', () => {
render(
<OverflowMenu
data-testid="test"
aria-label="Overflow menu"
className="extra-class">
<OverflowMenuItem className="test-child" itemText="one" />
<OverflowMenuItem className="test-child" itemText="two" />
</OverflowMenu>
);

expect(screen.getByRole('button')).not.toHaveClass('cds--btn--primary');
expect(screen.getByRole('button')).toHaveClass('cds--btn--ghost');
});

it('should flip menu alignment', async () => {
render(
<OverflowMenu
Expand Down
3 changes: 2 additions & 1 deletion packages/react/src/components/OverflowMenu/OverflowMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,8 @@ class OverflowMenu extends React.Component<
id={id}
ref={mergeRefs(this._triggerRef, ref)}
size={size}
label={iconDescription}>
label={iconDescription}
kind="ghost">
<IconElement {...iconProps} />
</IconButton>
{open && this.state.hasMountedTrigger && wrappedMenuBody}
Expand Down
16 changes: 16 additions & 0 deletions packages/react/src/components/OverflowMenu/next/OverflowMenu-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,22 @@ describe('OverflowMenu (enable-v12-overflowmenu)', () => {
expect(container.firstChild).toHaveAttribute('id', 'custom-id');
});

it('should always use button kind=ghost', () => {
render(
<OverflowMenu>
<MenuItem label="item" className="test-child">
one
</MenuItem>
<MenuItem label="item" className="test-child">
two
</MenuItem>
</OverflowMenu>
);

expect(screen.getByRole('button')).not.toHaveClass('cds--btn--primary');
expect(screen.getByRole('button')).toHaveClass('cds--btn--ghost');
});

it('should close menu on outside click', async () => {
render(
<OverflowMenu>
Expand Down
3 changes: 2 additions & 1 deletion packages/react/src/components/OverflowMenu/next/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ const OverflowMenu = React.forwardRef<HTMLDivElement, OverflowMenuProps>(
onMouseDown={handleMousedown}
ref={floatingRef}
label={label}
align={tooltipAlignment}>
align={tooltipAlignment}
kind="ghost">
<IconElement className={`${prefix}--overflow-menu__icon`} />
</IconButton>
<Menu
Expand Down
Loading