Skip to content

Commit 2e9834f

Browse files
fix(stepper): ensure mod passthroughs can still be surfaced
1 parent a8aa2a4 commit 2e9834f

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

components/stepper/index.css

+16-11
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146

147147
&.is-keyboardFocused {
148148
/* quiet focus indicator only on bottom border */
149-
--mod-stepper-focus-indicator-visibility: visible;
149+
--mod-stepper-focus-indicator-visibility: var(--mod-stepper-focus-indicator-visibility-keyboard-focus, visible);
150150
}
151151
}
152152

@@ -170,29 +170,28 @@
170170
--mod-textfield-border-color-disabled: var(--spectrum-stepper-border-color-disabled);
171171
}
172172

173-
&:hover:not(.is-invalid, .is-disabled, .is-focused) {
173+
&:hover:not(.is-invalid, .is-disabled, .is-focused, .is-keyboardFocused) {
174174
--mod-infield-button-border-color: var(--mod-stepper-buttons-border-color-hover, var(--spectrum-stepper-buttons-border-color-hover));
175175
}
176176

177177
&:not(.is-disabled) {
178-
.is-focused,
178+
&.is-focused,
179179
&:focus {
180180
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color-focus, var(--mod-stepper-buttons-border-color-focus, var(--spectrum-stepper-buttons-border-color-focus)));
181-
--mod-textfield-focus-indicator-width: 0;
181+
--mod-textfield-focus-indicator-width: var(--mod-stepper-focus-indicator-width, 0);
182182

183183
&:hover {
184-
/* stylelint-disable-next-line spectrum-tools/no-unknown-custom-properties -- allows for --spectrum-stepper-buttons-border-color-focus-hover to be defined outside of current context */
185-
--mod-infield-button-border-color: var(--mod-stepper-buttons-border-color-focus-hover, var(--spectrum-stepper-buttons-border-color-focus-hover));
186-
--mod-textfield-focus-indicator-width: 0;
187-
--mod-textfield-border-color: var(--highcontrast-stepper-border-color-focus-hover, var(--mod-stepper-border-color-focus-hover, var(--spectrum-stepper-border-color-focus-hover)));
184+
--mod-infield-button-border-color: var(--mod-stepper-buttons-border-color-focus-hover, var(--spectrum-stepper-border-color-focus-hover));
185+
--mod-textfield-focus-indicator-width: var(--mod-stepper-focus-indicator-width, 0);
186+
--mod-textfield-border-color-focus: var(--mod-stepper-border-color-focus, var(--spectrum-stepper-border-color-focus-hover));
188187
}
189188
}
190189

191190
&.is-keyboardFocused,
192191
&:focus-visible {
193192
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color-keyboard-focus, var(--mod-stepper-buttons-border-color-keyboard-focus, var(--spectrum-stepper-buttons-border-color-keyboard-focus)));
194-
--mod-textfield-focus-indicator-width: 0;
195-
--mod-textfield-border-color: var(--highcontrast-stepper-border-color-keyboard-focus, var(--mod-stepper-border-color-keyboard-focus, var(--spectrum-stepper-border-color-keyboard-focus)));
193+
--mod-textfield-focus-indicator-width: var(--mod-stepper-focus-indicator-width, 0);
194+
--mod-textfield-border-color-hover: var(--highcontrast-stepper-border-color-keyboard-focus, var(--mod-stepper-border-color-keyboard-focus, var(--spectrum-stepper-border-color-keyboard-focus)));
196195

197196
/* keyboard focus indicator is visible */
198197
outline: var(--spectrum-stepper-focus-indicator-width) solid;
@@ -207,14 +206,17 @@
207206

208207
&:hover {
209208
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-hover-invalid, var(--spectrum-negative-border-color-hover)));
209+
--mod-textfield-border-color-hover: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-focus-hover-invalid, var(--spectrum-stepper-border-color-focus-hover-invalid)));
210210
}
211211

212212
&.is-focused,
213213
&:focus {
214214
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-focus-invalid, var(--spectrum-stepper-border-color-focus-invalid)));
215+
--mod-textfield-border-color-focus: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-focus-invalid, var(--spectrum-stepper-border-color-focus-invalid)));
215216

216217
&:hover {
217218
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-focus-hover-invalid, var(--spectrum-stepper-border-color-focus-hover-invalid)));
219+
--mod-textfield-border-color-invalid-hover: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-focus-hover-invalid, var(--spectrum-stepper-border-color-focus-hover-invalid)));
218220
}
219221
}
220222

@@ -254,15 +256,18 @@
254256
/* stylelint-disable-next-line max-nesting-depth -- @todo reduce complexity of selectors */
255257
&:hover {
256258
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-focus-hover, var(--spectrum-stepper-border-color-focus-hover)));
259+
--mod-textfield-border-color-focus: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-focus-hover, var(--spectrum-stepper-border-color-focus-hover)));
257260
}
258261
}
259262

260263
&.is-keyboardFocused {
261264
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-keyboard-focus, var(--spectrum-stepper-border-color-keyboard-focus)));
265+
--mod-textfield-border-color-keyboard-focus: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-keyboard-focus, var(--spectrum-stepper-border-color-keyboard-focus)));
262266

263267
/* stylelint-disable-next-line max-nesting-depth -- @todo reduce complexity of selectors */
264268
&:hover {
265-
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-hover, var(--spectrum-stepper-border-color-hover)));
269+
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-hover, var(--spectrum-stepper-border-color-keyboard-focus)));
270+
--mod-textfield-border-color-hover: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color-hover, var(--spectrum-stepper-border-color-keyboard-focus)));
266271
}
267272
}
268273
}

0 commit comments

Comments
 (0)