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

fix(Tag): ignore click events when disabled #4792

Merged
merged 9 commits into from
Jan 10, 2020
Merged

fix(Tag): ignore click events when disabled #4792

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
07e5eca
fix(Tag): ignore click events when disabled
emyarod Nov 28, 2019
4087a0d
test(Tag): remove warning
emyarod Nov 28, 2019
be298ed
fix(tag): move aria-label to button
emyarod Dec 3, 2019
07ffacc
fix: add ellipses when width is constrained
emyarod Jan 6, 2020
15da694
docs: fix example markup
emyarod Jan 8, 2020
b105841
fix(tag): reintroduce padding due to recent markup change
emyarod Jan 8, 2020
4bd3639
fix(Tag): remove unneeded click handler logic
emyarod Jan 8, 2020
371ee11
fix(tag): use disabled token
emyarod Jan 8, 2020
60b4537
Merge branch 'master' into 4791-filter-tag-onclick-firing-when-disabled
joshblack Jan 10, 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
36 changes: 24 additions & 12 deletions packages/components/src/components/tag/_tag.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@
@include tag-theme($ibm-color__warm-gray-20, $ibm-color__warm-gray-100);
}

.#{$prefix}--tag--disabled {
.#{$prefix}--tag--disabled,
.#{$prefix}--tag--filter.#{$prefix}--tag--disabled {
@include tag-theme($ibm-color__gray-10, $ibm-color__gray-30);

&:hover {
Expand All @@ -97,31 +98,42 @@

cursor: pointer;
padding-right: rem(2px);

&:focus,
&:hover {
outline: none;
}
}

.#{$prefix}--tag--filter > svg {
fill: $inverse-01;
margin-left: rem(4px);
padding: rem(2px);
flex-shrink: 0;
width: rem(20px);
height: rem(20px);
}

.#{$prefix}--tag--filter > svg:hover {
margin: 0 0 0 rem(4px);
padding: rem(2px);
border: 0;
fill: $inverse-01;
background-color: transparent;
border-radius: 50%;
background-color: $inverse-hover-ui;
}

.#{$prefix}--tag--filter:focus,
.#{$prefix}--tag--filter:hover {
outline: none;
&:hover {
background-color: $inverse-hover-ui;
}
}

.#{$prefix}--tag--filter:focus > svg {
box-shadow: inset 0 0 0 2px $inverse-focus-ui;
border-radius: 50%;
}

.#{$prefix}--tag--filter.#{$prefix}--tag--disabled svg:hover {
background-color: transparent;
}

.#{$prefix}--tag--filter.#{$prefix}--tag--disabled svg {
fill: $disabled-02;
}

// Skeleton state
.#{$prefix}--tag.#{$prefix}--skeleton {
@include skeleton;
Expand Down
14 changes: 7 additions & 7 deletions packages/components/src/components/tag/tag.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
LICENSE file in the root directory of this source tree.
-->

<div role="list">
<div>
{{#each tags}}
<span class="{{@root.prefix}}--tag {{@root.prefix}}--tag--{{type}}" role="listitem">
<button class="{{@root.prefix}}--tag {{@root.prefix}}--tag--{{type}}">
<span class="{{@root.prefix}}--tag__label">{{label}}</span>
</span>
</button>
{{/each}}
</div>

<div role="list">
<div>
{{#if filter}}
<span class="{{@root.prefix}}--tag {{@root.prefix}}--tag--filter" title="Clear filter" tabindex="0" role="listitem">
<button class="{{@root.prefix}}--tag {{@root.prefix}}--tag--filter" title="Clear filter">
<span class="{{@root.prefix}}--tag__label">filter</span>
{{ carbon-icon 'Close16' aria-label='Clear filter' }}
</span>
{{ carbon-icon 'Close16' }}
</button>
{{/if}}
</div>
8 changes: 4 additions & 4 deletions packages/react/src/components/Tag/Tag-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ describe('Tag', () => {

describe('Renders as expected', () => {
it('should render with the appropriate type', () => {
const tag = shallow(<Tag type="beta" />);
const tag = shallow(<Tag type="red" />);
expect(tag.hasClass(`${prefix}--tag`)).toEqual(true);
expect(tag.hasClass(`${prefix}--tag--beta`)).toEqual(true);
expect(tag.hasClass(`${prefix}--tag--red`)).toEqual(true);
});
});

it('should allow for a custom label', () => {
const tag = shallow(<Tag type="beta">New Version!</Tag>);
const tag = shallow(<Tag type="red">New Version!</Tag>);
expect(tag.text()).toEqual('New Version!');
});

it('should support extra class names', () => {
const tag = shallow(<Tag type="beta" className="extra-class" />);
const tag = shallow(<Tag type="red" className="extra-class" />);
expect(tag.hasClass('extra-class')).toEqual(true);
});
});
Expand Down
5 changes: 4 additions & 1 deletion packages/react/src/components/Tag/Tag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@ const Tag = ({
? `${title} ${children}`
: `Clear filter ${children}`
}
disabled={disabled}
{...other}>
{children !== null && children !== undefined ? children : TYPES[type]}
<span className={`${prefix}--tag__label`}>
{children !== null && children !== undefined ? children : TYPES[type]}
</span>
<Close16 />
</button>
) : (
Expand Down