Skip to content

fix(stepper): focus bugs #2358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pfulton merged 9 commits into from
Dec 15, 2023
Merged

fix(stepper): focus bugs #2358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a6ed495
fix(infieldbutton): no outline on focus-visible
Nov 10, 2023
d3a131a
fix(infieldbutton): high contrast mode has a focus outline
Nov 10, 2023
e408272
fix(stepper): no longer touches InfieldButton classes
Nov 14, 2023
6ab77f8
fix(stepper): button size + space match infieldbutton spec
Nov 16, 2023
c01d2b6
fix(stepper): infieldbutton background unchanged on stepper focus
Dec 11, 2023
5b74dfe
fix(stepper): invalid keyboard focus outline alignment
Dec 11, 2023
4529874
fix(stepper): infieldbutton isnt focusable in stepper
Dec 13, 2023
4ea4e6c
fix(stepper): invalid hover state border color
Dec 13, 2023
8172ec9
docs(stepper): kitchen sink storybook examples for Chromatic
Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions components/infieldbutton/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,14 @@ governing permissions and limitations under the License.
);
}
}

&:hover:not(:disabled),
&:active:not(:disabled),
&:focus-visible:not(:disabled) {
@media (forced-colors: active) {
--highcontrast-infield-button-border-color: Highlight;
}
}
}

.spectrum-InfieldButton {
Expand Down Expand Up @@ -216,8 +224,9 @@ governing permissions and limitations under the License.
);
border-style: solid;
border-color: var(
--mod-infield-button-border-color,
var(--spectrum-infield-button-border-color)
--highcontrast-infield-button-border-color,
var(--mod-infield-button-border-color,
var(--spectrum-infield-button-border-color))
);
border-end-end-radius: var(
--mod-infield-button-border-radius,
Expand Down Expand Up @@ -310,6 +319,8 @@ governing permissions and limitations under the License.
}

&:focus-visible {
outline: none;

.spectrum-InfieldButton-fill {
background-color: var(
--mod-infield-button-background-color-key-focus,
Expand Down Expand Up @@ -406,8 +417,6 @@ governing permissions and limitations under the License.
}
}



.spectrum-InfieldButton-icon {
display: initial;

Expand Down
4 changes: 3 additions & 1 deletion components/infieldbutton/stories/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const Template = ({
iconName = "Add",
isDisabled,
isInvalid,
tabIndex = 0,
...globals
}) => {
const { express } = globals;
Expand All @@ -35,10 +36,11 @@ export const Template = ({
[`${rootClass}--quiet`]: isQuiet,
"is-invalid": isInvalid,
...customClasses.reduce((a, c) => ({ ...a, [c]: true }), {}),
})}
})}
?disabled=${isDisabled}
aria-haspopup="listbox"
type="button"
tabIndex=${tabIndex}
>
<div class="${rootClass}-fill">
${when(iconName, () => Icon({
Expand Down
15 changes: 11 additions & 4 deletions components/stepper/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ governing permissions and limitations under the License.
--mod-stepper-border-color-focus-hover: var(--mod-stepper-border-color-focus-hover-invalid, var(--spectrum-negative-border-color-focus-hover));
--mod-stepper-border-color-keyboard-focus: var(--mod-stepper-border-color-keyboard-focus-invalid, var(--spectrum-negative-border-color-key-focus));
--mod-infield-button-border-color: var(--mod-stepper-border-color-invalid, var(--spectrum-stepper-border-color-invalid));
--mod-textfield-icon-spacing-inline-start-invalid: 0;

&:hover {
--mod-infield-button-border-color: var(--mod-stepper-border-color-hover-invalid, var(--spectrum-negative-border-color-hover));
}

&.is-focused,
&:focus {
Expand All @@ -86,7 +91,6 @@ governing permissions and limitations under the License.
&:focus-visible {
--mod-infield-button-border-color: var(--mod-stepper-border-color-keyboard-focus-invalid, var(--spectrum-stepper-border-color-keyboard-focus-invalid));
}

}
}

Expand Down Expand Up @@ -120,6 +124,7 @@ governing permissions and limitations under the License.
--highcontrast-stepper-focus-indicator-color: Highlight;
}
}

.x {
border-radius: var(--spectrum-stepper-button-border-radius-reset);
}
Expand All @@ -142,9 +147,11 @@ governing permissions and limitations under the License.
}

/*** Hover ***/
&:hover:not(.is-disabled) {
&:hover:not(.is-disabled, .is-invalid) {
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color-hover, var(--mod-stepper-buttons-border-color-hover, var(--spectrum-stepper-buttons-border-color-hover)));
}

&:hover {
.spectrum-Stepper-input,
.spectrum-Stepper-buttons {
border-color: var(--highcontrast-stepper-border-color-hover, var(--mod-stepper-border-color-hover, var(--spectrum-stepper-border-color-hover)));
Expand All @@ -154,12 +161,12 @@ governing permissions and limitations under the License.
/*** Focused ***/
&.is-focused,
&:focus {
--mod-infield-button-background-color: var(--highcontrast-stepper-button-background-color-focus, var(--mod-stepper-button-background-color-focus, var(--spectrum-stepper-button-background-color-focus)));
--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)));

.spectrum-Stepper-input {
outline: none;
}

.spectrum-Stepper-input,
.spectrum-Stepper-buttons {
border-color: var(--highcontrast-stepper-border-color-focus, var(--mod-stepper-border-color-focus, var(--spectrum-stepper-border-color-focus)));
Expand All @@ -178,7 +185,6 @@ governing permissions and limitations under the License.
/*** Keyboard Focused ***/
&.is-keyboardFocused,
&:focus-visible {
--mod-infield-button-background-color: var(--highcontrast-stepper-button-background-color-keyboard-focus, var(--mod-stepper-button-background-color-keyboard-focus, var(--spectrum-stepper-button-background-color-keyboard-focus)));
--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)));

/* keyboard focus indicator is visible */
Expand All @@ -201,6 +207,7 @@ governing permissions and limitations under the License.
/*** Quiet ***/
.spectrum-Stepper.spectrum-Stepper--quiet {
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color, var(--spectrum-stepper-border-color)));

/* quiet corners are not rounded */
border-start-start-radius: 0;
border-start-end-radius: 0;
Expand Down
66 changes: 32 additions & 34 deletions components/stepper/metadata/mods.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
| Modifiable Custom Properties |
| ------------------------------------------------------ |
| `--mod-stepper-animation-duration` |
| `--mod-stepper-border-color` |
| `--mod-stepper-border-color-focus` |
| `--mod-stepper-border-color-focus-hover` |
| `--mod-stepper-border-color-focus-hover-invalid` |
| `--mod-stepper-border-color-focus-invalid` |
| `--mod-stepper-border-color-hover` |
| `--mod-stepper-border-color-hover-invalid` |
| `--mod-stepper-border-color-invalid` |
| `--mod-stepper-border-color-keyboard-focus` |
| `--mod-stepper-border-color-keyboard-focus-invalid` |
| `--mod-stepper-border-radius` |
| `--mod-stepper-border-width` |
| `--mod-stepper-button-background-color-focus` |
| `--mod-stepper-button-background-color-keyboard-focus` |
| `--mod-stepper-button-border-width` |
| `--mod-stepper-button-width` |
| `--mod-stepper-button-width-quiet` |
| `--mod-stepper-buttons-background-color` |
| `--mod-stepper-buttons-border-color` |
| `--mod-stepper-buttons-border-color-focus` |
| `--mod-stepper-buttons-border-color-focus-hover` |
| `--mod-stepper-buttons-border-color-hover` |
| `--mod-stepper-buttons-border-color-keyboard-focus` |
| `--mod-stepper-buttons-border-style` |
| `--mod-stepper-buttons-border-width` |
| `--mod-stepper-focus-indicator-color` |
| `--mod-stepper-focus-indicator-gap` |
| `--mod-stepper-focus-indicator-width` |
| `--mod-stepper-height` |
| `--mod-stepper-min-width-multiplier` |
| `--mod-stepper-width` |
| Modifiable Custom Properties |
| --------------------------------------------------- |
| `--mod-stepper-animation-duration` |
| `--mod-stepper-border-color` |
| `--mod-stepper-border-color-focus` |
| `--mod-stepper-border-color-focus-hover` |
| `--mod-stepper-border-color-focus-hover-invalid` |
| `--mod-stepper-border-color-focus-invalid` |
| `--mod-stepper-border-color-hover` |
| `--mod-stepper-border-color-hover-invalid` |
| `--mod-stepper-border-color-invalid` |
| `--mod-stepper-border-color-keyboard-focus` |
| `--mod-stepper-border-color-keyboard-focus-invalid` |
| `--mod-stepper-border-radius` |
| `--mod-stepper-border-width` |
| `--mod-stepper-button-border-width` |
| `--mod-stepper-button-width` |
| `--mod-stepper-button-width-quiet` |
| `--mod-stepper-buttons-background-color` |
| `--mod-stepper-buttons-border-color` |
| `--mod-stepper-buttons-border-color-focus` |
| `--mod-stepper-buttons-border-color-focus-hover` |
| `--mod-stepper-buttons-border-color-hover` |
| `--mod-stepper-buttons-border-color-keyboard-focus` |
| `--mod-stepper-buttons-border-style` |
| `--mod-stepper-buttons-border-width` |
| `--mod-stepper-focus-indicator-color` |
| `--mod-stepper-focus-indicator-gap` |
| `--mod-stepper-focus-indicator-width` |
| `--mod-stepper-height` |
| `--mod-stepper-min-width-multiplier` |
| `--mod-stepper-width` |
Loading