Skip to content

RSP-1129: Tag and TagGroup component #10

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

Merged
devongovett merged 13 commits into from
Oct 29, 2019
Merged

RSP-1129: Tag and TagGroup component #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e9eabff
RSP-1129: Tag and TagGroup component
Oct 18, 2019
28c8a7c
addressing css comments
Oct 18, 2019
e0afae4
one with improved accessibility, without announcing
Oct 21, 2019
352e469
implemented selected Tag state
Oct 21, 2019
9dcc7ca
one with stories for selected tag and css for more cases
Oct 22, 2019
6fbc48f
One with announcing
Oct 23, 2019
1b0748d
Use aria-live and removed TODO's
Oct 24, 2019
61e9d52
isReadOnly flag + tests
Oct 24, 2019
0c5e1a4
more tests
Oct 24, 2019
94c463d
added dna variables into css file and addressed code review comments
Oct 29, 2019
a64b1e0
Merge branch 'master' of github.com:adobe/react-spectrum-v3 into RSP-…
Oct 29, 2019
ad98d7e
revert spectrum-css-temp/vars files
Oct 29, 2019
2800457
pasting vars from dna pr
Oct 29, 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
30 changes: 14 additions & 16 deletions packages/@adobe/spectrum-css-temp/components/tags/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ governing permissions and limitations under the License.
}

.spectrum-Tags-item {
float: left;
float: inline-start;
display: inline-flex;
align-items: center;
box-sizing: border-box;

margin: calc(var(--spectrum-taggroup-tag-gap-y) / 2) calc(var(--spectrum-taggroup-tag-gap-x) / 2);
padding: 0 calc(var(--spectrum-tag-padding-x) - var(--spectrum-tag-border-size));
height: var(--spectrum-tag-height);
max-width: 100%;
block-size: var(--spectrum-tag-height);
max-inline-size: 100%;

border-width: var(--spectrum-tag-border-size);
border-style: solid;
Expand All @@ -59,25 +59,23 @@ governing permissions and limitations under the License.
pointer-events: none;
}

> .spectrum-Icon,
> .spectrum-Avatar {
margin-right: var(--spectrum-tag-icon-padding-x);

/* Add padding for "avatar" variant */
margin-left: calc(var(--spectrum-tag-avatar-padding-x) - var(--spectrum-tag-padding-x));

~ .spectrum-Tags-itemLabel {
margin-right: calc(var(--spectrum-tag-avatar-padding-x) - var(--spectrum-tag-padding-x));
}
> .spectrum-Tags-itemIcon {
margin-inline-end: var(--spectrum-tag-icon-padding-x);
margin-inline-start: calc(-1 * var(--spectrum-tag-deletable-border-size-key-focus));
}

.spectrum-ClearButton {
margin-right: calc(-1 * var(--spectrum-tag-padding-x));
.spectrum-Tags-itemClearButton {
display: flex;
margin-inline-end: calc(-0.5 * var(--spectrum-tag-padding-x));
margin-inline-start: var(--spectrum-tag-deletable-border-size-key-focus);
block-size: var(--spectrum-alias-font-size-default);
inline-size: var(--spectrum-alias-font-size-default);
border-radius: var(--spectrum-alias-border-radius-small);
}
}

.spectrum-Tags-itemLabel {
height: 100%;
block-size: 100%;
line-height: calc(var(--spectrum-tag-height) - calc(var(--spectrum-tag-border-size) * 2));
flex: 1 1 auto;
font-size: var(--spectrum-tag-text-size);
Expand Down
136 changes: 78 additions & 58 deletions packages/@adobe/spectrum-css-temp/components/tags/skin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,57 +15,68 @@ governing permissions and limitations under the License.
background-color: var(--spectrum-tag-background-color);
border-color: var(--spectrum-tag-border-color);

.spectrum-ClearButton {
color: var(--spectrum-tag-deletable-icon-color);
}

&:hover {
background-color: var(--spectrum-tag-background-color-hover);
color: var(--spectrum-tag-text-color-hover);
border-color: var(--spectrum-tag-border-color-hover);

.spectrum-ClearButton {
color: var(--spectrum-tag-deletable-icon-color-hover);
}
}

&:focus-ring {
&.focus-ring {
background-color: var(--spectrum-tag-background-color-key-focus);
color: var(--spectrum-tag-text-color-key-focus);
border-color: var(--spectrum-tag-border-color-key-focus);
box-shadow: 0 0 0 1px var(--spectrum-tag-border-color-key-focus);
}

.spectrum-ClearButton {
color: var(--spectrum-tag-deletable-icon-color-key-focus);
&.is-selected {
background-color: var(--spectrum-tag-background-color-selected);
color: var(--spectrum-tag-text-color-selected);
border-color: var(--spectrum-tag-border-color-selected);
&:hover {
background-color: var(--spectrum-tag-background-color-selected-hover);
}

&.focus-ring {
box-shadow: 0 0 0 2px var(--spectrum-tag-border-color-selected-key-focus);
border-color: var(--spectrum-tag-text-color-selected-key-focus);
}
&.is-invalid {
border-color: var(--spectrum-tag-border-color-error-selected);
.spectrum-Tags-itemIcon,
.spectrum-Tags-itemLabel,
.spectrum-Tags-itemClearButton {
color: var(--spectrum-tag-text-color-error-selected);
}
&.focus-ring {
box-shadow: 0 0 0 2px var(--spectrum-tag-border-color-key-focus);
border-color: var(--spectrum-tag-border-color-error-selected);
}
&:hover {
border-color: var(--spectrum-tag-border-color-selected);
}
}
}

&.is-invalid {
color: var(--spectrum-tag-text-color-error);
color: var(--spectrum-tag-icon-color-error);
border-color: var(--spectrum-tag-border-color-error);

.spectrum-ClearButton {
color: var(--spectrum-tag-icon-color-error);
}

&:hover {
color: var(--spectrum-tag-text-color-error-hover);
color: var(--spectrum-tag-icon-color-error-hover);
border-color: var(--spectrum-tag-border-color-error-hover);

.spectrum-ClearButton {
color: var(--spectrum-tag-icon-color-error-hover);
}
}

&:focus-ring {
color: var(--spectrum-tag-text-color-error-key-focus);
&.focus-ring {
color: var(--spectrum-tag-icon-color-error-hover);
border-color: var(--spectrum-tag-border-color-key-focus);
box-shadow: 0 0 0 1px var(--spectrum-tag-border-color-key-focus);
}

.spectrum-ClearButton {
color: var(--spectrum-tag-icon-color-error-key-focus);
}
.spectrum-Tags-itemIcon,
.spectrum-Tags-itemClearButton {
color: var(--spectrum-tag-border-color-error);
}

}

&.is-disabled {
Expand All @@ -80,58 +91,67 @@ governing permissions and limitations under the License.
}
}

.spectrum-Tags-item--deletable {
.spectrum-Tags-item--removable {
&:hover {
color: var(--spectrum-tag-deletable-text-color-hover);

.spectrum-ClearButton {
color: var(--spectrum-tag-deletable-icon-color-hover);
}
color: var(--spectrum-tag-removable-text-color-hover);
}

&:active {
color: var(--spectrum-tag-deletable-text-color-down);

.spectrum-ClearButton {
color: var(--spectrum-tag-deletable-icon-color-down);
}
color: var(--spectrum-tag-removable-text-color-down);
}

&.is-invalid {
&:hover {
border-color: var(--spectrum-tag-deletable-border-color-error-hover);
color: var(--spectrum-tag-deletable-text-color-error-hover);

.spectrum-ClearButton {
color: var(--spectrum-tag-deletable-icon-color-error-hover);
border-color: var(--spectrum-tag-removable-border-color-error-hover);
.spectrum-Tags-itemClearButton {
color: var(--spectrum-tag-removable-border-color-error-hover);
}
}

&:active {
border-color: var(--spectrum-tag-deletable-border-color-error-down);
color: var(--spectrum-tag-deletable-text-color-error-down);
.spectrum-Tags-itemClearButton {
&.is-focused {
color: var(--spectrum-tag-icon-color-error-hover);
}
}

.spectrum-ClearButton {
color: var(--spectrum-tag-deletable-icon-color-error-down);
}
&:active {
border-color: var(--spectrum-tag-removable-border-color-error-down);
color: var(--spectrum-tag-removable-text-color-error-down);
}
}

&:focus-ring {
color: var(--spectrum-tag-deletable-text-color-key-focus);
&.is-focused {
color: var(--spectrum-tag-removable-text-color-key-focus);

.spectrum-ClearButton {
color: var(--spectrum-tag-deletable-icon-color-key-focus);
&.is-invalid {
color: var(--spectrum-tag-removable-text-color-error-key-focus);
}
}

&.is-invalid {
color: var(--spectrum-tag-deletable-text-color-error-key-focus);
&.is-selected {
color: var(--spectrum-tag-removable-text-color-selected);
&.is-focused {
color: var(--spectrum-tag-removable-text-color-selected-key-focus);
}
.spectrum-Tags-itemClearButton {
color: var(--spectrum-tag-removable-button-icon-color-selected);
&:hover {
background-color: var(--spectrum-tag-removable-button-background-color-selected-hover);
color: var(--spectrum-tag-removable-button-icon-color-selected-hover);
}
}
}
}

.spectrum-Tags-item.is-disabled .spectrum-ClearButton {
.spectrum-Icon {
color: var(--spectrum-tag-icon-color-disabled);
.spectrum-Tags-itemClearButton {
&.is-focused {
border: 2px solid var(--spectrum-tag-removable-border-color-key-focus);
border-radius: var(--spectrum-alias-border-radius-regular);
background-color: var(--spectrum-tag-removable-button-background-color-key-focus);
color: var(--spectrum-tag-removable-button-icon-color-key-focus);
}
&:hover {
background-color: var(--spectrum-tag-removable-button-background-color-hover);
color: var(--spectrum-tag-removable-button-icon-color-hover);
}
}
}
104 changes: 104 additions & 0 deletions packages/@adobe/spectrum-css-temp/vars/spectrum-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2305,6 +2305,18 @@
--spectrum-tag-border-color-disabled: rgb(62, 62, 62);
--spectrum-tag-text-color-disabled: rgb(110, 110, 110);
--spectrum-tag-icon-color-disabled: rgb(110, 110, 110);
--spectrum-tag-background-color-selected: rgb(185, 185, 185);
--spectrum-tag-border-color-selected: transparent;
--spectrum-tag-text-color-selected: rgb(37, 37, 37);
--spectrum-tag-icon-color-selected: rgb(37, 37, 37);
--spectrum-tag-background-color-selected-hover: rgb(227, 227, 227);
--spectrum-tag-border-color-selected-hover: transparent;
--spectrum-tag-text-color-selected-hover: rgb(37, 37, 37);
--spectrum-tag-icon-color-selected-hover: rgb(37, 37, 37);
--spectrum-tag-background-color-selected-key-focus: rgb(227, 227, 227);
--spectrum-tag-border-color-selected-key-focus: rgb(38, 128, 235);
--spectrum-tag-text-color-selected-key-focus: rgb(37, 37, 37);
--spectrum-tag-icon-color-selected-key-focus: rgb(37, 37, 37);
--spectrum-tag-border-color-error: rgb(236, 91, 98);
--spectrum-tag-icon-color-error: rgb(236, 91, 98);
--spectrum-tag-text-color-error: rgb(185, 185, 185);
Expand All @@ -2317,6 +2329,14 @@
--spectrum-tag-border-color-error-down: rgb(255, 123, 130);
--spectrum-tag-icon-color-error-down: rgb(255, 123, 130);
--spectrum-tag-text-color-error-down: rgb(255, 255, 255);
--spectrum-tag-background-color-error-disabled: rgb(62, 62, 62);
--spectrum-tag-border-color-error-disabled: rgb(62, 62, 62);
--spectrum-tag-text-color-error-disabled: rgb(110, 110, 110);
--spectrum-tag-icon-color-error-disabled: rgb(110, 110, 110);
--spectrum-tag-background-color-error-selected: rgb(185, 185, 185);
--spectrum-tag-border-color-error-selected: transparent;
--spectrum-tag-icon-color-error-selected: rgb(37, 37, 37);
--spectrum-tag-text-color-error-selected: rgb(37, 37, 37);
--spectrum-tag-deletable-background-color: rgb(47, 47, 47);
--spectrum-tag-deletable-border-color: rgb(144, 144, 144);
--spectrum-tag-deletable-text-color: rgb(185, 185, 185);
Expand All @@ -2337,6 +2357,18 @@
--spectrum-tag-deletable-border-color-disabled: rgb(62, 62, 62);
--spectrum-tag-deletable-text-color-disabled: rgb(110, 110, 110);
--spectrum-tag-deletable-icon-color-disabled: rgb(110, 110, 110);
--spectrum-tag-deletable-background-color-selected: rgb(185, 185, 185);
--spectrum-tag-deletable-border-color-selected: transparent;
--spectrum-tag-deletable-text-color-selected: rgb(37, 37, 37);
--spectrum-tag-deletable-icon-color-selected: rgb(37, 37, 37);
--spectrum-tag-deletable-background-color-selected-hover: rgb(227, 227, 227);
--spectrum-tag-deletable-border-color-selected-hover: transparent;
--spectrum-tag-deletable-text-color-selected-hover: rgb(37, 37, 37);
--spectrum-tag-deletable-icon-color-selected-hover: rgb(37, 37, 37);
--spectrum-tag-deletable-background-color-selected-key-focus: rgb(227, 227, 227);
--spectrum-tag-deletable-border-color-selected-key-focus: rgb(38, 128, 235);
--spectrum-tag-deletable-text-color-selected-key-focus: rgb(37, 37, 37);
--spectrum-tag-deletable-icon-color-selected-key-focus: rgb(37, 37, 37);
--spectrum-tag-deletable-border-color-error: rgb(236, 91, 98);
--spectrum-tag-deletable-icon-color-error: rgb(236, 91, 98);
--spectrum-tag-deletable-text-color-error: rgb(185, 185, 185);
Expand All @@ -2349,6 +2381,78 @@
--spectrum-tag-deletable-border-color-error-down: rgb(255, 123, 130);
--spectrum-tag-deletable-icon-color-error-down: rgb(255, 123, 130);
--spectrum-tag-deletable-text-color-error-down: rgb(185, 185, 185);
--spectrum-tag-deletable-background-color-error-disabled: rgb(62, 62, 62);
--spectrum-tag-deletable-border-color-error-disabled: rgb(62, 62, 62);
--spectrum-tag-deletable-text-color-error-disabled: rgb(110, 110, 110);
--spectrum-tag-deletable-icon-color-error-disabled: rgb(110, 110, 110);
--spectrum-tag-deletable-background-color-error-selected: rgb(185, 185, 185);
--spectrum-tag-deletable-border-color-error-selected: transparent;
--spectrum-tag-deletable-icon-color-error-selected: rgb(37, 37, 37);
--spectrum-tag-deletable-text-color-error-selected: rgb(37, 37, 37);
--spectrum-tag-removable-background-color: rgb(47, 47, 47);
--spectrum-tag-removable-border-color: rgb(144, 144, 144);
--spectrum-tag-removable-text-color: rgb(185, 185, 185);
--spectrum-tag-removable-icon-color: rgb(144, 144, 144);
--spectrum-tag-removable-background-color-hover: rgb(47, 47, 47);
--spectrum-tag-removable-border-color-hover: rgb(255, 255, 255);
--spectrum-tag-removable-text-color-hover: rgb(255, 255, 255);
--spectrum-tag-removable-icon-color-hover: rgb(255, 255, 255);
--spectrum-tag-removable-button-background-color-hover: rgb(74, 74, 74);
--spectrum-tag-removable-button-icon-color-hover: rgb(255, 255, 255);
--spectrum-tag-removable-background-color-down: rgb(47, 47, 47);
--spectrum-tag-removable-border-color-down: rgb(255, 255, 255);
--spectrum-tag-removable-text-color-down: rgb(185, 185, 185);
--spectrum-tag-removable-icon-color-down: rgb(255, 255, 255);
--spectrum-tag-removable-background-color-key-focus: rgb(47, 47, 47);
--spectrum-tag-removable-border-color-key-focus: rgb(38, 128, 235);
--spectrum-tag-removable-text-color-key-focus: rgb(185, 185, 185);
--spectrum-tag-removable-icon-color-key-focus: rgb(255, 255, 255);
--spectrum-tag-removable-button-background-color-key-focus: rgb(74, 74, 74);
--spectrum-tag-removable-button-icon-color-key-focus: rgb(255, 255, 255);
--spectrum-tag-removable-background-color-disabled: rgb(62, 62, 62);
--spectrum-tag-removable-border-color-disabled: rgb(62, 62, 62);
--spectrum-tag-removable-text-color-disabled: rgb(110, 110, 110);
--spectrum-tag-removable-icon-color-disabled: rgb(110, 110, 110);
--spectrum-tag-removable-background-color-selected: rgb(185, 185, 185);
--spectrum-tag-removable-border-color-selected: transparent;
--spectrum-tag-removable-text-color-selected: rgb(37, 37, 37);
--spectrum-tag-removable-icon-color-selected: rgb(37, 37, 37);
--spectrum-tag-removable-button-icon-color-selected: rgb(37, 37, 37);
--spectrum-tag-removable-button-background-color-selected: transparent;
--spectrum-tag-removable-background-color-selected-hover: rgb(227, 227, 227);
--spectrum-tag-removable-border-color-selected-hover: transparent;
--spectrum-tag-removable-text-color-selected-hover: rgb(37, 37, 37);
--spectrum-tag-removable-icon-color-selected-hover: rgb(37, 37, 37);
--spectrum-tag-removable-button-icon-color-selected-hover: rgb(37, 37, 37);
--spectrum-tag-removable-button-background-color-selected-hover: rgb(144, 144, 144);
--spectrum-tag-removable-background-color-selected-key-focus: rgb(227, 227, 227);
--spectrum-tag-removable-border-color-selected-key-focus: rgb(38, 128, 235);
--spectrum-tag-removable-text-color-selected-key-focus: rgb(37, 37, 37);
--spectrum-tag-removable-icon-color-selected-key-focus: rgb(37, 37, 37);
--spectrum-tag-removable-button-icon-color-selected-key-focus: rgb(185, 185, 185);
--spectrum-tag-removable-button-background-color-selected-key-focus: rgb(37, 37, 37);
--spectrum-tag-removable-border-color-error: rgb(236, 91, 98);
--spectrum-tag-removable-icon-color-error: rgb(236, 91, 98);
--spectrum-tag-removable-text-color-error: rgb(185, 185, 185);
--spectrum-tag-removable-border-color-error-hover: rgb(247, 109, 116);
--spectrum-tag-removable-icon-color-error-hover: rgb(247, 109, 116);
--spectrum-tag-removable-text-color-error-hover: rgb(185, 185, 185);
--spectrum-tag-removable-background-color-error-hover: rgb(74, 74, 74);
--spectrum-tag-removable-icon-color-error-key-focus: rgb(247, 109, 116);
--spectrum-tag-removable-border-color-error-key-focus: rgb(38, 128, 235);
--spectrum-tag-removable-text-color-error-key-focus: rgb(185, 185, 185);
--spectrum-tag-removable-background-color-error-key-focus: rgb(74, 74, 74);
--spectrum-tag-removable-border-color-error-down: rgb(255, 123, 130);
--spectrum-tag-removable-icon-color-error-down: rgb(255, 123, 130);
--spectrum-tag-removable-text-color-error-down: rgb(185, 185, 185);
--spectrum-tag-removable-background-color-error-disabled: rgb(62, 62, 62);
--spectrum-tag-removable-border-color-error-disabled: rgb(62, 62, 62);
--spectrum-tag-removable-text-color-error-disabled: rgb(110, 110, 110);
--spectrum-tag-removable-icon-color-error-disabled: rgb(110, 110, 110);
--spectrum-tag-removable-background-color-error-selected: rgb(185, 185, 185);
--spectrum-tag-removable-border-color-error-selected: transparent;
--spectrum-tag-removable-icon-color-error-selected: rgb(37, 37, 37);
--spectrum-tag-removable-text-color-error-selected: rgb(37, 37, 37);
--spectrum-textfield-placeholder-text-color: rgb(144, 144, 144);
--spectrum-textfield-text-color: rgb(227, 227, 227);
--spectrum-textfield-background-color: rgb(37, 37, 37);
Expand Down
Loading