Skip to content

Commit 255e1b1

Browse files
committed
chore(combobox): fixing lint errors
1 parent 915fd9e commit 255e1b1

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

components/combobox/index.css

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@
9090
--mod-picker-button-background-color-disabled: var(--mod-combobox-background-color-disabled);
9191
--mod-picker-button-font-color-disabled: var(--mod-combobox-font-color-disabled);
9292
/* @passthroughs end -- settings for nested Picker Button component */
93+
94+
/*** Read-only Colors ***/
95+
--spectrum-combobox-readonly-input-background-color: var(--spectrum-gray-50);
96+
--spectrum-combobox-readonly-input-border-color: var(--system-spectrum-textfield-border-color);
97+
--spectrum-combobox-readonly-border-color-invalid-default: var(--spectrum-negative-border-color-default);
98+
--spectrum-combobox-readonly-background-color-disabled: var(--spectrum-disabled-background-color);
99+
--spectrum-combobox-readonly-text-color-disabled: var(--spectrum-disabled-content-color);
93100
}
94101

95102
.spectrum-Combobox--sizeS {
@@ -301,12 +308,6 @@
301308
/* TEXTFIELD (wrapper) */
302309
.spectrum-Combobox-textfield {
303310
inline-size: 100%;
304-
305-
/* &.spectrum-Textfield--quiet {
306-
input:read-only {
307-
background-color: transparent;
308-
}
309-
} */
310311
}
311312

312313
/* TEXT INPUT */
@@ -380,8 +381,8 @@
380381
/* Combobox Read-only */
381382
.spectrum-Textfield.is-readOnly {
382383
input:read-only {
383-
background-color: var(--spectrum-textfield-background-color);
384-
border-color: var(--spectrum-textfield-border-color);
384+
background-color: var(--spectrum-combobox-readonly-input-background-color);
385+
border-color: var(--spectrum-combobox-readonly-input-border-color);
385386

386387
&:hover {
387388
background-color: revert;
@@ -390,13 +391,13 @@
390391
}
391392

392393
&.is-invalid input:read-only {
393-
border-color: var(--highcontrast-textfield-border-color-invalid-default, var(--mod-textfield-border-color-invalid-default, var(--spectrum-textfield-border-color-invalid-default)));
394+
border-color: var(--highcontrast-textfield-border-color-invalid-default, var(--mod-textfield-border-color-invalid-default, var(--spectrum-combobox-readonly-border-color-invalid-default)));
394395
}
395396

396397
&.is-disabled input:read-only {
397-
background-color: var(--mod-textfield-background-color-disabled, var(--spectrum-textfield-background-color-disabled));
398+
background-color: var(--mod-textfield-background-color-disabled, var(--spectrum-combobox-readonly-background-color-disabled));
398399
border-color: transparent;
399-
color: var(--highcontrast-textfield-text-color-disabled, var(--mod-textfield-text-color-disabled, var(--spectrum-textfield-text-color-disabled)));
400+
color: var(--highcontrast-textfield-text-color-disabled, var(--mod-textfield-text-color-disabled, var(--spectrum-combobox-readonly-text-color-disabled)));
400401
}
401402

402403
&.spectrum-Textfield--quiet {
@@ -406,12 +407,13 @@
406407
}
407408

408409
&.is-invalid input:read-only {
409-
border-color: var(--highcontrast-textfield-border-color-invalid-default, var(--mod-textfield-border-color-invalid-default, var(--spectrum-textfield-border-color-invalid-default)));
410+
border-color: var(--highcontrast-textfield-border-color-invalid-default, var(--mod-textfield-border-color-invalid-default, var(--spectrum-combobox-readonly-border-color-invalid-default)));
410411
}
411412
}
412413
}
413414

414415
/* QUIET VARIATION (no visible background) */
416+
/* stylelint-disable-next-line no-duplicate-selectors -- Combobox quiet variation and mods */
415417
.spectrum-Combobox--quiet {
416418
border-radius: 0;
417419

components/combobox/metadata/metadata.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@
164164
"--spectrum-combobox-inline-size",
165165
"--spectrum-combobox-line-height",
166166
"--spectrum-combobox-min-inline-size",
167+
"--spectrum-combobox-readonly-background-color-disabled",
168+
"--spectrum-combobox-readonly-border-color-invalid-default",
169+
"--spectrum-combobox-readonly-input-background-color",
170+
"--spectrum-combobox-readonly-input-border-color",
171+
"--spectrum-combobox-readonly-text-color-disabled",
167172
"--spectrum-combobox-spacing-block-end-edge-to-text",
168173
"--spectrum-combobox-spacing-block-start-edge-to-text",
169174
"--spectrum-combobox-spacing-edge-to-menu",
@@ -196,6 +201,8 @@
196201
"--spectrum-component-top-to-text-75",
197202
"--spectrum-corner-radius-100",
198203
"--spectrum-default-font-style",
204+
"--spectrum-disabled-background-color",
205+
"--spectrum-disabled-content-color",
199206
"--spectrum-field-edge-to-text-quiet",
200207
"--spectrum-field-label-to-component",
201208
"--spectrum-field-label-to-component-quiet-extra-large",
@@ -219,6 +226,7 @@
219226
"--spectrum-font-size-300",
220227
"--spectrum-font-size-75",
221228
"--spectrum-gray-400",
229+
"--spectrum-gray-50",
222230
"--spectrum-gray-500",
223231
"--spectrum-gray-600",
224232
"--spectrum-gray-800",
@@ -229,11 +237,6 @@
229237
"--spectrum-negative-border-color-focus-hover",
230238
"--spectrum-negative-border-color-hover",
231239
"--spectrum-negative-border-color-key-focus",
232-
"--spectrum-textfield-background-color",
233-
"--spectrum-textfield-background-color-disabled",
234-
"--spectrum-textfield-border-color",
235-
"--spectrum-textfield-border-color-invalid-default",
236-
"--spectrum-textfield-text-color-disabled",
237240
"--spectrum-workflow-icon-size-100",
238241
"--spectrum-workflow-icon-size-200",
239242
"--spectrum-workflow-icon-size-300",
@@ -244,7 +247,8 @@
244247
"--system-spectrum-combobox-border-color-focus",
245248
"--system-spectrum-combobox-border-color-focus-hover",
246249
"--system-spectrum-combobox-border-color-hover",
247-
"--system-spectrum-combobox-border-color-key-focus"
250+
"--system-spectrum-combobox-border-color-key-focus",
251+
"--system-spectrum-textfield-border-color"
248252
],
249253
"passthroughs": [
250254
"--mod-picker-button-background-color",

0 commit comments

Comments
 (0)