@vaadin/context-menu 22.0.3 → 22.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vaadin/context-menu",
|
|
3
|
-
"version": "22.0.
|
|
3
|
+
"version": "22.0.6",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -35,19 +35,19 @@
|
|
|
35
35
|
"@open-wc/dedupe-mixin": "^1.3.0",
|
|
36
36
|
"@polymer/iron-media-query": "^3.0.0",
|
|
37
37
|
"@polymer/polymer": "^3.0.0",
|
|
38
|
-
"@vaadin/component-base": "^22.0.
|
|
39
|
-
"@vaadin/item": "^22.0.
|
|
40
|
-
"@vaadin/list-box": "^22.0.
|
|
41
|
-
"@vaadin/vaadin-lumo-styles": "^22.0.
|
|
42
|
-
"@vaadin/vaadin-material-styles": "^22.0.
|
|
43
|
-
"@vaadin/vaadin-overlay": "^22.0.
|
|
44
|
-
"@vaadin/vaadin-themable-mixin": "^22.0.
|
|
38
|
+
"@vaadin/component-base": "^22.0.6",
|
|
39
|
+
"@vaadin/item": "^22.0.6",
|
|
40
|
+
"@vaadin/list-box": "^22.0.6",
|
|
41
|
+
"@vaadin/vaadin-lumo-styles": "^22.0.6",
|
|
42
|
+
"@vaadin/vaadin-material-styles": "^22.0.6",
|
|
43
|
+
"@vaadin/vaadin-overlay": "^22.0.6",
|
|
44
|
+
"@vaadin/vaadin-themable-mixin": "^22.0.6"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@esm-bundle/chai": "^4.3.4",
|
|
48
|
-
"@vaadin/polymer-legacy-adapter": "^22.0.
|
|
48
|
+
"@vaadin/polymer-legacy-adapter": "^22.0.6",
|
|
49
49
|
"@vaadin/testing-helpers": "^0.3.2",
|
|
50
50
|
"sinon": "^9.2.1"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "18c55872d764e338e0f98e65826cbe895156251a"
|
|
53
53
|
}
|
|
@@ -242,9 +242,11 @@ export const ItemsMixin = (superClass) =>
|
|
|
242
242
|
|
|
243
243
|
/** @protected */
|
|
244
244
|
_setMenuItemTheme(component, item, hostTheme) {
|
|
245
|
-
|
|
245
|
+
// Use existing component theme when it is provided
|
|
246
|
+
let theme = component.getAttribute('theme') || hostTheme;
|
|
246
247
|
|
|
247
|
-
//
|
|
248
|
+
// Item theme takes precedence over host theme / component theme
|
|
249
|
+
// even if it's empty, as long as it's not undefined or null
|
|
248
250
|
if (item.theme != null) {
|
|
249
251
|
theme = Array.isArray(item.theme) ? item.theme.join(' ') : item.theme;
|
|
250
252
|
}
|