@vaadin/context-menu 23.1.0-beta4 → 23.1.0-rc3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/context-menu",
-  "version": "23.1.0-beta4",
+  "version": "23.1.0-rc3",
   "publishConfig": {
     "access": "public"
   },
@@ -37,20 +37,20 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.1.0-beta4",
-    "@vaadin/item": "23.1.0-beta4",
-    "@vaadin/list-box": "23.1.0-beta4",
-    "@vaadin/lit-renderer": "23.1.0-beta4",
-    "@vaadin/vaadin-lumo-styles": "23.1.0-beta4",
-    "@vaadin/vaadin-material-styles": "23.1.0-beta4",
-    "@vaadin/vaadin-overlay": "23.1.0-beta4",
-    "@vaadin/vaadin-themable-mixin": "23.1.0-beta4"
+    "@vaadin/component-base": "23.1.0-rc3",
+    "@vaadin/item": "23.1.0-rc3",
+    "@vaadin/list-box": "23.1.0-rc3",
+    "@vaadin/lit-renderer": "23.1.0-rc3",
+    "@vaadin/vaadin-lumo-styles": "23.1.0-rc3",
+    "@vaadin/vaadin-material-styles": "23.1.0-rc3",
+    "@vaadin/vaadin-overlay": "23.1.0-rc3",
+    "@vaadin/vaadin-themable-mixin": "23.1.0-rc3"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/polymer-legacy-adapter": "23.1.0-beta4",
+    "@vaadin/polymer-legacy-adapter": "23.1.0-rc3",
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^13.0.2"
   },
-  "gitHead": "06e283473964ecb3085aacf3eddb5333d052a045"
+  "gitHead": "49c312fbe0228adb559296d45655bbfd4eac6235"
 }

package/src/vaadin-contextmenu-items-mixin.d.ts

@@ -40,8 +40,6 @@ declare class ContextMenuListBox extends ListBox {}
 export declare function ItemsMixin<T extends Constructor<HTMLElement>>(base: T): T & Constructor<ItemsMixinClass>;
 
 export declare class ItemsMixinClass {
-  protected readonly __isRTL: boolean;
-
   /**
    * Defines a (hierarchical) menu structure for the component.
    * If a menu item has a non-empty `children` set, a sub-menu with the child items is opened
@@ -71,4 +69,6 @@ export declare class ItemsMixinClass {
    * ```
    */
   items: ContextMenuItem[] | undefined;
+
+  protected readonly __isRTL: boolean;
 }

package/src/vaadin-contextmenu-items-mixin.js

@@ -3,7 +3,6 @@
  * Copyright (c) 2016 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { flush } from '@polymer/polymer/lib/utils/flush.js';
 import { isTouch } from '@vaadin/component-base/src/browser-utils.js';
 import { Item } from '@vaadin/item/src/vaadin-item.js';
 import { ListBox } from '@vaadin/list-box/src/vaadin-list-box.js';
@@ -273,20 +272,18 @@ export const ItemsMixin = (superClass) =>
     /** @private */
     __initMenu(root, menu) {
       if (!root.firstElementChild) {
-        const is = this.constructor.is;
-        root.innerHTML = `
-        <vaadin-context-menu-list-box></vaadin-context-menu-list-box>
-        <${is} hidden></${is}>
-      `;
-        flush();
-        const listBox = root.querySelector('vaadin-context-menu-list-box');
+        const listBox = document.createElement('vaadin-context-menu-list-box');
+        root.appendChild(listBox);
+
         if (this._theme) {
           listBox.setAttribute('theme', this._theme);
         }
         listBox.classList.add('vaadin-menu-list-box');
         requestAnimationFrame(() => listBox.setAttribute('role', 'menu'));
 
-        const subMenu = root.querySelector(is);
+        const subMenu = document.createElement(this.constructor.is);
+        subMenu.setAttribute('hidden', '');
+        root.appendChild(subMenu);
         subMenu.$.overlay.modeless = true;
         subMenu.openOn = 'opensubmenu';
 
@@ -328,7 +325,7 @@ export const ItemsMixin = (superClass) =>
           if ((!isRTL && e.keyCode === 37) || (isRTL && e.keyCode === 39)) {
             menu.close();
             menu.listenOn.focus();
-          } else if (e.keyCode === 27) {
+          } else if (e.key === 'Escape' || e.key === 'Tab') {
             menu.dispatchEvent(new CustomEvent('close-all-menus'));
           }
         });

package/theme/lumo/vaadin-context-menu.js

@@ -1,4 +1,5 @@
 import './vaadin-context-menu-styles.js';
 import '@vaadin/item/theme/lumo/vaadin-item.js';
 import '@vaadin/list-box/theme/lumo/vaadin-list-box.js';
+import '@vaadin/vaadin-overlay/theme/lumo/vaadin-overlay.js';
 import '../../src/vaadin-context-menu.js';

package/theme/material/vaadin-context-menu.js

@@ -1,4 +1,5 @@
 import './vaadin-context-menu-styles.js';
 import '@vaadin/item/theme/material/vaadin-item.js';
 import '@vaadin/list-box/theme/material/vaadin-list-box.js';
+import '@vaadin/vaadin-overlay/theme/material/vaadin-overlay.js';
 import '../../src/vaadin-context-menu.js';