Skip to content

Commit ff4d3d4

Browse files
rise-erpeldingrise-erpelding
committed
feat(taggroup): spectrum 2 migration
1 parent f20e1e7 commit ff4d3d4

File tree

6 files changed

+459
-96
lines changed

6 files changed

+459
-96
lines changed

‎.changeset/public-facts-boil.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
"@spectrum-css/taggroup": major
3+
---
4+
5+
The Spectrum 2 version of Tag Group is a major change from its Spectrum 1 counterpart.
6+
7+
Major style changes include:
8+
9+
- Use of new tokens and custom properties for spacing tags. The method of spacing between tags has changed. Where previously tags were spaced using tokens to represent inline and block margins on each tag, tags are now spaced by tokens representing the gaps between tags.
10+
- Rather than being a single size, Tag group now comes in t-shirt sizes: Small, medium, and large. These sizes should determine the sizes of the embedded components, but also the spacing between tags.
11+
- Tag group can now accommodate a side label. To do so, it makes use of a grid layout.
12+
- In order to match the layout in the spec, more embedded components besides Tag have been added. Field label, Help text, and Action button (quiet) components have been added to the Storybook implementation, and styles are set for these embedded components within the tag group layout.
13+
14+
In order to support the aforementioned spacing changes, the two mod properties for margin have been removed:
15+
16+
- `--mod-tag-group-item-margin-block`
17+
- `--mod-tag-group-item-margin-inline`
18+
19+
Instead, please customize spacing between tags with:
20+
21+
- `--mod-tag-group-block-tag-spacing`
22+
- `--mod-tag-group-inline-tag-spacing`
23+
24+
These custom properties may need to be set to be double the previous margin values in order to achieve the same spacing.
25+
26+
To support custom spacing of the embedded components, several other new mod properties have been added:
27+
28+
- `--mod-tag-group-block-spacing-label-to-tags`
29+
- `--mod-tag-group-inline-spacing-label-to-tags`
30+
- `--mod-tag-group-spacing-help-text-to-tags`

‎components/taggroup/dist/metadata.json‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,39 @@
11
{
22
"sourceFile": "index.css",
3-
"selectors": [".spectrum-TagGroup", ".spectrum-TagGroup-item"],
3+
"selectors": [
4+
".spectrum-TagGroup",
5+
".spectrum-TagGroup--sideLabel",
6+
".spectrum-TagGroup--sideLabel .spectrum-TagGroup-actionButton",
7+
".spectrum-TagGroup--sideLabel .spectrum-TagGroup-helpText",
8+
".spectrum-TagGroup--sideLabel .spectrum-TagGroup-label",
9+
".spectrum-TagGroup--sideLabel .spectrum-TagGroup-tags",
10+
".spectrum-TagGroup--sizeL",
11+
".spectrum-TagGroup--sizeS",
12+
".spectrum-TagGroup-actionButton",
13+
".spectrum-TagGroup-helpText",
14+
".spectrum-TagGroup-label",
15+
".spectrum-TagGroup-tags"
16+
],
417
"modifiers": [
5-
"--mod-tag-group-item-margin-block",
6-
"--mod-tag-group-item-margin-inline"
18+
"--mod-tag-group-block-spacing-label-to-tags",
19+
"--mod-tag-group-block-tag-spacing",
20+
"--mod-tag-group-inline-spacing-label-to-tags",
21+
"--mod-tag-group-inline-tag-spacing",
22+
"--mod-tag-group-spacing-help-text-to-tags"
723
],
824
"component": [
9-
"--spectrum-tag-group-item-margin-block",
10-
"--spectrum-tag-group-item-margin-inline"
25+
"--spectrum-tag-group-block-spacing-label-to-tags",
26+
"--spectrum-tag-group-block-tag-spacing",
27+
"--spectrum-tag-group-inline-spacing-label-to-tags",
28+
"--spectrum-tag-group-inline-tag-spacing",
29+
"--spectrum-tag-group-spacing-help-text-to-tags"
30+
],
31+
"global": [
32+
"--spectrum-field-label-to-component",
33+
"--spectrum-help-text-to-component",
34+
"--spectrum-spacing-100",
35+
"--spectrum-spacing-200"
1136
],
12-
"global": ["--spectrum-spacing-75"],
1337
"passthroughs": [],
1438
"high-contrast": []
1539
}

‎components/taggroup/index.css‎

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Copyright 2024 Adobe. All rights reserved.
2+
* Copyright 2025 Adobe. All rights reserved.
33
*
44
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License. You may obtain a copy
@@ -12,17 +12,71 @@
1212
*/
1313

1414
.spectrum-TagGroup {
15-
--spectrum-tag-group-item-margin-block: var(--spectrum-spacing-75);
16-
--spectrum-tag-group-item-margin-inline: var(--spectrum-spacing-75);
15+
--spectrum-tag-group-inline-tag-spacing: var(--spectrum-spacing-200);
16+
--spectrum-tag-group-block-tag-spacing: var(--spectrum-spacing-200);
17+
--spectrum-tag-group-block-spacing-label-to-tags: var(--spectrum-field-label-to-component);
18+
--spectrum-tag-group-inline-spacing-label-to-tags: var(--spectrum-spacing-200);
19+
--spectrum-tag-group-spacing-help-text-to-tags: var(--spectrum-help-text-to-component);
20+
}
21+
22+
.spectrum-TagGroup--sizeS {
23+
--spectrum-tag-group-inline-tag-spacing: var(--spectrum-spacing-100);
24+
--spectrum-tag-group-block-tag-spacing: var(--spectrum-spacing-100);
25+
}
26+
27+
.spectrum-TagGroup--sizeL {
28+
--spectrum-tag-group-inline-tag-spacing: var(--spectrum-spacing-200);
29+
--spectrum-tag-group-block-tag-spacing: var(--spectrum-spacing-200);
30+
}
1731

32+
.spectrum-TagGroup {
33+
display: grid;
34+
grid-template-rows: auto auto auto auto;
35+
}
36+
37+
.spectrum-TagGroup-tags {
1838
display: inline-flex;
1939
flex-wrap: wrap;
20-
margin: 0;
21-
padding: 0;
22-
list-style: none;
40+
column-gap: var(--mod-tag-group-inline-tag-spacing, var(--spectrum-tag-group-inline-tag-spacing));
41+
row-gap: var(--mod-tag-group-block-tag-spacing, var(--spectrum-tag-group-block-tag-spacing));
42+
margin-block-end: var(--mod-tag-group-block-tag-spacing, var(--spectrum-tag-group-block-tag-spacing));
43+
}
44+
45+
.spectrum-TagGroup-label {
46+
margin-block-end: var(--mod-tag-group-block-spacing-label-to-tags, var(--spectrum-tag-group-block-spacing-label-to-tags));
47+
}
48+
49+
.spectrum-TagGroup-actionButton {
50+
justify-self: start;
51+
}
52+
53+
.spectrum-TagGroup-helpText {
54+
margin-block-start: var(--mod-tag-group-spacing-help-text-to-tags, var(--spectrum-tag-group-spacing-help-text-to-tags));
2355
}
2456

25-
.spectrum-TagGroup-item {
26-
margin-block: var(--mod-tag-group-item-margin-block, var(--spectrum-tag-group-item-margin-block));
27-
margin-inline: var(--mod-tag-group-item-margin-inline, var(--spectrum-tag-group-item-margin-inline));
57+
.spectrum-TagGroup--sideLabel {
58+
grid-template-columns: auto auto;
59+
grid-template-rows: auto auto auto;
60+
61+
.spectrum-TagGroup-label {
62+
grid-row: 1;
63+
grid-column: 1;
64+
margin-block-end: 0;
65+
margin-inline-end: var(--mod-tag-group-inline-spacing-label-to-tags, var(--spectrum-tag-group-inline-spacing-label-to-tags));
66+
}
67+
68+
.spectrum-TagGroup-tags {
69+
grid-row: 1;
70+
grid-column: 2;
71+
}
72+
73+
.spectrum-TagGroup-actionButton {
74+
grid-row: 2;
75+
grid-column: 2;
76+
}
77+
78+
.spectrum-TagGroup-helpText {
79+
grid-row: 3;
80+
grid-column: 2;
81+
}
2882
}

0 commit comments

Comments
 (0)