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

Jump to bottom

feat(button): add selected state to icon only ghost button #7784

Merged
merged 3 commits into from
Feb 23, 2021
Merged

feat(button): add selected state to icon only ghost button #7784

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95bc251
feat(button): add selected state to icon only ghost button
tw15egan Feb 11, 2021
cdec94c
Merge branch 'master' into selected-button
tw15egan Feb 22, 2021
7cdc072
Merge branch 'master' into selected-button
kodiakhq[bot] Feb 23, 2021
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: 4 additions & 0 deletions packages/components/src/components/button/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@
}
}

.#{$prefix}--btn--icon-only.#{$prefix}--btn--selected {
background: $selected-ui;
}

.#{$prefix}--btn path[data-icon-path='inner-path'] {
fill: none;
}
Expand Down
3 changes: 3 additions & 0 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ Map {
"type": "string",
},
"iconDescription": [Function],
"isSelected": Object {
"type": "bool",
},
"kind": Object {
"args": Array [
Array [
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/Button/Button-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const props = {
className: 'some-class',
kind: select('Button kind (kind)', kinds, 'primary'),
disabled: boolean('Disabled (disabled)', false),
isSelected: boolean('Selected (isSelected)', false),
size: select('Button size (size)', sizes, 'default'),
renderIcon: !iconToUse || iconToUse.svgData ? undefined : iconToUse,
iconDescription: text(
Expand Down
7 changes: 7 additions & 0 deletions packages/react/src/components/Button/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const Button = React.forwardRef(function Button(
size,
kind,
href,
isSelected,
tabIndex,
type,
renderIcon: ButtonImageElement,
Expand All @@ -43,6 +44,7 @@ const Button = React.forwardRef(function Button(
[`${prefix}--btn--${kind}`]: kind,
[`${prefix}--btn--disabled`]: disabled,
[`${prefix}--btn--icon-only`]: hasIconOnly,
[`${prefix}--btn--selected`]: hasIconOnly && isSelected && kind === 'ghost',
[`${prefix}--tooltip__trigger`]: hasIconOnly,
[`${prefix}--tooltip--a11y`]: hasIconOnly,
[`${prefix}--tooltip--${tooltipPosition}`]: hasIconOnly && tooltipPosition,
Expand Down Expand Up @@ -148,6 +150,11 @@ Button.propTypes = {
return undefined;
},

/**
* Specify whether the Button is currently selected
*/
isSelected: PropTypes.bool,

/**
* Specify the kind of Button you want to create
*/
Expand Down