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

💄 Focus-visible #1966

Merged
merged 13 commits into from
May 10, 2023
+533 −81
Merged

💄 Focus-visible #1966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9570156
:art: Button focus-visible
KenAJoh May 10, 2023
3dc93c5
:art: Chips
KenAJoh May 10, 2023
f0d7c6b
:art: Date focus-visible
KenAJoh May 10, 2023
c5e5520
:art: expansioncard focus-visible
KenAJoh May 10, 2023
fdd81cb
:art: Helptext
KenAJoh May 10, 2023
9e4e0a6
:art: general components focus-visible
KenAJoh May 10, 2023
72034a6
:art: Checkbox focus-visible
KenAJoh May 10, 2023
2dda64d
:art: All form components with focus-visible
KenAJoh May 10, 2023
42aaa76
:bug: Fikset checkbox hover/focus
KenAJoh May 10, 2023
6c10bf4
:art: Internal focus-visible
KenAJoh May 10, 2023
3b9bc8d
:memo: Changeset
KenAJoh May 10, 2023
12de011
Merge branch 'main' into focus-visible
KenAJoh May 10, 2023
637b122
Merge branch 'main' into focus-visible
KenAJoh May 10, 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
7 changes: 7 additions & 0 deletions .changeset/silent-fishes-glow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@navikt/ds-css": minor
"@navikt/ds-css-internal": minor
---

:lipstick: Alle komponenter bruker nå default `:focus-visible` for fokusmarkering.
(Alle komponenter som bruker `:focus-visible` har også en fallback for `:focus`)
99 changes: 87 additions & 12 deletions @navikt/core/css/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,18 @@
padding: var(--ac-button-padding-icon-only-xsmall, var(--__ac-button-padding));
}

.navds-button:focus {
.navds-button:focus-visible {
outline: none;
box-shadow: var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button:focus {
outline: none;
box-shadow: var(--a-shadow-focus);
}
}

.navds-button__icon {
--ac-button-icon-margin: -4px;

Expand Down Expand Up @@ -114,10 +121,16 @@
background-color: var(--ac-button-primary-active-bg, var(--a-surface-action-active));
}

.navds-button--primary:focus {
.navds-button--primary:focus-visible {
box-shadow: inset 0 0 0 1px var(--ac-button-primary-focus-border, var(--a-surface-default)), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--primary:focus {
box-shadow: inset 0 0 0 1px var(--ac-button-primary-focus-border, var(--a-surface-default)), var(--a-shadow-focus);
}
}

.navds-button--primary:hover:where(:disabled, .navds-button--disabled),
.navds-button--primary:active:where(:disabled, .navds-button--disabled) {
background-color: var(--ac-button-primary-bg, var(--a-surface-action));
Expand All @@ -140,10 +153,16 @@
background-color: var(--ac-button-primary-neutral-active-bg, var(--a-surface-neutral-active));
}

.navds-button--primary-neutral:focus {
.navds-button--primary-neutral:focus-visible {
box-shadow: inset 0 0 0 1px var(--ac-button-primary-neutral-focus-border, var(--a-surface-default)), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--primary-neutral:focus {
box-shadow: inset 0 0 0 1px var(--ac-button-primary-neutral-focus-border, var(--a-surface-default)), var(--a-shadow-focus);
}
}

.navds-button--primary-neutral:hover:where(:disabled, .navds-button--disabled),
.navds-button--primary-neutral:active:where(:disabled, .navds-button--disabled) {
background-color: var(--ac-button-primary-neutral-bg, var(--a-surface-neutral));
Expand All @@ -164,20 +183,32 @@
background-color: var(--ac-button-secondary-hover-bg, var(--a-surface-action-subtle-hover));
}

.navds-button--secondary:focus {
.navds-button--secondary:focus-visible {
box-shadow: inset 0 0 0 2px var(--ac-button-secondary-focus-border, var(--a-border-action)), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--secondary:focus {
box-shadow: inset 0 0 0 2px var(--ac-button-secondary-focus-border, var(--a-border-action)), var(--a-shadow-focus);
}
}

.navds-button--secondary:active {
color: var(--ac-button-secondary-active-text, var(--a-text-on-action));
background-color: var(--ac-button-secondary-active-bg, var(--a-surface-action-active));
box-shadow: none;
}

.navds-button--secondary:focus:active {
.navds-button--secondary:focus-visible:active {
box-shadow: inset 0 0 0 1px var(--ac-button-secondary-active-focus-border, var(--a-surface-default)), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--secondary:focus:active {
box-shadow: inset 0 0 0 1px var(--ac-button-secondary-active-focus-border, var(--a-surface-default)), var(--a-shadow-focus);
}
}

.navds-button--secondary:where(:disabled, .navds-button--disabled),
.navds-button--secondary:hover:where(:disabled, .navds-button--disabled) {
color: var(--ac-button-secondary-text, var(--a-text-action));
Expand All @@ -199,22 +230,36 @@
background-color: var(--ac-button-secondary-neutral-hover-bg, var(--a-surface-neutral-subtle-hover));
}

.navds-button--secondary-neutral:focus {
.navds-button--secondary-neutral:focus-visible {
color: var(--ac-button-secondary-neutral-text, var(--a-text-default));
box-shadow: inset 0 0 0 2px var(--ac-button-secondary-neutral-focus-border, var(--a-border-strong)), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--secondary-neutral:focus {
color: var(--ac-button-secondary-neutral-text, var(--a-text-default));
box-shadow: inset 0 0 0 2px var(--ac-button-secondary-neutral-focus-border, var(--a-border-strong)), var(--a-shadow-focus);
}
}

.navds-button--secondary-neutral:active {
color: var(--ac-button-secondary-neutral-active-text, var(--a-text-on-neutral));
background-color: var(--ac-button-secondary-neutral-active-bg, var(--a-surface-neutral-active));
box-shadow: none;
}

.navds-button--secondary-neutral:focus:active {
.navds-button--secondary-neutral:focus-visible:active {
box-shadow: inset 0 0 0 1px var(--ac-button-secondary-neutral-active-focus-border, var(--a-surface-default)),
var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--secondary-neutral:focus:active {
box-shadow: inset 0 0 0 1px var(--ac-button-secondary-neutral-active-focus-border, var(--a-surface-default)),
var(--a-shadow-focus);
}
}

.navds-button--secondary-neutral:where(:disabled, .navds-button--disabled),
.navds-button--secondary-neutral:hover:where(:disabled, .navds-button--disabled) {
color: var(--ac-button-secondary-neutral-text, var(--a-text-default));
Expand All @@ -236,10 +281,16 @@
background-color: var(--ac-button-tertiary-hover-bg, var(--a-surface-action-subtle-hover));
}

.navds-button--tertiary:focus {
.navds-button--tertiary:focus-visible {
box-shadow: inset 0 0 0 2px var(--ac-button-tertiary-focus-border, var(--a-border-action)), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--tertiary:focus {
box-shadow: inset 0 0 0 2px var(--ac-button-tertiary-focus-border, var(--a-border-action)), var(--a-shadow-focus);
}
}

.navds-button--tertiary:active {
color: var(--ac-button-tertiary-active-text, var(--a-text-on-action));
background-color: var(--ac-button-tertiary-active-bg, var(--a-surface-action-active));
Expand All @@ -250,10 +301,16 @@
background-color: var(--ac-button-tertiary-active-hover-bg, var(--a-surface-action-active));
}

.navds-button--tertiary:active:focus {
.navds-button--tertiary:focus-visible:active {
box-shadow: inset 0 0 0 1px var(--a-surface-default), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--tertiary:focus:active {
box-shadow: inset 0 0 0 1px var(--a-surface-default), var(--a-shadow-focus);
}
}

.navds-button--tertiary:where(:disabled, .navds-button--disabled),
.navds-button--tertiary:hover:where(:disabled, .navds-button--disabled),
.navds-button--tertiary:active:where(:disabled, .navds-button--disabled),
Expand All @@ -276,10 +333,16 @@
background-color: var(--ac-button-tertiary-neutral-hover-bg, var(--a-surface-neutral-subtle-hover));
}

.navds-button--tertiary-neutral:focus {
.navds-button--tertiary-neutral:focus-visible {
box-shadow: inset 0 0 0 2px var(--ac-button-tertiary-neutral-focus-border, var(--a-border-strong)), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--tertiary-neutral:focus {
box-shadow: inset 0 0 0 2px var(--ac-button-tertiary-neutral-focus-border, var(--a-border-strong)), var(--a-shadow-focus);
}
}

.navds-button--tertiary-neutral:active {
color: var(--ac-button-tertiary-neutral-active-text, var(--a-text-on-neutral));
background-color: var(--ac-button-tertiary-neutral-active-bg, var(--a-surface-neutral-active));
Expand All @@ -290,10 +353,16 @@
background-color: var(--ac-button-tertiary-neutral-active-hover-bg, var(--a-surface-neutral-active));
}

.navds-button--tertiary-neutral:active:focus {
.navds-button--tertiary-neutral:focus-visible:active {
box-shadow: inset 0 0 0 1px var(--a-surface-default), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--tertiary-neutral:focus:active {
box-shadow: inset 0 0 0 1px var(--a-surface-default), var(--a-shadow-focus);
}
}

.navds-button--tertiary-neutral:where(:disabled, .navds-button--disabled),
.navds-button--tertiary-neutral:hover:where(:disabled, .navds-button--disabled),
.navds-button--tertiary-neutral:active:where(:disabled, .navds-button--disabled),
Expand All @@ -320,10 +389,16 @@
background-color: var(--ac-button-danger-active-bg, var(--a-surface-danger-active));
}

.navds-button--danger:focus {
.navds-button--danger:focus-visible {
box-shadow: inset 0 0 0 1px var(--a-surface-default), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-button--danger:focus {
box-shadow: inset 0 0 0 1px var(--a-surface-default), var(--a-shadow-focus);
}
}

.navds-button--danger:active:where(:disabled, .navds-button--disabled),
.navds-button--danger:hover:where(:disabled, .navds-button--disabled) {
background-color: var(--ac-button-danger-bg, var(--a-surface-danger));
Expand Down
5 changes: 0 additions & 5 deletions @navikt/core/css/chat.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@
gap: var(--a-spacing-2);
}

.navds-chat__bubble:focus {
box-shadow: var(--a-shadow-focus);
outline: none;
}

.navds-chat--right .navds-chat__bubble {
border-radius: var(--a-border-radius-xlarge);
border-bottom-right-radius: 2px;
Expand Down
24 changes: 24 additions & 0 deletions @navikt/core/css/chips.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@
box-shadow: inset 0 0 0 1px var(--a-surface-default), 0 0 0 2px var(--ac-chip-toggle-focus, var(--a-border-focus));
}

@supports not selector(:focus-visible) {
.navds-chips__toggle:focus {
outline: none;
box-shadow: 0 0 0 2px var(--ac-chip-toggle-focus, var(--a-border-focus));
}

.navds-chips__toggle[aria-pressed="true"]:focus,
.navds-chips__toggle:active:focus {
box-shadow: inset 0 0 0 1px var(--a-surface-default), 0 0 0 2px var(--ac-chip-toggle-focus, var(--a-border-focus));
}
}

.navds-chips__removable {
gap: 0;
}
Expand Down Expand Up @@ -117,6 +129,18 @@
box-shadow: 0 0 0 2px var(--a-border-focus);
}

@supports not selector(:focus-visible) {
.navds-chips__removable--action:focus {
outline: none;
box-shadow: inset 0 0 0 1px var(--a-surface-default), 0 0 0 2px var(--a-border-focus);
}

.navds-chips__removable--neutral:focus {
outline: none;
box-shadow: 0 0 0 2px var(--a-border-focus);
}
}

.navds-chips__removable--action:hover {
background-color: var(--ac-chip-removable-action-hover-bg, var(--a-surface-action-selected-hover));
}
Expand Down
50 changes: 42 additions & 8 deletions @navikt/core/css/date.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,30 @@
border-radius: var(--a-border-radius-xlarge);
}

.navds-date .rdp-button:not(.rdp-day_selected):not([disabled]):focus,
.navds-date .navds-date__month-button:not(.rdp-day_selected):not([disabled]):focus {
.navds-date .rdp-button:not(.rdp-day_selected):not([disabled]):focus-visible,
.navds-date .navds-date__month-button:not(.rdp-day_selected):not([disabled]):focus-visible {
box-shadow: var(--a-shadow-focus);
}

.navds-date .rdp-button.rdp-day_selected:not([disabled]):focus,
.navds-date .navds-date__month-button.rdp-day_selected:not([disabled]):focus {
@supports not selector(:focus-visible) {
.navds-date .rdp-button:not(.rdp-day_selected):not([disabled]):focus,
.navds-date .navds-date__month-button:not(.rdp-day_selected):not([disabled]):focus {
box-shadow: var(--a-shadow-focus);
}
}

.navds-date .rdp-button.rdp-day_selected:not([disabled]):focus-visible,
.navds-date .navds-date__month-button.rdp-day_selected:not([disabled]):focus-visible {
box-shadow: inset 0 0 0 1px var(--a-surface-default), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-date .rdp-button.rdp-day_selected:not([disabled]):focus,
.navds-date .navds-date__month-button.rdp-day_selected:not([disabled]):focus {
box-shadow: inset 0 0 0 1px var(--a-surface-default), var(--a-shadow-focus);
}
}

/* Monthpicker */
.navds-date__month-button {
all: unset;
Expand All @@ -94,12 +108,20 @@
cursor: pointer;
}

.navds-date__month-button:focus,
.navds-monthpicker__caption-button:focus {
.navds-date__month-button:focus-visible,
.navds-monthpicker__caption-button:focus-visible {
box-shadow: var(--a-shadow-focus);
z-index: 1;
}

@supports not selector(:focus-visible) {
.navds-date__month-button:focus,
.navds-monthpicker__caption-button:focus {
box-shadow: var(--a-shadow-focus);
z-index: 1;
}
}

.navds-date__year-label {
display: flex;
align-items: center;
Expand All @@ -126,11 +148,17 @@
}

/* Focus layering */
.navds-date__field-input:focus,
.navds-date__field-input:focus-visible,
.navds-date__field-button {
z-index: 1;
}

@supports not selector(:focus-visible) {
.navds-date__field-input:focus {
z-index: 1;
}
}

.navds-date .rdp-day_selected,
.navds-monthpicker__month--selected {
color: var(--ac-date-selected-text, var(--a-text-on-action));
Expand Down Expand Up @@ -183,10 +211,16 @@
box-shadow: inset 0 0 0 1px var(--ac-date-input-error-border, var(--a-border-danger));
}

.navds-date__field--error .navds-date__field-input:focus:not(:hover):not(:disabled) {
.navds-date__field--error .navds-date__field-input:focus-visible:not(:hover):not(:disabled) {
box-shadow: inset 0 0 0 1px var(--ac-date-input-error-border, var(--a-border-danger)), var(--a-shadow-focus);
}

@supports not selector(:focus-visible) {
.navds-date__field--error .navds-date__field-input:focus:not(:hover):not(:disabled) {
box-shadow: inset 0 0 0 1px var(--ac-date-input-error-border, var(--a-border-danger)), var(--a-shadow-focus);
}
}

.navds-date__field-button {
position: absolute;
right: var(--a-spacing-2);
Expand Down
10 changes: 7 additions & 3 deletions @navikt/core/css/expansioncard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,16 @@
transform: translateY(1px);
}

.navds-expansioncard__header-button:focus {
.navds-expansioncard__header-button:focus-visible {
outline: none;
box-shadow: var(--a-shadow-focus);
}

.navds-expansioncard__header-button:focus-visible {
box-shadow: var(--a-shadow-focus);
@supports not selector(:focus-visible) {
.navds-expansioncard__header-button:focus {
outline: none;
box-shadow: var(--a-shadow-focus);
}
}

.navds-expansioncard--open :where(.navds-expansioncard__header-button):hover :where(.navds-expansioncard__header-chevron) {
Expand Down
Loading