Skip to content

Commit 4bf992f

Browse files
authored
feat: export context-menu item styles as CSS literals (#5363)
1 parent 93e2bbf commit 4bf992f

6 files changed

Lines changed: 82 additions & 78 deletions

File tree

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import '@vaadin/vaadin-lumo-styles/color.js';
2+
import '@vaadin/vaadin-lumo-styles/font-icons.js';
3+
import '@vaadin/vaadin-lumo-styles/sizing.js';
4+
import '@vaadin/vaadin-lumo-styles/spacing.js';
5+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
6+
7+
const contextMenuItem = css`
8+
/* :hover needed to workaround https://github.com/vaadin/web-components/issues/3133 */
9+
:host(:hover) {
10+
user-select: none;
11+
-ms-user-select: none;
12+
-webkit-user-select: none;
13+
}
14+
15+
:host([role='menuitem'][menu-item-checked]) [part='checkmark']::before {
16+
opacity: 1;
17+
}
18+
19+
:host([aria-haspopup='true'])::after {
20+
font-family: lumo-icons;
21+
font-size: var(--lumo-icon-size-xs);
22+
content: var(--lumo-icons-angle-right);
23+
color: var(--lumo-tertiary-text-color);
24+
}
25+
26+
:host(:not([dir='rtl'])[aria-haspopup='true'])::after {
27+
margin-right: calc(var(--lumo-space-m) * -1);
28+
padding-left: var(--lumo-space-m);
29+
}
30+
31+
:host([expanded]) {
32+
background-color: var(--lumo-primary-color-10pct);
33+
}
34+
35+
/* RTL styles */
36+
:host([dir='rtl'][aria-haspopup='true'])::after {
37+
content: var(--lumo-icons-angle-left);
38+
margin-left: calc(var(--lumo-space-m) * -1);
39+
padding-right: var(--lumo-space-m);
40+
}
41+
`;
42+
43+
registerStyles('vaadin-context-menu-item', contextMenuItem, { moduleId: 'lumo-context-menu-item' });
44+
45+
export { contextMenuItem };
Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import '@vaadin/vaadin-lumo-styles/spacing.js';
22
import '@vaadin/vaadin-lumo-styles/style.js';
3-
import '@vaadin/vaadin-lumo-styles/font-icons.js';
4-
import '@vaadin/vaadin-lumo-styles/color.js';
5-
import '@vaadin/vaadin-lumo-styles/sizing.js';
6-
import '@vaadin/vaadin-lumo-styles/typography.js';
73
import { menuOverlay } from '@vaadin/vaadin-lumo-styles/mixins/menu-overlay.js';
84
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
95

@@ -33,43 +29,3 @@ const contextMenuOverlay = css`
3329
registerStyles('vaadin-context-menu-overlay', [menuOverlay, contextMenuOverlay], {
3430
moduleId: 'lumo-context-menu-overlay',
3531
});
36-
37-
registerStyles(
38-
'vaadin-context-menu-item',
39-
css`
40-
/* :hover needed to workaround https://github.com/vaadin/web-components/issues/3133 */
41-
:host(:hover) {
42-
user-select: none;
43-
-ms-user-select: none;
44-
-webkit-user-select: none;
45-
}
46-
47-
:host([role='menuitem'][menu-item-checked]) [part='checkmark']::before {
48-
opacity: 1;
49-
}
50-
51-
:host([aria-haspopup='true'])::after {
52-
font-family: lumo-icons;
53-
font-size: var(--lumo-icon-size-xs);
54-
content: var(--lumo-icons-angle-right);
55-
color: var(--lumo-tertiary-text-color);
56-
}
57-
58-
:host(:not([dir='rtl'])[aria-haspopup='true'])::after {
59-
margin-right: calc(var(--lumo-space-m) * -1);
60-
padding-left: var(--lumo-space-m);
61-
}
62-
63-
:host([expanded]) {
64-
background-color: var(--lumo-primary-color-10pct);
65-
}
66-
67-
/* RTL styles */
68-
:host([dir='rtl'][aria-haspopup='true'])::after {
69-
content: var(--lumo-icons-angle-left);
70-
margin-left: calc(var(--lumo-space-m) * -1);
71-
padding-right: var(--lumo-space-m);
72-
}
73-
`,
74-
{ moduleId: 'lumo-context-menu-item' },
75-
);

‎packages/context-menu/theme/lumo/vaadin-context-menu.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import './vaadin-context-menu-item-styles.js';
12
import './vaadin-context-menu-list-box-styles.js';
23
import './vaadin-context-menu-styles.js';
34
import '@vaadin/item/theme/lumo/vaadin-item.js';
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import '@vaadin/vaadin-material-styles/font-icons.js';
2+
import '@vaadin/vaadin-material-styles/color.js';
3+
import '@vaadin/vaadin-material-styles/typography.js';
4+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
5+
6+
const contextMenuItem = css`
7+
:host([aria-haspopup='true'])::after {
8+
font-family: material-icons;
9+
font-size: var(--material-icon-font-size);
10+
}
11+
12+
:host(:not([dir='rtl'])[aria-haspopup='true'])::after {
13+
content: var(--material-icons-chevron-right);
14+
padding-left: 9px;
15+
margin-right: -9px;
16+
}
17+
18+
:host([dir='rtl'][aria-haspopup='true'])::after {
19+
content: var(--material-icons-chevron-left);
20+
padding-right: 9px;
21+
margin-left: -9px;
22+
}
23+
24+
:host([menu-item-checked]) [part='checkmark']::before {
25+
content: var(--material-icons-check);
26+
}
27+
28+
:host([expanded]) {
29+
background-color: var(--material-secondary-background-color);
30+
}
31+
`;
32+
33+
registerStyles('vaadin-context-menu-item', contextMenuItem, { moduleId: 'material-context-menu-item' });
34+
35+
export { contextMenuItem };
Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import '@vaadin/vaadin-material-styles/font-icons.js';
2-
import '@vaadin/vaadin-material-styles/color.js';
3-
import '@vaadin/vaadin-material-styles/typography.js';
41
import { menuOverlay } from '@vaadin/vaadin-material-styles/mixins/menu-overlay.js';
52
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
63

@@ -14,34 +11,3 @@ const contextMenuOverlay = css`
1411
registerStyles('vaadin-context-menu-overlay', [menuOverlay, contextMenuOverlay], {
1512
moduleId: 'material-context-menu-overlay',
1613
});
17-
18-
registerStyles(
19-
'vaadin-context-menu-item',
20-
css`
21-
:host([aria-haspopup='true'])::after {
22-
font-family: material-icons;
23-
font-size: var(--material-icon-font-size);
24-
}
25-
26-
:host(:not([dir='rtl'])[aria-haspopup='true'])::after {
27-
content: var(--material-icons-chevron-right);
28-
padding-left: 9px;
29-
margin-right: -9px;
30-
}
31-
32-
:host([dir='rtl'][aria-haspopup='true'])::after {
33-
content: var(--material-icons-chevron-left);
34-
padding-right: 9px;
35-
margin-left: -9px;
36-
}
37-
38-
:host([menu-item-checked]) [part='checkmark']::before {
39-
content: var(--material-icons-check);
40-
}
41-
42-
:host([expanded]) {
43-
background-color: var(--material-secondary-background-color);
44-
}
45-
`,
46-
{ moduleId: 'material-context-menu-item' },
47-
);

‎packages/context-menu/theme/material/vaadin-context-menu.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import './vaadin-context-menu-item-styles.js';
12
import './vaadin-context-menu-list-box-styles.js';
23
import './vaadin-context-menu-styles.js';
34
import '@vaadin/item/theme/material/vaadin-item.js';

0 commit comments

Comments
 (0)