Skip to content

Commit 2527990

Browse files
committed
refactor(Menu): replace with `Button
1 parent 7b3082e commit 2527990

File tree

3 files changed

+7
-30
lines changed

3 files changed

+7
-30
lines changed

packages/dropdowns/src/elements/menu/Menu.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import { mergeRefs } from 'react-merge-refs';
1111
import { ThemeContext } from 'styled-components';
1212
import { useMenu } from '@zendeskgarden/container-menu';
1313
import { DEFAULT_THEME, useWindow } from '@zendeskgarden/react-theming';
14-
import { IButtonProps } from '@zendeskgarden/react-buttons';
14+
import { Button, IButtonProps } from '@zendeskgarden/react-buttons';
1515
import { IMenuProps, PLACEMENT } from '../../types';
1616
import { MenuContext } from '../../context/useMenuContext';
1717
import { toItems } from './utils';
1818
import { MenuList } from './MenuList';
19-
import { StyledButton } from '../../views';
2019
import ChevronIcon from '@zendeskgarden/svg-icons/src/16/chevron-down-stroke.svg';
2120

21+
const BTN_COMPONENT_ID = 'dropdowns.menu.button';
22+
2223
/**
2324
* @extends HTMLAttributes<HTMLUListElement>
2425
*/
@@ -87,12 +88,12 @@ export const Menu = forwardRef<HTMLUListElement, IMenuProps>(
8788
typeof button === 'function' ? (
8889
button(triggerProps)
8990
) : (
90-
<StyledButton {...triggerProps}>
91+
<Button {...triggerProps} data-garden-id={BTN_COMPONENT_ID}>
9192
{button}
92-
<StyledButton.EndIcon isRotated={isExpanded}>
93+
<Button.EndIcon isRotated={isExpanded}>
9394
<ChevronIcon />
94-
</StyledButton.EndIcon>
95-
</StyledButton>
95+
</Button.EndIcon>
96+
</Button>
9697
);
9798

9899
const contextValue = useMemo(

packages/dropdowns/src/views/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ export * from './menu/StyledItemGroup';
3636
export * from './menu/StyledItemIcon';
3737
export * from './menu/StyledItemMeta';
3838
export * from './menu/StyledItemTypeIcon';
39-
export * from './menu/StyledButton';
4039
export * from './menu/StyledSeparator';

packages/dropdowns/src/views/menu/StyledButton.ts

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)