Skip to content

Commit 6ff1635

Browse files
authored
fix: add well contrasting focus-ring to buttons on themed notifications (#7488)
* Add well contrasting border to buttons on themed notifications * Add tests for focus over theme variant notifcation ---------
1 parent dcb4fc1 commit 6ff1635

7 files changed

Lines changed: 49 additions & 4 deletions

File tree

‎packages/button/theme/lumo/vaadin-button-styles.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ const button = css`
3030
--_button-size: var(--vaadin-button-height, var(--lumo-button-size));
3131
--_focus-ring-color: var(--vaadin-focus-ring-color, var(--lumo-primary-color-50pct));
3232
--_focus-ring-width: var(--vaadin-focus-ring-width, 2px);
33-
--_focus-ring-gap-on: 0;
34-
--_focus-ring-gap-color: var(--lumo-base-color);
3533
/* Used by notification */
3634
--_lumo-button-background: var(--vaadin-button-background, var(--lumo-contrast-5pct));
3735
--_lumo-button-text-color: var(--vaadin-button-text-color, var(--lumo-primary-text-color));
@@ -103,8 +101,8 @@ const button = css`
103101
/* Keyboard focus */
104102
105103
:host([focus-ring]) {
106-
box-shadow: 0 0 0 calc(1px * var(--_focus-ring-gap-on)) var(--_focus-ring-gap-color),
107-
0 0 0 calc(var(--_focus-ring-width) + 1px * var(--_focus-ring-gap-on)) var(--_focus-ring-color);
104+
box-shadow: 0 0 0 calc(1px * var(--_focus-ring-gap-on, 0)) var(--_focus-ring-gap-color, var(--lumo-base-color)),
105+
0 0 0 calc(var(--_focus-ring-width) + 1px * var(--_focus-ring-gap-on, 0)) var(--_focus-ring-color);
108106
}
109107
110108
:host([theme~='primary'][focus-ring]) {

‎packages/notification/test/visual/lumo/notification.test.js‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
2+
import { sendKeys } from '@web/test-runner-commands';
23
import { visualDiff } from '@web/test-runner-visual-regression';
34
import '../../not-animated-styles.js';
45
import '../../../theme/lumo/vaadin-notification.js';
6+
import '../../../../button/theme/lumo/vaadin-button.js';
57

68
describe('notification', () => {
79
let element;
@@ -36,3 +38,28 @@ describe('notification', () => {
3638
});
3739
});
3840
});
41+
describe('themes', () => {
42+
let element;
43+
44+
beforeEach(() => {
45+
element = fixtureSync('<vaadin-notification duration="0"></vaadin-notification>');
46+
element.renderer = (root) => {
47+
root.innerHTML = '<vaadin-button>Button</vaadin-button>';
48+
};
49+
element.opened = true;
50+
});
51+
52+
afterEach(() => {
53+
element.opened = false;
54+
});
55+
56+
['primary', 'warning', 'success', 'error'].forEach((variant) => {
57+
it(variant, async () => {
58+
element.setAttribute('theme', variant);
59+
const notification = document.querySelector('vaadin-notification-card');
60+
61+
await sendKeys({ press: 'Tab' });
62+
await visualDiff(notification, `notification-${variant}-focus-ring-contrast`);
63+
});
64+
});
65+
});
3.3 KB
Loading
3.25 KB
Loading
3.32 KB
Loading
3.37 KB
Loading

‎packages/notification/theme/lumo/vaadin-notification-styles.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,26 @@ registerStyles(
132132
animation: lumo-notification-exit-slide-down 300ms;
133133
}
134134
135+
:host([theme='success']) {
136+
--_focus-ring-gap-color: var(--lumo-success-color);
137+
--vaadin-focus-ring-color: var(--lumo-success-contrast-color);
138+
}
139+
140+
:host([theme='warning']) {
141+
--_focus-ring-gap-color: var(--lumo-warning-color);
142+
--vaadin-focus-ring-color: var(--lumo-warning-contrast-color);
143+
}
144+
145+
:host([theme='error']) {
146+
--_focus-ring-gap-color: var(--lumo-error-color);
147+
--vaadin-focus-ring-color: var(--lumo-error-contrast-color);
148+
}
149+
150+
:host([theme='primary']) {
151+
--_focus-ring-gap-color: var(--lumo-primary-color);
152+
--vaadin-focus-ring-color: var(--lumo-primary-contrast-color);
153+
}
154+
135155
:host([theme~='primary']) [part='overlay'] {
136156
background: var(--lumo-primary-color);
137157
color: var(--lumo-primary-contrast-color);

0 commit comments

Comments
 (0)