Skip to content

Commit 58cb9bf

Browse files
cdransfcastastrophe
authored andcommitted
fix(*): define missing custom properties from theme directory (#3517)
* fix(*): define missing custom properties from theme directory * fix(*): restore missing mods and tokens * fix(*): restore missing mod and update metadata * fix(*): restore missing mods and update metadata * fix(*): restore basebutton import * chore(*): update metadata This reverts commit 3d489fe. * fix(*): restore actionbutton staticwhite background color * chore(*): update metadata * chore: resolve conflict * fix(*): actionbutton emphasized + static conflict * fix(*): actionbutton restore missing mods * fix(*): actionbutton clean up mods; fix missing states * fix(*): actionbutton restore focus indicator mods * chore(*): remove unused theme files
1 parent 45e100a commit 58cb9bf

File tree

10 files changed

+179
-109
lines changed

10 files changed

+179
-109
lines changed

.changeset/sixty-crabs-thank.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"@spectrum-css/infieldbutton": patch
3+
"@spectrum-css/actionbutton": patch
4+
"@spectrum-css/clearbutton": patch
5+
"@spectrum-css/avatar": patch
6+
"@spectrum-css/button": patch
7+
"@spectrum-css/dialog": patch
8+
---
9+
10+
Define undefined properties from theme directory.

components/actionbutton/dist/metadata.json

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,25 @@
1414
".spectrum-ActionButton-label:empty",
1515
".spectrum-ActionButton.is-disabled",
1616
".spectrum-ActionButton.is-selected",
17+
".spectrum-ActionButton.is-selected .is-disabled.spectrum-ActionButton--staticBlack",
18+
".spectrum-ActionButton.is-selected .is-disabled.spectrum-ActionButton--staticWhite",
1719
".spectrum-ActionButton.is-selected .spectrum-ActionButton-hold",
1820
".spectrum-ActionButton.is-selected .spectrum-ActionButton-icon",
1921
".spectrum-ActionButton.is-selected .spectrum-ActionButton-label",
20-
".spectrum-ActionButton.is-selected.spectrum-ActionButton--quiet",
22+
".spectrum-ActionButton.is-selected.spectrum-ActionButton--emphasized:not(.spectrum-ActionButton--staticBlack, .spectrum-ActionButton--staticWhite)",
23+
".spectrum-ActionButton.is-selected.spectrum-ActionButton--staticBlack:disabled",
24+
".spectrum-ActionButton.is-selected.spectrum-ActionButton--staticWhite:disabled",
2125
".spectrum-ActionButton.spectrum-ActionButton--quiet",
26+
".spectrum-ActionButton.spectrum-ActionButton--quiet.is-disabled:not(.is-selected)",
27+
".spectrum-ActionButton.spectrum-ActionButton--quiet:disabled:not(.is-selected)",
2228
".spectrum-ActionButton.spectrum-ActionButton--staticBlack",
29+
".spectrum-ActionButton.spectrum-ActionButton--staticBlack .is-disabled",
2330
".spectrum-ActionButton.spectrum-ActionButton--staticBlack.spectrum-ActionButton--quiet",
31+
".spectrum-ActionButton.spectrum-ActionButton--staticBlack:disabled",
2432
".spectrum-ActionButton.spectrum-ActionButton--staticWhite",
33+
".spectrum-ActionButton.spectrum-ActionButton--staticWhite .is-disabled",
2534
".spectrum-ActionButton.spectrum-ActionButton--staticWhite.spectrum-ActionButton--quiet",
35+
".spectrum-ActionButton.spectrum-ActionButton--staticWhite:disabled",
2636
".spectrum-ActionButton::-moz-focus-inner",
2737
".spectrum-ActionButton:active",
2838
".spectrum-ActionButton:after",
@@ -38,14 +48,10 @@
3848
"modifiers": [
3949
"--mod-actionbutton-animation-duration",
4050
"--mod-actionbutton-background-color-default",
41-
"--mod-actionbutton-background-color-default-selected",
4251
"--mod-actionbutton-background-color-disabled",
4352
"--mod-actionbutton-background-color-down",
44-
"--mod-actionbutton-background-color-down-selected",
4553
"--mod-actionbutton-background-color-focus",
46-
"--mod-actionbutton-background-color-focus-selected",
4754
"--mod-actionbutton-background-color-hover",
48-
"--mod-actionbutton-background-color-hover-selected",
4955
"--mod-actionbutton-border-color-default",
5056
"--mod-actionbutton-border-color-disabled",
5157
"--mod-actionbutton-border-color-down",
@@ -54,14 +60,10 @@
5460
"--mod-actionbutton-border-radius",
5561
"--mod-actionbutton-border-width",
5662
"--mod-actionbutton-content-color-default",
57-
"--mod-actionbutton-content-color-default-selected",
5863
"--mod-actionbutton-content-color-disabled",
5964
"--mod-actionbutton-content-color-down",
60-
"--mod-actionbutton-content-color-down-selected",
6165
"--mod-actionbutton-content-color-focus",
62-
"--mod-actionbutton-content-color-focus-selected",
6366
"--mod-actionbutton-content-color-hover",
64-
"--mod-actionbutton-content-color-hover-selected",
6567
"--mod-actionbutton-edge-to-hold-icon",
6668
"--mod-actionbutton-edge-to-text",
6769
"--mod-actionbutton-edge-to-visual",
@@ -73,8 +75,9 @@
7375
"--mod-actionbutton-icon-size",
7476
"--mod-actionbutton-label-color",
7577
"--mod-actionbutton-min-width",
76-
"--mod-actionbutton-static-content-color",
77-
"--mod-actionbutton-text-to-visual"
78+
"--mod-actionbutton-text-to-visual",
79+
"--mod-disabled-background-color",
80+
"--mod-disabled-content-color"
7881
],
7982
"component": [
8083
"--spectrum-action-button-edge-to-hold-icon-extra-large",
@@ -121,8 +124,11 @@
121124
"--spectrum-actionbutton-text-to-visual"
122125
],
123126
"global": [
127+
"--spectrum-accent-background-color-default",
128+
"--spectrum-accent-background-color-down",
129+
"--spectrum-accent-background-color-hover",
130+
"--spectrum-accent-background-color-key-focus",
124131
"--spectrum-animation-duration-100",
125-
"--spectrum-black",
126132
"--spectrum-border-width-100",
127133
"--spectrum-component-edge-to-text-100",
128134
"--spectrum-component-edge-to-text-200",
@@ -149,9 +155,9 @@
149155
"--spectrum-corner-radius-medium-size-large",
150156
"--spectrum-corner-radius-medium-size-medium",
151157
"--spectrum-corner-radius-medium-size-small",
158+
"--spectrum-disabled-background-color",
152159
"--spectrum-disabled-border-color",
153-
"--spectrum-disabled-static-black-border-color",
154-
"--spectrum-disabled-static-black-content-color",
160+
"--spectrum-disabled-content-color",
155161
"--spectrum-focus-indicator-color",
156162
"--spectrum-focus-indicator-gap",
157163
"--spectrum-focus-indicator-thickness",
@@ -162,6 +168,7 @@
162168
"--spectrum-font-size-75",
163169
"--spectrum-gray-100",
164170
"--spectrum-gray-200",
171+
"--spectrum-gray-25",
165172
"--spectrum-gray-400",
166173
"--spectrum-gray-50",
167174
"--spectrum-gray-500",
@@ -178,21 +185,19 @@
178185
"--spectrum-neutral-content-color-key-focus",
179186
"--spectrum-sans-font-family-stack",
180187
"--spectrum-static-black-focus-indicator-color",
188+
"--spectrum-static-white-focus-indicator-color",
181189
"--spectrum-text-to-visual-100",
182190
"--spectrum-text-to-visual-200",
183191
"--spectrum-text-to-visual-300",
184192
"--spectrum-text-to-visual-50",
185193
"--spectrum-text-to-visual-75",
186194
"--spectrum-transparent-black-100",
187195
"--spectrum-transparent-black-200",
188-
"--spectrum-transparent-black-400",
189196
"--spectrum-transparent-black-500",
190197
"--spectrum-transparent-black-600",
191198
"--spectrum-transparent-black-700",
192-
"--spectrum-transparent-black-800",
193-
"--spectrum-transparent-black-900",
199+
"--spectrum-transparent-white-100",
194200
"--spectrum-transparent-white-200",
195-
"--spectrum-transparent-white-400",
196201
"--spectrum-transparent-white-500",
197202
"--spectrum-transparent-white-600",
198203
"--spectrum-transparent-white-700",

0 commit comments

Comments
 (0)