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

Update dropdown-menu and button to allow text buttons #26425

Merged
merged 2 commits into from
Oct 30, 2020
Merged

Update dropdown-menu and button to allow text buttons #26425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb98a96
Add text prop for button and dropdownmenu
mkaz Oct 23, 2020
9cb4ebf
Update text rendering for both icon & text
mkaz Oct 23, 2020
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
2 changes: 2 additions & 0 deletions packages/components/src/button/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export function Button( props, ref ) {
shortcut,
label,
children,
text,
__experimentalIsFocusable: isFocusable,
...additionalProps
} = props;
Expand Down Expand Up @@ -111,6 +112,7 @@ export function Button( props, ref ) {
ref={ ref }
>
{ icon && <Icon icon={ icon } size={ iconSize } /> }
{ text && <>{ text }</> }
{ children }
</Tag>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/dropdown-menu/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ function DropdownMenu( {
toggleProps,
menuProps,
disableOpenOnArrowDown = false,
text,
// The following props exist for backward compatibility.
menuLabel,
position,
Expand Down Expand Up @@ -129,6 +130,7 @@ function DropdownMenu( {
aria-haspopup="true"
aria-expanded={ isOpen }
label={ label }
text={ text }
showTooltip={ toggleProps?.showTooltip ?? true }
>
{ mergedToggleProps.children }
Expand Down