Skip to content
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

Jump to bottom

"Dropdown" component - Fix issues with focus - Part 1 #259

Merged
merged 6 commits into from
May 4, 2022
Merged

"Dropdown" component - Fix issues with focus - Part 1 #259

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a56d81f
possible fix for part of the problems related to focus states in `Dro…
didoo Apr 28, 2022
42da19c
fixed color of text for `focus` state
didoo Apr 28, 2022
13703d7
set `shouldSelfFocus=true` on the `Disclosure` component
didoo May 3, 2022
5c93fbe
removed test
didoo May 3, 2022
478b306
changeset
didoo May 4, 2022
c2a8f70
fixed typo
didoo May 4, 2022
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
2 changes: 1 addition & 1 deletion packages/components/addon/components/hds/disclosure/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="hds-disclosure__content"
{{focus-trap
isActive=this.isActive
shouldSelfFocus=false
shouldSelfFocus=true
focusTrapOptions=(hash clickOutsideDeactivates=this.clickOutsideDeactivates onDeactivate=this.onDeactivate)
}}
>
Expand Down
73 changes: 33 additions & 40 deletions packages/components/app/styles/components/dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,18 @@ $hds-dropdown-toggle-border-radius: 5px;
// Notice: to avoid too much duplication we define two local CSS variables
// and define their values in the color variants below

&:hover,
&.is-hover {
color: var(--current-color-hover);
&::before {
background-color: currentColor;
}
}

// default focus for browsers that still rely on ":focus"
&:focus,
&.is-focus {
color: var(--current-color-focus);
&::after {
background-color: var(--current-background-color);
box-shadow: var(--current-focus-ring-box-shadow);
Expand All @@ -286,22 +295,39 @@ $hds-dropdown-toggle-border-radius: 5px;
// undo the previous declaration for browsers that support ":focus-visible" but wouldn't normally show default focus styles
&:focus:not(:focus-visible) {
&::after {
background-color: transparent;
box-shadow: none;
}
}
// set focus for browsers that support ":focus-visible"
&:focus-visible {
color: var(--current-color-focus);
&::after {
background-color: var(--current-background-color);
box-shadow: var(--current-focus-ring-box-shadow);
left: 4px;
}
}

// remove the focus ring on "active + focused" state (by design)
&:focus:active,
&:focus-visible:active,
&.is-focus.is-active {
&::after {
background-color: var(--current-background-color);
box-shadow: none;
left: 10px;
}
}

&:active,
&.is-active {
color: var(--current-color-active);
&::before {
background-color: currentColor;
}
&::after {
background-color: var(--current-background-color);
}
}
}
Expand All @@ -320,30 +346,12 @@ $hds-dropdown-toggle-border-radius: 5px;
color: var(--token-color-foreground-primary);

// assign the values to the local CSS variables used above
--current-color-hover: var(--token-color-foreground-action-hover);
--current-color-focus: var(--token-color-foreground-action-active);
--current-color-active: var(--token-color-foreground-action-active);
&::after {
--current-background-color: var(--token-color-surface-action);
--current-focus-ring-box-shadow: var(
--token-focus-ring-action-box-shadow
);
}

&:hover,
&.is-hover {
color: var(--token-color-foreground-action-hover);
&::before {
background-color: currentColor;
}
}

&:active,
&.is-active {
color: var(--token-color-foreground-action-active);
&::before {
background-color: currentColor;
}
&::after {
background-color: var(--token-color-surface-action);
}
--current-focus-ring-box-shadow: var(--token-focus-ring-action-box-shadow);
}
}
}
Expand All @@ -353,28 +361,13 @@ $hds-dropdown-toggle-border-radius: 5px;
color: var(--token-color-foreground-critical);

// assign the values to the local CSS variables used above
--current-color-hover: var(--token-color-palette-red-300);
--current-color-focus: var(--token-color-palette-red-400);
--current-color-active: var(--token-color-palette-red-400);
&::after {
--current-background-color: var(--token-color-surface-critical);
--current-focus-ring-box-shadow: var(--token-focus-ring-critical-box-shadow);
}

&:hover,
&.is-hover {
color: var(--token-color-palette-red-300);
&::before {
background-color: currentColor;
}
}
&:active,
&.is-active {
color: var(--token-color-palette-red-400);
&::before {
background-color: currentColor;
}
&::after {
background-color: var(--token-color-surface-critical);
}
}
}
}

Expand Down
17 changes: 0 additions & 17 deletions packages/components/tests/integration/components/hds/disclosure/index-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,23 +81,6 @@ module('Integration | Component | hds/disclosure/index', function (hooks) {

// FOCUS

test('it should focus the first item in the "content" when the "toggle" is clicked', async function (assert) {
await render(hbs`
<Hds::Disclosure>
<:toggle as |t|>
<button type="button" id="test-disclosure-button" {{on "click" t.onClickToggle}} />
</:toggle>
<:content>
<a id="test-disclosure-link-1" href="#">test1</a>
<a id="test-disclosure-link-2" href="#">test2</a>
</:content>
</Hds::Disclosure>
`);
await click('button#test-disclosure-button');
await waitNextExecutionFrame();
assert.dom('a#test-disclosure-link-1').isFocused();
});

// TODO this doesn't work
// see https://github.com/emberjs/ember-test-helpers/issues/738
// https://discord.com/channels/480462759797063690/480523424121356298/842578755633545276
Expand Down