Skip to content

Commit

Permalink
Merge pull request #1684 from dalalvarun/bugfix/1663-dropdown-menu-bu…
Browse files Browse the repository at this point in the history
…tton-icon-bug

Bugfix/1663 dropdown menu button icon bug
  • Loading branch information
AlekseyManetov authored Oct 6, 2023
2 parents 2b87557 + cb93d52 commit 417c4f6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* [DataTable]: added pinned rows functionality.

**What's Fixed**
* [DropdownMenuButton]: Fix bug in `DropdownMenuButton` where `isDisabled` prop was not being passed to it's child `IconButton`.
* [PickerItem]: fixed 'cx' prop
* [Contexts]: fixed context initialization for react 18 with strict mode
* [ModalWindow]: changed role attribute value from 'modal' to 'dialog'
Expand Down
1 change: 1 addition & 0 deletions uui/components/overlays/DropdownMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export const DropdownMenuButton = React.forwardRef<any, IDropdownMenuItemProps>(
icon={ icon }
color={ isActive ? 'info' : 'default' }
onClick={ onIconClick }
isDisabled={ isDisabled }
cx={ cx(css.icon, iconPosition === 'right' ? css.iconAfter : css.iconBefore) }
/>
);
Expand Down

0 comments on commit 417c4f6

Please sign in to comment.