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): added new prop titleText to specify title on clear #4163

Merged
merged 8 commits into from
Oct 16, 2019
Merged

fix(Tag): added new prop titleText to specify title on clear #4163

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7479500
fix(Tag): added new prop titleText to specify title on clear
ankitious Oct 2, 2019
3f0f95d
Merge branch 'master' into ankitious_modal-titleText-prop
ankitious Oct 3, 2019
0b1e8fd
fix(Tag): changed titleText to title
ankitious Oct 3, 2019
5a7989b
Merge branch 'ankitious_modal-titleText-prop' of github.com:ankitious…
ankitious Oct 3, 2019
2cbeba5
Merge branch 'master' into ankitious_modal-titleText-prop
ankitious Oct 14, 2019
491df33
Merge branch 'master' into ankitious_modal-titleText-prop
joshblack Oct 16, 2019
8ef2889
chore(react): update code style to prefer logical OR
joshblack Oct 16, 2019
f0af3c0
Merge branch 'master' into ankitious_modal-titleText-prop
joshblack Oct 16, 2019
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
1 change: 1 addition & 0 deletions packages/react/src/components/Tag/Tag-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const props = {
),
disabled: boolean('Disabled (disabled)', false),
role: 'listitem',
title: 'Clear Selection',
}),
filter() {
return { ...this.regular(), onClick: action('onClick') };
Expand Down
19 changes: 16 additions & 3 deletions packages/react/src/components/Tag/Tag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,15 @@ const TYPES = {
'warm-gray': 'Warm-Gray',
};

const Tag = ({ children, className, type, filter, disabled, ...other }) => {
const Tag = ({
children,
className,
type,
filter,
title,
disabled,
...other
}) => {
const tagClass = `${prefix}--tag--${type}`;
const tagClasses = classNames(`${prefix}--tag`, tagClass, className, {
[`${prefix}--tag--disabled`]: disabled,
Expand All @@ -35,11 +43,11 @@ const Tag = ({ children, className, type, filter, disabled, ...other }) => {
return filter ? (
<span
className={tagClasses}
title="Clear filter"
title={title ? title : 'Clear filter'}
joshblack marked this conversation as resolved.
Show resolved Hide resolved
tabIndex="0" // eslint-disable-line jsx-a11y/no-noninteractive-tabindex
{...other}>
{children !== null && children !== undefined ? children : TYPES[type]}
<Close16 aria-label="Clear filter" />
<Close16 aria-label={title ? title : 'Clear filter'} />
</span>
) : (
<span className={tagClasses} {...other}>
Expand Down Expand Up @@ -73,6 +81,11 @@ Tag.propTypes = {
* Determine if <Tag> is a filter/chip
*/
filter: PropTypes.bool,

/**
* Text to show on clear filters
*/
title: PropTypes.string,
};

export const types = Object.keys(TYPES);
Expand Down