Skip to content

Commit 767115f

Browse files
jawinncastastrophe
authored andcommitted
fix: restore undefined custom properties [part 4] (#3473)
* fix(search): restore missing custom properties * fix(colorwheel): restore missing custom properties * fix(assetcard): restore missing custom properties * fix(treeview): restore missing custom properties Restore missing properties from foundations that were flagged by the linter. * fix(combobox): restore missing custom properties Restore missing properties from foundations that were flagged by the linter. Also removes a group of duplicate custom property definitions that were flagged.
1 parent 945648e commit 767115f

File tree

6 files changed

+62
-0
lines changed

6 files changed

+62
-0
lines changed

.changeset/healthy-zebras-unite.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@spectrum-css/colorwheel": patch
3+
"@spectrum-css/assetcard": patch
4+
"@spectrum-css/combobox": patch
5+
"@spectrum-css/treeview": patch
6+
"@spectrum-css/search": patch
7+
---
8+
9+
Restores missing custom properties that were flagged by the linter. The missing properties were copied from the spectrum two theme files in the foundations branch. This clears up all linter errors and warnings for these components.

components/assetcard/index.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
/* todo: this isn't quite the size from the XD file as 232px is not a size token, so we use 224px */
2222
--spectrum-assetcard-asset-size: 224px;
23+
--spectrum-assetcard-background-color: var(--spectrum-gray-75);
24+
--spectrum-assetcard-overlay-background-color: rgba(27 127 245 / 10%);
2325
--spectrum-assetcard-asset-animation-duration: var(--spectrum-animation-duration-100);
2426
--spectrum-assetcard-asset-container-border-size: 1px;
2527
--spectrum-assetcard-header-margin-block-start: var(--spectrum-spacing-300);
@@ -40,6 +42,8 @@
4042
--spectrum-assetcard-selectionindicator-color: var(--spectrum-white);
4143
--spectrum-assetcard-selectionindicator-font-weight: var(--spectrum-bold-font-weight);
4244
--spectrum-assetcard-selectionindicator-font-size: var(--spectrum-font-size-400);
45+
--spectrum-assetcard-selectionindicator-background-color-default: rgba(var(--spectrum-gray-75-rgb), 0.9);
46+
--spectrum-assetcard-selectionindicator-box-shadow-color: var(--spectrum-transparent-black-300);
4347

4448
/* title */
4549
--spectrum-assetcard-title-text-color: var(--spectrum-gray-900);

components/colorwheel/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
--spectrum-colorwheel-width: var(--mod-colorwheel-width, var(--spectrum-color-wheel-width));
2828
--spectrum-colorwheel-height: var(--mod-colorwheel-height, var(--spectrum-color-wheel-width));
2929
--spectrum-colorwheel-fill-color-disabled: var(--mod-colorwheel-fill-color-disabled, var(--spectrum-disabled-background-color));
30+
--spectrum-colorwheel-border-color: var(--spectrum-transparent-black-300);
3031

3132
--spectrum-colorwheel-border-width: var(--mod-colorwheel-border-width, var(--spectrum-border-width-100));
3233
--spectrum-colorwheel-track-width: var(--mod-colorwheel-track-width, var(--spectrum-color-control-track-width));

components/combobox/index.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@
4949
--spectrum-combobox-font-style: var(--spectrum-default-font-style);
5050
--spectrum-combobox-line-height: var(--spectrum-line-height-100);
5151

52+
--spectrum-combobox-background-color-disabled: var(--spectrum-gray-25);
53+
54+
--spectrum-combobox-border-color-default: var(--spectrum-gray-500);
55+
--spectrum-combobox-border-color-hover: var(--spectrum-gray-600);
56+
--spectrum-combobox-border-color-focus: var(--spectrum-gray-800);
57+
--spectrum-combobox-border-color-focus-hover: var(--spectrum-gray-900);
58+
--spectrum-combobox-border-color-key-focus: var(--spectrum-gray-800);
59+
5260
--spectrum-combobox-border-color-invalid-default: var(--spectrum-negative-border-color-default);
5361
--spectrum-combobox-border-color-invalid-hover: var(--spectrum-negative-border-color-hover);
5462
--spectrum-combobox-border-color-invalid-focus: var(--spectrum-negative-border-color-focus);

components/search/index.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
--spectrum-search-to-help-text: var(--spectrum-help-text-to-component);
5050
--spectrum-search-top-to-text: var(--spectrum-component-top-to-text-100);
5151
--spectrum-search-bottom-to-text: var(--spectrum-component-bottom-to-text-100);
52+
--spectrum-search-border-radius: var(--spectrum-corner-radius-100);
53+
--spectrum-search-edge-to-visual: var(--spectrum-component-edge-to-visual-100);
5254

5355
/* Focus Indicator */
5456
--spectrum-search-focus-indicator-thickness: var(--spectrum-focus-indicator-thickness);
@@ -67,6 +69,12 @@
6769
--spectrum-search-color-focus-hover: var(--spectrum-neutral-content-color-focus-hover);
6870
--spectrum-search-color-key-focus: var(--spectrum-neutral-content-color-key-focus);
6971

72+
--spectrum-search-border-color-default: var(--spectrum-gray-500);
73+
--spectrum-search-border-color-hover: var(--spectrum-gray-600);
74+
--spectrum-search-border-color-focus: var(--spectrum-gray-800);
75+
--spectrum-search-border-color-focus-hover: var(--spectrum-gray-900);
76+
--spectrum-search-border-color-key-focus: var(--spectrum-gray-900);
77+
7078
/* Background and Border */
7179
--spectrum-search-border-width: var(--spectrum-border-width-100);
7280

@@ -118,18 +126,21 @@
118126
--spectrum-search-block-size: var(--spectrum-component-height-75);
119127
--spectrum-search-icon-size: var(--spectrum-workflow-icon-size-75);
120128
--spectrum-search-text-to-icon: var(--spectrum-text-to-visual-75);
129+
--spectrum-search-edge-to-visual: var(--spectrum-component-edge-to-visual-75);
121130
}
122131

123132
.spectrum-Search--sizeL {
124133
--spectrum-search-block-size: var(--spectrum-component-height-200);
125134
--spectrum-search-icon-size: var(--spectrum-workflow-icon-size-200);
126135
--spectrum-search-text-to-icon: var(--spectrum-text-to-visual-200);
136+
--spectrum-search-edge-to-visual: var(--spectrum-component-edge-to-visual-200);
127137
}
128138

129139
.spectrum-Search--sizeXL {
130140
--spectrum-search-block-size: var(--spectrum-component-height-300);
131141
--spectrum-search-icon-size: var(--spectrum-workflow-icon-size-300);
132142
--spectrum-search-text-to-icon: var(--spectrum-text-to-visual-300);
143+
--spectrum-search-edge-to-visual: var(--spectrum-component-edge-to-visual-300);
133144
}
134145

135146
@media (forced-colors: active) {

components/treeview/index.css

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,35 @@
5656
--spectrum-treeview-item-background-color-hover: var(--spectrum-gray-100);
5757
--spectrum-treeview-item-background-color-focus: var(--spectrum-gray-100);
5858

59+
--spectrum-treeview-item-border-size: var(--mod-treeview-item-border-size, var(--spectrum-border-width-200));
60+
--spectrum-treeview-item-border-size-selected: var(--mod-treeview-item-border-size-selected, 1px);
61+
--spectrum-treeview-item-border-radius: var(--mod-treeview-item-border-radius, 0px);
62+
63+
--spectrum-treeview-item-border-color-selected: var(--highcontrast-treeview-item-border-color-selected, var(--mod-treeview-item-border-color-selected, var(--spectrum-blue-800)));
64+
--spectrum-treeview-item-border-color-focus: var(--highcontrast-treeview-item-border-color-focus, var(--mod-treeview-item-border-color-focus, var(--spectrum-blue-700)));
65+
66+
--spectrum-treeview-item-border-color-quiet-selected: var(--highcontrast-treeview-item-border-color-selected, var(--mod-treeview-item-border-color-selected-quiet, transparent));
67+
68+
--spectrum-treeview-item-background-color-hover: var(--spectrum-gray-100);
69+
--spectrum-treeview-item-background-color-focus: var(--spectrum-gray-100);
70+
71+
--spectrum-treeview-item-icon-gap: var(--mod-treeview-item-icon-gap, var(--spectrum-text-to-visual-75));
72+
--spectrum-treeview-item-icon-color: var(--highcontrast-treeview-item-icon-color, var(--mod-treeview-item-icon-color, var(--spectrum-gray-700)));
73+
--spectrum-treeview-item-icon-color-hover: var(--highcontrast-treeview-item-text-color-focus, var(--mod-treeview-item-icon-color-hover, var(--spectrum-gray-900)));
74+
--spectrum-treeview-item-icon-color-focus: var(--highcontrast-treeview-item-icon-color-focus, var(--mod-treeview-item-icon-color-focus, var(--spectrum-gray-900)));
75+
--spectrum-treeview-item-icon-color-selected: var(--highcontrast-treeview-item-icon-color-selected, var(--mod-treeview-item-icon-color-selected, var(--spectrum-gray-900)));
76+
--spectrum-treeview-item-icon-color-disabled: var(--highcontrast-treeview-item-icon-color-disabled, var(--mod-treeview-item-icon-color-disabled, var(--spectrum-disabled-content-color)));
77+
78+
--spectrum-treeview-item-text-color: var(--highcontrast-treeview-item-text-color, var(--mod-treeview-item-text-color, var(--spectrum-neutral-content-color-default)));
79+
--spectrum-treeview-item-text-color-selected: var(--highcontrast-treeview-item-text-color-selected, var(--mod-treeview-item-text-color-selected, var(--spectrum-gray-900)));
80+
--spectrum-treeview-item-text-color-disabled: var(--highcontrast-treeview-item-text-color-disabled, var(--mod-treeview-item-text-color-disabled, var(--spectrum-gray-500)));
81+
--spectrum-treeview-item-text-color-focus: var(--highcontrast-treeview-item-text-color-focus, var(--mod-treeview-item-text-color-focus, var(--spectrum-gray-900)));
82+
--spectrum-treeview-item-text-color-hover: var(--highcontrast-treeview-item-text-color-focus, var(--mod-treeview-item-text-color-hover, var(--spectrum-gray-900)));
83+
84+
--spectrum-treeview-indicator-animation-duration: var(--mod-treeview-indicator-animation-duration, var(--spectrum-animation-duration-100));
85+
86+
--spectrum-treeview-item-min-block-size: var(--mod-treeview-item-min-block-size, var(--spectrum-treeview-item-sized-min-block-size));
87+
5988
--spectrum-treeview-font-size: var(--mod-treeview-font-size, var(--spectrum-font-size-100));
6089

6190
--spectrum-treeview-item-sized-min-block-size: var(--mod-treeview-item-min-block-size, var(--spectrum-component-height-100));

0 commit comments

Comments
 (0)