Skip to content

Commit 75e470e

Browse files
Melissa Thompsonpfulton
authored andcommitted
feat(closebutton)!: migrate to S2 (#2564)
BREAKING CHANGE: migrates Close Button to Spectrum 2 Additionally: * test: increase chromatic coverage * fix(closebutton): pass staticColor as arg for SB display * chore(closebutton): remove themes dir * docs(closebutton): adds s2 migration notes * chore(closebutton): specify s2 tokens release for dependency --------- Co-authored-by: Patrick Fulton <pfulton@adobe.com>
1 parent 572a66d commit 75e470e

File tree

5 files changed

+137
-319
lines changed

5 files changed

+137
-319
lines changed

components/closebutton/dist/metadata.json

+15-67
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,16 @@
22
"sourceFile": "index.css",
33
"selectors": [
44
".spectrum-CloseButton",
5+
".spectrum-CloseButton--sizeL",
6+
".spectrum-CloseButton--sizeS",
7+
".spectrum-CloseButton--sizeXL",
58
".spectrum-CloseButton--staticBlack",
6-
".spectrum-CloseButton--staticBlack.is-focused:not(:disabled) .spectrum-CloseButton-UIIcon",
7-
".spectrum-CloseButton--staticBlack.is-keyboardFocused:not(:disabled)",
8-
".spectrum-CloseButton--staticBlack.is-keyboardFocused:not(:disabled) .spectrum-CloseButton-UIIcon",
9-
".spectrum-CloseButton--staticBlack:disabled .spectrum-CloseButton-UIIcon",
10-
".spectrum-CloseButton--staticBlack:not(:disabled)",
11-
".spectrum-CloseButton--staticBlack:not(:disabled) .spectrum-CloseButton-UIIcon",
12-
".spectrum-CloseButton--staticBlack:not(:disabled):active",
13-
".spectrum-CloseButton--staticBlack:not(:disabled):active .spectrum-CloseButton-UIIcon",
14-
".spectrum-CloseButton--staticBlack:not(:disabled):focus .spectrum-CloseButton-UIIcon",
15-
".spectrum-CloseButton--staticBlack:not(:disabled):focus-visible",
16-
".spectrum-CloseButton--staticBlack:not(:disabled):focus-visible .spectrum-CloseButton-UIIcon",
17-
".spectrum-CloseButton--staticBlack:not(:disabled):hover",
18-
".spectrum-CloseButton--staticBlack:not(:disabled):hover .spectrum-CloseButton-UIIcon",
199
".spectrum-CloseButton--staticWhite",
20-
".spectrum-CloseButton--staticWhite.is-focused:not(:disabled) .spectrum-CloseButton-UIIcon",
21-
".spectrum-CloseButton--staticWhite.is-keyboardFocused:not(:disabled)",
22-
".spectrum-CloseButton--staticWhite.is-keyboardFocused:not(:disabled) .spectrum-CloseButton-UIIcon",
23-
".spectrum-CloseButton--staticWhite:disabled .spectrum-CloseButton-UIIcon",
24-
".spectrum-CloseButton--staticWhite:not(:disabled)",
25-
".spectrum-CloseButton--staticWhite:not(:disabled) .spectrum-CloseButton-UIIcon",
26-
".spectrum-CloseButton--staticWhite:not(:disabled):active",
27-
".spectrum-CloseButton--staticWhite:not(:disabled):active .spectrum-CloseButton-UIIcon",
28-
".spectrum-CloseButton--staticWhite:not(:disabled):focus .spectrum-CloseButton-UIIcon",
29-
".spectrum-CloseButton--staticWhite:not(:disabled):focus-visible",
30-
".spectrum-CloseButton--staticWhite:not(:disabled):focus-visible .spectrum-CloseButton-UIIcon",
31-
".spectrum-CloseButton--staticWhite:not(:disabled):hover",
32-
".spectrum-CloseButton--staticWhite:not(:disabled):hover .spectrum-CloseButton-UIIcon",
3310
".spectrum-CloseButton-UIIcon",
3411
".spectrum-CloseButton.is-disabled",
3512
".spectrum-CloseButton.is-focused:not(:disabled) .spectrum-CloseButton-UIIcon",
3613
".spectrum-CloseButton.is-keyboardFocused:not(:disabled)",
3714
".spectrum-CloseButton.is-keyboardFocused:not(:disabled) .spectrum-CloseButton-UIIcon",
38-
".spectrum-CloseButton.spectrum-CloseButton--sizeL",
39-
".spectrum-CloseButton.spectrum-CloseButton--sizeM",
40-
".spectrum-CloseButton.spectrum-CloseButton--sizeS",
41-
".spectrum-CloseButton.spectrum-CloseButton--sizeXL",
42-
".spectrum-CloseButton.spectrum-CloseButton--staticBlack",
43-
".spectrum-CloseButton.spectrum-CloseButton--staticWhite",
4415
".spectrum-CloseButton::-moz-focus-inner",
4516
".spectrum-CloseButton:after",
4617
".spectrum-CloseButton:disabled",
@@ -72,7 +43,6 @@
7243
"--mod-closebutton-focus-indicator-color",
7344
"--mod-closebutton-focus-indicator-gap",
7445
"--mod-closebutton-focus-indicator-thickness",
75-
"--mod-closebutton-height",
7646
"--mod-closebutton-icon-color-default",
7747
"--mod-closebutton-icon-color-disabled",
7848
"--mod-closebutton-icon-color-down",
@@ -81,11 +51,6 @@
8151
"--mod-closebutton-margin-inline",
8252
"--mod-closebutton-margin-top",
8353
"--mod-closebutton-size",
84-
"--mod-closebutton-static-background-color-default",
85-
"--mod-closebutton-static-background-color-down",
86-
"--mod-closebutton-static-background-color-focus",
87-
"--mod-closebutton-static-background-color-hover",
88-
"--mod-closebutton-width",
8954
"--mod-line-height-100",
9055
"--mod-sans-font-family-stack"
9156
],
@@ -104,27 +69,22 @@
10469
"--spectrum-closebutton-icon-color-down",
10570
"--spectrum-closebutton-icon-color-focus",
10671
"--spectrum-closebutton-icon-color-hover",
107-
"--spectrum-closebutton-size",
108-
"--spectrum-closebutton-static-background-color-default",
109-
"--spectrum-closebutton-static-background-color-down",
110-
"--spectrum-closebutton-static-background-color-focus",
111-
"--spectrum-closebutton-static-background-color-hover"
72+
"--spectrum-closebutton-size"
11273
],
11374
"global": [
11475
"--spectrum-animation-duration-100",
115-
"--spectrum-black",
11676
"--spectrum-component-height-100",
11777
"--spectrum-component-height-200",
11878
"--spectrum-component-height-300",
11979
"--spectrum-component-height-75",
80+
"--spectrum-corner-radius-full",
12081
"--spectrum-disabled-content-color",
121-
"--spectrum-disabled-static-black-content-color",
122-
"--spectrum-disabled-static-white-content-color",
82+
"--spectrum-disabled-static-black-background-color",
83+
"--spectrum-disabled-static-white-background-color",
12384
"--spectrum-focus-indicator-color",
12485
"--spectrum-focus-indicator-gap",
12586
"--spectrum-focus-indicator-thickness",
12687
"--spectrum-gray-100",
127-
"--spectrum-gray-200",
12888
"--spectrum-line-height-100",
12989
"--spectrum-neutral-content-color-default",
13090
"--spectrum-neutral-content-color-down",
@@ -133,24 +93,14 @@
13393
"--spectrum-sans-font-family-stack",
13494
"--spectrum-static-black-focus-indicator-color",
13595
"--spectrum-static-white-focus-indicator-color",
136-
"--spectrum-transparent-black-400",
137-
"--spectrum-transparent-black-500",
138-
"--spectrum-transparent-white-400",
139-
"--spectrum-transparent-white-500",
140-
"--spectrum-white"
141-
],
142-
"system-theme": [
143-
"--system-close-button-background-color-default",
144-
"--system-close-button-background-color-down",
145-
"--system-close-button-background-color-focus",
146-
"--system-close-button-background-color-hover",
147-
"--system-close-button-static-black-static-background-color-down",
148-
"--system-close-button-static-black-static-background-color-focus",
149-
"--system-close-button-static-black-static-background-color-hover",
150-
"--system-close-button-static-white-static-background-color-down",
151-
"--system-close-button-static-white-static-background-color-focus",
152-
"--system-close-button-static-white-static-background-color-hover"
96+
"--spectrum-transparent-black-100",
97+
"--spectrum-transparent-black-800",
98+
"--spectrum-transparent-black-900",
99+
"--spectrum-transparent-white-100",
100+
"--spectrum-transparent-white-800",
101+
"--spectrum-transparent-white-900"
153102
],
103+
"system-theme": [],
154104
"passthroughs": [
155105
"--mod-button-animation-duration",
156106
"--mod-button-font-family",
@@ -159,11 +109,9 @@
159109
"high-contrast": [
160110
"--highcontrast-closebutton-background-color-default",
161111
"--highcontrast-closebutton-focus-indicator-color",
162-
"--highcontrast-closebutton-icon-color-default",
163112
"--highcontrast-closebutton-icon-color-disabled",
164113
"--highcontrast-closebutton-icon-color-down",
165114
"--highcontrast-closebutton-icon-color-focus",
166-
"--highcontrast-closebutton-icon-color-hover",
167-
"--highcontrast-closebutton-static-background-color-default"
115+
"--highcontrast-closebutton-icon-color-hover"
168116
]
169117
}

0 commit comments

Comments
 (0)