Skip to content

Fix focus ring clipping and match variant coloring #3536

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
MartinaeyNL merged 2 commits into from
Nov 2, 2026
Merged

Fix focus ring clipping and match variant coloring #3536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
278ca39
Move keyboard focus ring inside the field
Ekhorn Nov 2, 2026
9ad6140
Match button focus ring colors to error and contrast variants
Ekhorn Nov 2, 2026
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 ui/component/theme/src/components/or-vaadin-button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
:host([theme~="primary"]) {
min-width: var(--vaadin-button-min-width, 0);
}
/* Lumo keeps the focus ring in the primary color for every color variant */
:host([theme~="error"]) {
--_focus-ring-color: var(--vaadin-focus-ring-color, var(--lumo-error-color-50pct));
}
:host([theme~="contrast"]) {
--_focus-ring-color: var(--vaadin-focus-ring-color, var(--lumo-contrast-50pct));
}
}

:root::before,
Expand Down
10 changes: 9 additions & 1 deletion ui/component/theme/src/components/or-vaadin-menu-bar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
*/
@import "@vaadin/vaadin-lumo-styles/components/menu-bar.css";

/* The menu bar clips its buttons at its edges, so draw their focus ring inside */
@media lumo_components_menu-bar-button-internal {
:host([focus-ring]) {
box-shadow: inset 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
}
}

:root::before,
:host::before {
--_lumo-vaadin-menu-bar-inject: 1;
Expand All @@ -36,5 +43,6 @@
lumo_components_item, lumo_components_context-menu-item, lumo_components_menu-bar-item;

--_lumo-vaadin-menu-bar-button-inject: 1;
--_lumo-vaadin-menu-bar-button-inject-modules: lumo_components_button, lumo_components_menu-bar-button;
--_lumo-vaadin-menu-bar-button-inject-modules:
lumo_components_button, lumo_components_menu-bar-button, lumo_components_menu-bar-button-internal;
}
4 changes: 4 additions & 0 deletions ui/component/theme/src/mixins/field-internal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@
[class$="container"] {
width: 100%; /* Lumo sets default field container width as 12em */
}
/* Lumo draws the focus ring in the removed padding, so draw it inside the field where no ancestor can clip it */
:host([focus-ring]) [part="input-field"] {
box-shadow: inset 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
}
}
Loading