Skip to content

Commit 785d2f9

Browse files
fix(numberfield): linter fixes and update metadata
1 parent 5b61f78 commit 785d2f9

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

components/stepper/dist/metadata.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
"--spectrum-corner-radius-medium-size-medium",
125125
"--spectrum-corner-radius-medium-size-small",
126126
"--spectrum-default-font-style",
127-
"--spectrum-disabled-background-color",
128127
"--spectrum-disabled-border-color",
129128
"--spectrum-disabled-content-color",
130129
"--spectrum-field-default-width-extra-large",
@@ -204,11 +203,10 @@
204203
"--spectrum-numberfield-inline-size",
205204
"--spectrum-numberfield-line-height",
206205
"--spectrum-numberfield-min-inline-size",
206+
"--spectrum-numberfield-spacing-block-end-edge-to-alert-icon",
207207
"--spectrum-numberfield-spacing-block-end-edge-to-text",
208-
"--spectrum-numberfield-spacing-block-end-validation-icon-to-stepper",
208+
"--spectrum-numberfield-spacing-block-start-edge-to-alert-icon",
209209
"--spectrum-numberfield-spacing-block-start-edge-to-text",
210-
"--spectrum-numberfield-spacing-block-start-validation-icon-to-stepper",
211-
"--spectrum-numberfield-spacing-block-start-validation-icon-to-stepper-hidden",
212210
"--spectrum-numberfield-spacing-field-to-helptext",
213211
"--spectrum-numberfield-spacing-inline-edge-to-text",
214212
"--spectrum-numberfield-spacing-label-to-field",
@@ -231,6 +229,7 @@
231229
"--spectrum-text-to-visual-75",
232230
"--spectrum-workflow-icon-size-100",
233231
"--spectrum-workflow-icon-size-200",
232+
"--spectrum-workflow-icon-size-300",
234233
"--spectrum-workflow-icon-size-75"
235234
],
236235
"passthroughs": [
@@ -272,17 +271,10 @@
272271
"high-contrast": [
273272
"--highcontrast-numberfield-background-color",
274273
"--highcontrast-numberfield-border-color",
275-
"--highcontrast-numberfield-border-color-disabled",
276274
"--highcontrast-numberfield-border-color-focus",
277275
"--highcontrast-numberfield-border-color-focus-hover",
278276
"--highcontrast-numberfield-border-color-hover",
279-
"--highcontrast-numberfield-border-color-invalid-default",
280-
"--highcontrast-numberfield-border-color-invalid-focus",
281-
"--highcontrast-numberfield-border-color-invalid-focus-hover",
282-
"--highcontrast-numberfield-border-color-invalid-hover",
283-
"--highcontrast-numberfield-border-color-invalid-keyboard-focus",
284277
"--highcontrast-numberfield-border-color-keyboard-focus",
285-
"--highcontrast-numberfield-buttons-border-width",
286278
"--highcontrast-numberfield-focus-indicator-color",
287279
"--highcontrast-textfield-border-color"
288280
]

components/stepper/index.css

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
--spectrum-numberfield-border-color-focus: var(--highcontrast-numberfield-border-color-focus, var(--mod-numberfield-border-color-focus, var(--spectrum-gray-800)));
2222
--spectrum-numberfield-border-color-keyboard-focus: var(--highcontrast-numberfield-border-color-keyboard-focus, var(--mod-numberfield-border-color-keyboard-focus, var(--spectrum-gray-800)));
2323
--spectrum-numberfield-border-color-focus-hover: var(--highcontrast-numberfield-border-color-focus-hover, var(--mod-numberfield-border-color-focus-hover, var(--spectrum-gray-900)));
24-
--spectrum-numberfield-border-color-disabled: var(--highcontrast-numberfield-border-color-disabled, var(--mod-numberfield-border-color-disabled, var(--spectrum-disabled-border-color)));
24+
--spectrum-numberfield-border-color-disabled: var(--mod-numberfield-border-color-disabled, var(--spectrum-disabled-border-color));
2525

2626
/* Invalid border */
27-
--spectrum-numberfield-border-color-invalid-default: var(--highcontrast-numberfield-border-color-invalid-default, var(--mod-numberfield-border-color-invalid-default, var(--spectrum-negative-border-color-default)));
28-
--spectrum-numberfield-border-color-invalid-hover: var(--highcontrast-numberfield-border-color-invalid-hover, var(--mod-numberfield-border-color-invalid-hover, var(--spectrum-negative-border-color-hover)));
29-
--spectrum-numberfield-border-color-invalid-focus: var(--highcontrast-numberfield-border-color-invalid-focus, var(--mod-numberfield-border-color-invalid-focus, var(--spectrum-negative-border-color-focus)));
30-
--spectrum-numberfield-border-color-invalid-focus-hover: var(--highcontrast-numberfield-border-color-invalid-focus-hover, var(--mod-numberfield-border-color-invalid-focus-hover, var(--spectrum-negative-border-color-focus-hover)));
31-
--spectrum-numberfield-border-color-invalid-keyboard-focus: var(--highcontrast-numberfield-border-color-invalid-keyboard-focus, var(--mod-numberfield-border-color-invalid-keyboard-focus, var(--spectrum-negative-border-color-key-focus)));
27+
--spectrum-numberfield-border-color-invalid-default: var(--mod-numberfield-border-color-invalid-default, var(--spectrum-negative-border-color-default));
28+
--spectrum-numberfield-border-color-invalid-hover: var(--mod-numberfield-border-color-invalid-hover, var(--spectrum-negative-border-color-hover));
29+
--spectrum-numberfield-border-color-invalid-focus: var(--mod-numberfield-border-color-invalid-focus, var(--spectrum-negative-border-color-focus));
30+
--spectrum-numberfield-border-color-invalid-focus-hover: var(--mod-numberfield-border-color-invalid-focus-hover, var(--spectrum-negative-border-color-focus-hover));
31+
--spectrum-numberfield-border-color-invalid-keyboard-focus: var(--mod-numberfield-border-color-invalid-keyboard-focus, var(--spectrum-negative-border-color-key-focus));
3232

3333
/* Text color */
3434
--spectrum-numberfield-text-color: var(--mod-numberfield-text-color, var(--spectrum-neutral-content-color-default));
@@ -40,7 +40,8 @@
4040

4141
/* Background */
4242
--spectrum-numberfield-background-color: var(--highcontrast-numberfield-background-color, var(--mod-numberfield-background-color, var(--spectrum-gray-25)));
43-
--spectrum-numberfield-background-color-disabled: var(--mod-numberfield-background-color-disabled, var(--spectrum-disabled-background-color));
43+
44+
/* --spectrum-numberfield-background-color-disabled: var(--mod-numberfield-background-color-disabled, var(--spectrum-disabled-background-color)); */
4445
--spectrum-numberfield-background-color-disabled: var(--mod-numberfield-background-color-disabled, var(--spectrum-gray-25));
4546

4647
/* Font */
@@ -79,8 +80,10 @@
7980
--spectrum-numberfield-button-container-size: calc(calc(var(--spectrum-infield-button-width, var(--spectrum-component-height-100)) - var(--spectrum-infield-button-edge-to-fill, var(--spectrum-in-field-button-edge-to-fill-medium))) * 2);
8081
--spectrum-numberfield-button-inline-offset: var(--mod-numberfield-button-inline-offset, var(--spectrum-in-field-stepper-to-end-medium));
8182

82-
--spectrum-numberfield-spacing-block-start-validation-icon-to-stepper: var(--spectrum-component-top-to-workflow-icon-100);
83-
--spectrum-numberfield-spacing-block-end-validation-icon-to-stepper: var(--spectrum-component-top-to-workflow-icon-100);
83+
--spectrum-numberfield-spacing-block-start-edge-to-alert-icon: var(--spectrum-component-top-to-workflow-icon-100);
84+
85+
/* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- documenting from token specs, but not used in textfield mod */
86+
--spectrum-numberfield-spacing-block-end-edge-to-alert-icon: var(--spectrum-component-top-to-workflow-icon-100);
8487

8588
&.spectrum-NumberField--sizeS {
8689
--spectrum-numberfield-border-radius: var(--mod-numberfield-border-radius, var(--spectrum-corner-radius-medium-size-small));
@@ -98,8 +101,10 @@
98101
--spectrum-numberfield-button-container-size: calc(var(--spectrum-infield-button-width, var(--spectrum-component-height-75)) * 2);
99102
--spectrum-numberfield-button-inline-offset: var(--mod-numberfield-button-inline-offset, var(--spectrum-in-field-stepper-to-end-small));
100103

101-
--spectrum-numberfield-spacing-block-start-validation-icon-to-stepper: var(--spectrum-component-top-to-workflow-icon-75);
102-
--spectrum-numberfield-spacing-block-end-validation-icon-to-stepper: var(--spectrum-component-top-to-workflow-icon-75);
104+
--spectrum-numberfield-spacing-block-start-edge-to-alert-icon: var(--spectrum-component-top-to-workflow-icon-75);
105+
106+
/* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- documenting from token specs, but not used in textfield mod */
107+
--spectrum-numberfield-spacing-block-end-edge-to-alert-icon: var(--spectrum-component-top-to-workflow-icon-75);
103108
--spectrum-numberfield-alert-icon-size: var(--spectrum-workflow-icon-size-75);
104109
}
105110

@@ -119,8 +124,10 @@
119124
--spectrum-numberfield-button-container-size: calc(calc(var(--spectrum-infield-button-width, var(--spectrum-component-height-200)) - var(--spectrum-infield-button-edge-to-fill, var(--spectrum-in-field-button-edge-to-fill-large))) * 2);
120125
--spectrum-numberfield-button-inline-offset: var(--mod-numberfield-button-inline-offset, var(--spectrum-in-field-stepper-to-end-large));
121126

122-
--spectrum-numberfield-spacing-block-start-validation-icon-to-stepper: var(--spectrum-component-top-to-workflow-icon-200);
123-
--spectrum-numberfield-spacing-block-end-validation-icon-to-stepper: var(--spectrum-component-top-to-workflow-icon-200);
127+
--spectrum-numberfield-spacing-block-start-edge-to-alert-icon: var(--spectrum-component-top-to-workflow-icon-200);
128+
129+
/* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- documenting from token specs, but not used in textfield mod */
130+
--spectrum-numberfield-spacing-block-end-edge-to-alert-icon: var(--spectrum-component-top-to-workflow-icon-200);
124131
--spectrum-numberfield-alert-icon-size: var(--spectrum-workflow-icon-size-200);
125132
}
126133

@@ -140,9 +147,11 @@
140147
--spectrum-numberfield-button-container-size: calc(calc(var(--spectrum-infield-button-width, var(--spectrum-component-height-300)) - var(--spectrum-infield-button-edge-to-fill, var(--spectrum-in-field-button-edge-to-fill-extra-large))) * 2);
141148
--spectrum-numberfield-button-inline-offset: var(--mod-numberfield-button-inline-offset, var(--spectrum-in-field-stepper-to-end-extra-large));
142149

143-
--spectrum-numberfield-spacing-block-start-validation-icon-to-stepper: var(--spectrum-component-top-to-workflow-icon-300);
144-
--spectrum-numberfield-spacing-block-end-validation-icon-to-stepper: var(--spectrum-component-top-to-workflow-icon-300);
145-
--spectrum-numberfield-spacing-block-start-validation-icon-to-stepper-hidden: var(--spectrum-component-top-to-workflow-icon-300);
150+
--spectrum-numberfield-spacing-block-start-edge-to-alert-icon: var(--spectrum-component-top-to-workflow-icon-300);
151+
152+
/* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- documenting from token specs, but not used in textfield mod */
153+
--spectrum-numberfield-spacing-block-end-edge-to-alert-icon: var(--spectrum-component-top-to-workflow-icon-300);
154+
--spectrum-numberfield-alert-icon-size: var(--spectrum-workflow-icon-size-300);
146155
}
147156

148157
&:not(.is-disabled).is-hover,
@@ -210,7 +219,7 @@
210219
--mod-textfield-spacing-block-start: var(--mod-numberfield-spacing-block-start-edge-to-text, var(--spectrum-numberfield-spacing-block-start-edge-to-text));
211220
--mod-textfield-spacing-block-end: var(--mod-numberfield-spacing-block-end-edge-to-text, var(--spectrum-numberfield-spacing-block-end-edge-to-text));
212221
--mod-textfield-border-color-invalid-keyboard-focus: var(--mod-numberfield-border-color-invalid-keyboard-focus, var(--spectrum-numberfield-border-color-invalid-keyboard-focus));
213-
--mod-textfield-icon-spacing-block-invalid: calc(var(--spectrum-numberfield-spacing-block-start-validation-icon-to-stepper) - var(--spectrum-numberfield-border-width));
222+
--mod-textfield-icon-spacing-block-invalid: calc(var(--spectrum-numberfield-spacing-block-start-edge-to-alert-icon) - var(--spectrum-numberfield-border-width));
214223
--mod-textfield-icon-spacing-inline-end-invalid: var(--spectrum-numberfield-spacing-validation-icon-to-stepper);
215224
--mod-textfield-width: var(--mod-numberfield-inline-size, var(--spectrum-numberfield-inline-size));
216225
--mod-textfield-min-width: var(--mod-numberfield-min-inline-size, var(--spectrum-numberfield-min-inline-size));
@@ -401,7 +410,6 @@
401410

402411
&.is-disabled {
403412
--highcontrast-numberfield-border-color: GrayText;
404-
--highcontrast-numberfield-buttons-border-width: var(--mod-numberfield-border-width, var(--spectrum-numberfield-border-width));
405413
}
406414

407415
&:not(.is-disabled) {

0 commit comments

Comments
 (0)