Skip to content

Commit f6c947a

Browse files
jawinncastastrophe
jawinn
authored and
castastrophe
committed
feat(button): migrate to Spectrum 2 (#2600)
* refactor(button): spectrum 2 styles and cleanup Spectrum 2 changes to CSS: - integrate themes css into main css - use s2 corner rounding - use s2 colors Cleanup items of note: - make medium size the default - consolidate and organize focus indicator styles. Some declarations were repeated. - Rename mod for font weight that was referencing a global token instead of a component specific name. - simplify repetitive disabled custom properties - removed some unused css; static variant declarations at the end of the file were being overridden by more specific styles - remove unused is-selected, emphasized, and quiet classes that are not used on this component - remove the spectrum-Button--fill class. it was already the default. * fix(button): high contrast - ensure matching color pairs for accent Ensures that a matching background and foreground color pair is used for the high contrast colors, for Accent hover, down, and focus. Changes the content color to HighlightText to ensure contrast when these have a background set to Highlight. * docs(button): update documentation and storybook for s2 - Some improvements and additions to the spectrum 2 release notes. - Updates migration guide notes to include version and dates for the previous notes. - Removes spectrum-Button--sizeM class from examples. Excludes the spectrum-Button--sizeM class in the storybook template. - Removes medium size class from storybook - Fixes default flex alignment stretching buttons vertically in Storybook to the tallest button. * fix(button): calculate corner rounding to support wrapping design Calculate corner rounding based on the component height, so that the rounding looks correct when there is wrapping text. Otherwise, when the button wraps, it has too much rounding as compared to the design when using the corner-radius-full token. * feat(button): outline option removals and use accent as the default Removes the outline option for the accent and negative variants, and makes sure that the accent variant is the default. == outline option removal == Per design feedback and updated design spec changelog, the outline treatment (style) is no longer supported for the Accent and Negative color variants: "Outline buttons are no longer available in accent and negative options — use the filled variant instead" This removes their CSS, lists the change in the migration notes, and disables the treatment control for the Accent and Negative stories. It also removes the outline example in the template for those two stories. == use accent as the default == Use accent styles for the default button when there is no variant class applied, to match the default defined on the guidelines. * fix(button): additional s2 style adjustments and organization - make usage of edge to visual values consistent - use full corner rounding on icon-only variant, which does not need to account for wrapping text - correct static white secondary outline background color, per PR review - chore: apply linter formatting * docs(button): custom mdx docs page Create an MDX "Docs" page that works as a replacement for the YML docs pages, and covers the important Button options from there and the guidelines. Adds the tag "is-hidden-story" for excluding Storybook sidebar items. * chore(button): add changeset * build(button): use beta version of commons dependency Since the commons version on main was updated to 10.0, the Button started building with the wrong version of commons when importing basebutton.css and listing mods that have been removed in the version of commons in the spectrum-two branch. * chore(button): clear up linter warnings Fixes warnings and errors from stylelint and eslint. * fix(button): correct focus indicator rounding and basebutton mod The focus indicator rounding needed an additional calc in order to have the correct rounding. While testing --mod-button-focus-ring-gap and some other mods, it was also noticed that a declaration being imported from basebutton was causing some of the mod names to be different and the mod to not work correctly (basebutton is generating a selector for the margin of .spectrum-Button:focus-visible::after).
1 parent 8e11da9 commit f6c947a

File tree

7 files changed

+484
-573
lines changed

7 files changed

+484
-573
lines changed

‎.changeset/nine-kings-repair.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
"@spectrum-css/button": major
3+
---
4+
5+
#### Spectrum 2 migration
6+
Button now uses Spectrum 2 tokens and specifications, which includes many color changes to all variants. A few other notable changes:
7+
- Outline buttons are no longer available in accent and negative options — use the filled variant instead.
8+
- Medium size is now the default. The class `.spectrum-Button--sizeM` is now unnecessary for this size, and has been removed.
9+
- The `.spectrum-Button--fill` class is no longer needed and has been removed.
10+
11+
The following `--mod` custom properties have been renamed:
12+
- `--mod-line-height-100` has been renamed to `--mod-button-line-height`
13+
- `--mod-sans-font-family-stack` has been renamed to `--mod-button-font-family`
14+
- `--mod-animation-duration-100` has been renamed to `--mod-button-animation-duration`
15+
- `--mod-bold-font-weight` has been renamed to `--mod-button-font-weight`

‎.storybook/assets/base.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ body {
3838
background-color: var(--spectrum-background-layer-1-color);
3939
}
4040

41+
.spectrum .spectrum-examples-static-black {
42+
background: var(--spectrum-examples-gradient-static-black);
43+
}
44+
45+
.spectrum .spectrum-examples-static-white {
46+
background: var(--spectrum-examples-gradient-static-white)
47+
}
48+
4149
/* Hide the SVG elements that only include references */
4250
svg:has(symbol):not(:has(use)) {
4351
display: none;

‎.storybook/manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ addons.setConfig({
6464
sidebar: {
6565
showRoots: false,
6666
filters: {
67-
patterns: (item) => !(item.id.includes('forced-colors') || item.tags.includes('foundation')),
67+
patterns: (item) => !item.id.includes('forced-colors') && ['foundation','is-hidden-story'].every((tag) => !item.tags.includes(tag)),
6868
}
6969
},
7070
});

‎components/button/index.css

Lines changed: 345 additions & 414 deletions
Large diffs are not rendered by default.

‎components/button/metadata/metadata.json

Lines changed: 31 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,47 +6,37 @@
66
".spectrum-Button .spectrum-Icon",
77
".spectrum-Button .spectrum-Icon + .spectrum-Button-label",
88
".spectrum-Button .spectrum-ProgressCircle",
9-
".spectrum-Button--noWrap .spectrum-Button-label",
109
".spectrum-Button--sizeL",
1110
".spectrum-Button--sizeS",
11+
".spectrum-Button--sizeS.spectrum-Button--iconOnly",
1212
".spectrum-Button--sizeXL",
1313
".spectrum-Button-label",
1414
".spectrum-Button-label:empty",
1515
".spectrum-Button.is-disabled",
16+
".spectrum-Button.is-focused",
1617
".spectrum-Button.is-focused:after",
1718
".spectrum-Button.is-pending",
1819
".spectrum-Button.is-pending .spectrum-Button-label",
1920
".spectrum-Button.is-pending .spectrum-Icon",
2021
".spectrum-Button.is-pending .spectrum-ProgressCircle",
21-
".spectrum-Button.is-selected",
22-
".spectrum-Button.is-selected.spectrum-Button--emphasized",
2322
".spectrum-Button.spectrum-Button--accent",
24-
".spectrum-Button.spectrum-Button--accent.spectrum-Button--fill",
25-
".spectrum-Button.spectrum-Button--accent.spectrum-Button--outline",
23+
".spectrum-Button.spectrum-Button--accent .spectrum-Button-label",
2624
".spectrum-Button.spectrum-Button--iconOnly",
2725
".spectrum-Button.spectrum-Button--iconOnly .spectrum-Icon",
28-
".spectrum-Button.spectrum-Button--iconOnly:after",
2926
".spectrum-Button.spectrum-Button--negative",
30-
".spectrum-Button.spectrum-Button--negative.spectrum-Button--outline",
3127
".spectrum-Button.spectrum-Button--outline",
3228
".spectrum-Button.spectrum-Button--primary",
3329
".spectrum-Button.spectrum-Button--primary.spectrum-Button--outline",
34-
".spectrum-Button.spectrum-Button--quiet",
3530
".spectrum-Button.spectrum-Button--secondary",
3631
".spectrum-Button.spectrum-Button--secondary.spectrum-Button--outline",
3732
".spectrum-Button.spectrum-Button--staticBlack",
38-
".spectrum-Button.spectrum-Button--staticBlack.is-selected",
3933
".spectrum-Button.spectrum-Button--staticBlack.spectrum-Button--outline",
40-
".spectrum-Button.spectrum-Button--staticBlack.spectrum-Button--quiet",
4134
".spectrum-Button.spectrum-Button--staticBlack.spectrum-Button--secondary",
42-
".spectrum-Button.spectrum-Button--staticBlack.spectrum-Button--secondary:not(.spectrum-Button--outline)",
35+
".spectrum-Button.spectrum-Button--staticBlack.spectrum-Button--secondary.spectrum-Button--outline",
4336
".spectrum-Button.spectrum-Button--staticWhite",
44-
".spectrum-Button.spectrum-Button--staticWhite.is-selected",
45-
".spectrum-Button.spectrum-Button--staticWhite.spectrum-Button--accent",
4637
".spectrum-Button.spectrum-Button--staticWhite.spectrum-Button--outline",
47-
".spectrum-Button.spectrum-Button--staticWhite.spectrum-Button--quiet",
4838
".spectrum-Button.spectrum-Button--staticWhite.spectrum-Button--secondary",
49-
".spectrum-Button.spectrum-Button--staticWhite.spectrum-Button--secondary:not(.spectrum-Button--outline)",
39+
".spectrum-Button.spectrum-Button--staticWhite.spectrum-Button--secondary.spectrum-Button--outline",
5040
".spectrum-Button::-moz-focus-inner",
5141
".spectrum-Button:active",
5242
".spectrum-Button:after",
@@ -55,14 +45,15 @@
5545
".spectrum-Button:focus-visible",
5646
".spectrum-Button:focus-visible:after",
5747
".spectrum-Button:hover",
48+
".spectrum-Button:not(.spectrum-Button--primary, .spectrum-Button--negative, .spectrum-Button--secondary, .spectrum-Button--staticBlack, .spectrum-Button--staticWhite)",
49+
".spectrum-Button:not(.spectrum-Button--primary, .spectrum-Button--negative, .spectrum-Button--secondary, .spectrum-Button--staticBlack, .spectrum-Button--staticWhite) .spectrum-Button-label",
5850
".spectrum-Button[pending]",
5951
".spectrum-Button[pending] .spectrum-Button-label",
6052
".spectrum-Button[pending] .spectrum-Icon",
6153
".spectrum-Button[pending] .spectrum-ProgressCircle",
6254
"a.spectrum-Button"
6355
],
6456
"modifiers": [
65-
"--mod-bold-font-weight",
6657
"--mod-button-animation-duration",
6758
"--mod-button-background-color-default",
6859
"--mod-button-background-color-disabled",
@@ -85,29 +76,25 @@
8576
"--mod-button-edge-to-text",
8677
"--mod-button-edge-to-visual",
8778
"--mod-button-edge-to-visual-only",
88-
"--mod-button-focus-indicator-gap",
8979
"--mod-button-focus-ring-border-radius",
9080
"--mod-button-focus-ring-color",
9181
"--mod-button-focus-ring-gap",
9282
"--mod-button-focus-ring-thickness",
9383
"--mod-button-font-family",
9484
"--mod-button-font-size",
85+
"--mod-button-font-weight",
9586
"--mod-button-height",
9687
"--mod-button-icon-margin-block-start",
9788
"--mod-button-line-height",
9889
"--mod-button-margin-block",
9990
"--mod-button-margin-left",
10091
"--mod-button-margin-right",
101-
"--mod-button-max-inline-size",
10292
"--mod-button-min-width",
10393
"--mod-button-padding-label-to-icon",
104-
"--mod-button-static-content-color",
10594
"--mod-button-text-align",
10695
"--mod-button-text-align-with-icon",
10796
"--mod-button-top-to-icon",
108-
"--mod-button-top-to-text",
109-
"--mod-focus-indicator-gap",
110-
"--mod-static-black-focus-indicator-color"
97+
"--mod-button-top-to-text"
11198
],
11299
"component": [
113100
"--spectrum-button-animation-duration",
@@ -140,21 +127,14 @@
140127
"--spectrum-button-focus-ring-gap",
141128
"--spectrum-button-focus-ring-thickness",
142129
"--spectrum-button-font-size",
130+
"--spectrum-button-font-weight",
143131
"--spectrum-button-height",
132+
"--spectrum-button-icon-size-difference",
144133
"--spectrum-button-intended-icon-size",
145134
"--spectrum-button-line-height",
146135
"--spectrum-button-min-width",
147136
"--spectrum-button-minimum-width-multiplier",
148137
"--spectrum-button-padding-label-to-icon",
149-
"--spectrum-button-sized-bottom-to-text",
150-
"--spectrum-button-sized-edge-to-text",
151-
"--spectrum-button-sized-edge-to-visual",
152-
"--spectrum-button-sized-edge-to-visual-only",
153-
"--spectrum-button-sized-font-size",
154-
"--spectrum-button-sized-height",
155-
"--spectrum-button-sized-padding-label-to-icon",
156-
"--spectrum-button-sized-top-to-icon",
157-
"--spectrum-button-sized-top-to-text",
158138
"--spectrum-button-top-to-icon",
159139
"--spectrum-button-top-to-text",
160140
"--spectrum-button-top-to-text-extra-large",
@@ -167,16 +147,8 @@
167147
"--spectrum-accent-background-color-down",
168148
"--spectrum-accent-background-color-hover",
169149
"--spectrum-accent-background-color-key-focus",
170-
"--spectrum-accent-color-1000",
171-
"--spectrum-accent-color-1100",
172-
"--spectrum-accent-color-200",
173-
"--spectrum-accent-color-300",
174-
"--spectrum-accent-color-900",
175-
"--spectrum-accent-content-color-default",
176-
"--spectrum-accent-content-color-down",
177-
"--spectrum-accent-content-color-hover",
178-
"--spectrum-accent-content-color-key-focus",
179150
"--spectrum-animation-duration-100",
151+
"--spectrum-black",
180152
"--spectrum-bold-font-weight",
181153
"--spectrum-border-width-200",
182154
"--spectrum-component-height-100",
@@ -202,6 +174,7 @@
202174
"--spectrum-component-top-to-workflow-icon-200",
203175
"--spectrum-component-top-to-workflow-icon-300",
204176
"--spectrum-component-top-to-workflow-icon-75",
177+
"--spectrum-corner-radius-full",
205178
"--spectrum-disabled-background-color",
206179
"--spectrum-disabled-border-color",
207180
"--spectrum-disabled-content-color",
@@ -221,10 +194,11 @@
221194
"--spectrum-font-size-200",
222195
"--spectrum-font-size-300",
223196
"--spectrum-font-size-75",
197+
"--spectrum-gray-100",
224198
"--spectrum-gray-200",
199+
"--spectrum-gray-25",
225200
"--spectrum-gray-300",
226201
"--spectrum-gray-400",
227-
"--spectrum-gray-500",
228202
"--spectrum-gray-800",
229203
"--spectrum-gray-900",
230204
"--spectrum-icon-block-size",
@@ -233,15 +207,6 @@
233207
"--spectrum-negative-background-color-down",
234208
"--spectrum-negative-background-color-hover",
235209
"--spectrum-negative-background-color-key-focus",
236-
"--spectrum-negative-color-1000",
237-
"--spectrum-negative-color-1100",
238-
"--spectrum-negative-color-200",
239-
"--spectrum-negative-color-300",
240-
"--spectrum-negative-color-900",
241-
"--spectrum-negative-content-color-default",
242-
"--spectrum-negative-content-color-down",
243-
"--spectrum-negative-content-color-hover",
244-
"--spectrum-negative-content-color-key-focus",
245210
"--spectrum-neutral-background-color-default",
246211
"--spectrum-neutral-background-color-down",
247212
"--spectrum-neutral-background-color-hover",
@@ -258,6 +223,20 @@
258223
"--spectrum-text-to-visual-200",
259224
"--spectrum-text-to-visual-300",
260225
"--spectrum-text-to-visual-75",
226+
"--spectrum-transparent-black-100",
227+
"--spectrum-transparent-black-200",
228+
"--spectrum-transparent-black-25",
229+
"--spectrum-transparent-black-300",
230+
"--spectrum-transparent-black-400",
231+
"--spectrum-transparent-black-800",
232+
"--spectrum-transparent-black-900",
233+
"--spectrum-transparent-white-100",
234+
"--spectrum-transparent-white-200",
235+
"--spectrum-transparent-white-25",
236+
"--spectrum-transparent-white-300",
237+
"--spectrum-transparent-white-400",
238+
"--spectrum-transparent-white-800",
239+
"--spectrum-transparent-white-900",
261240
"--spectrum-white",
262241
"--spectrum-workflow-icon-size-100",
263242
"--spectrum-workflow-icon-size-200",
@@ -286,6 +265,7 @@
286265
"--highcontrast-button-content-color-disabled",
287266
"--highcontrast-button-content-color-down",
288267
"--highcontrast-button-content-color-focus",
289-
"--highcontrast-button-content-color-hover"
268+
"--highcontrast-button-content-color-hover",
269+
"--highcontrast-button-focus-ring-color"
290270
]
291271
}

‎components/button/metadata/mods.md

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,43 @@
1-
| Modifiable custom properties |
2-
| ------------------------------------------ |
3-
| `--mod-bold-font-weight` |
4-
| `--mod-button-animation-duration` |
5-
| `--mod-button-background-color-default` |
6-
| `--mod-button-background-color-disabled` |
7-
| `--mod-button-background-color-down` |
8-
| `--mod-button-background-color-focus` |
9-
| `--mod-button-background-color-hover` |
10-
| `--mod-button-border-color-default` |
11-
| `--mod-button-border-color-disabled` |
12-
| `--mod-button-border-color-down` |
13-
| `--mod-button-border-color-focus` |
14-
| `--mod-button-border-color-hover` |
15-
| `--mod-button-border-radius` |
16-
| `--mod-button-border-width` |
17-
| `--mod-button-bottom-to-text` |
18-
| `--mod-button-content-color-default` |
19-
| `--mod-button-content-color-disabled` |
20-
| `--mod-button-content-color-down` |
21-
| `--mod-button-content-color-focus` |
22-
| `--mod-button-content-color-hover` |
23-
| `--mod-button-edge-to-text` |
24-
| `--mod-button-edge-to-visual` |
25-
| `--mod-button-edge-to-visual-only` |
26-
| `--mod-button-focus-indicator-gap` |
27-
| `--mod-button-focus-ring-border-radius` |
28-
| `--mod-button-focus-ring-color` |
29-
| `--mod-button-focus-ring-gap` |
30-
| `--mod-button-focus-ring-thickness` |
31-
| `--mod-button-font-family` |
32-
| `--mod-button-font-size` |
33-
| `--mod-button-height` |
34-
| `--mod-button-icon-margin-block-start` |
35-
| `--mod-button-line-height` |
36-
| `--mod-button-margin-block` |
37-
| `--mod-button-margin-left` |
38-
| `--mod-button-margin-right` |
39-
| `--mod-button-max-inline-size` |
40-
| `--mod-button-min-width` |
41-
| `--mod-button-padding-label-to-icon` |
42-
| `--mod-button-static-content-color` |
43-
| `--mod-button-text-align` |
44-
| `--mod-button-text-align-with-icon` |
45-
| `--mod-button-top-to-icon` |
46-
| `--mod-button-top-to-text` |
47-
| `--mod-focus-indicator-gap` |
48-
| `--mod-static-black-focus-indicator-color` |
1+
| Modifiable custom properties |
2+
| ---------------------------------------- |
3+
| `--mod-button-animation-duration` |
4+
| `--mod-button-background-color-default` |
5+
| `--mod-button-background-color-disabled` |
6+
| `--mod-button-background-color-down` |
7+
| `--mod-button-background-color-focus` |
8+
| `--mod-button-background-color-hover` |
9+
| `--mod-button-border-color-default` |
10+
| `--mod-button-border-color-disabled` |
11+
| `--mod-button-border-color-down` |
12+
| `--mod-button-border-color-focus` |
13+
| `--mod-button-border-color-hover` |
14+
| `--mod-button-border-radius` |
15+
| `--mod-button-border-width` |
16+
| `--mod-button-bottom-to-text` |
17+
| `--mod-button-content-color-default` |
18+
| `--mod-button-content-color-disabled` |
19+
| `--mod-button-content-color-down` |
20+
| `--mod-button-content-color-focus` |
21+
| `--mod-button-content-color-hover` |
22+
| `--mod-button-edge-to-text` |
23+
| `--mod-button-edge-to-visual` |
24+
| `--mod-button-edge-to-visual-only` |
25+
| `--mod-button-focus-ring-border-radius` |
26+
| `--mod-button-focus-ring-color` |
27+
| `--mod-button-focus-ring-gap` |
28+
| `--mod-button-focus-ring-thickness` |
29+
| `--mod-button-font-family` |
30+
| `--mod-button-font-size` |
31+
| `--mod-button-font-weight` |
32+
| `--mod-button-height` |
33+
| `--mod-button-icon-margin-block-start` |
34+
| `--mod-button-line-height` |
35+
| `--mod-button-margin-block` |
36+
| `--mod-button-margin-left` |
37+
| `--mod-button-margin-right` |
38+
| `--mod-button-min-width` |
39+
| `--mod-button-padding-label-to-icon` |
40+
| `--mod-button-text-align` |
41+
| `--mod-button-text-align-with-icon` |
42+
| `--mod-button-top-to-icon` |
43+
| `--mod-button-top-to-text` |

0 commit comments

Comments
 (0)