@vaadin/menu-bar 25.0.0-alpha9 → 25.0.0-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/menu-bar",
-  "version": "25.0.0-alpha9",
+  "version": "25.0.0-beta2",
   "publishConfig": {
     "access": "public"
   },
@@ -21,9 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "!src/styles/*-base-styles.d.ts",
-    "!src/styles/*-base-styles.js",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
@@ -37,27 +34,27 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.0.0-alpha9",
-    "@vaadin/button": "25.0.0-alpha9",
-    "@vaadin/component-base": "25.0.0-alpha9",
-    "@vaadin/context-menu": "25.0.0-alpha9",
-    "@vaadin/item": "25.0.0-alpha9",
-    "@vaadin/list-box": "25.0.0-alpha9",
-    "@vaadin/overlay": "25.0.0-alpha9",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha9",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha9",
+    "@vaadin/a11y-base": "25.0.0-beta2",
+    "@vaadin/button": "25.0.0-beta2",
+    "@vaadin/component-base": "25.0.0-beta2",
+    "@vaadin/context-menu": "25.0.0-beta2",
+    "@vaadin/item": "25.0.0-beta2",
+    "@vaadin/list-box": "25.0.0-beta2",
+    "@vaadin/overlay": "25.0.0-beta2",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-beta2",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha9",
-    "@vaadin/icon": "25.0.0-alpha9",
-    "@vaadin/test-runner-commands": "25.0.0-alpha9",
+    "@vaadin/chai-plugins": "25.0.0-beta2",
+    "@vaadin/icon": "25.0.0-beta2",
+    "@vaadin/test-runner-commands": "25.0.0-beta2",
     "@vaadin/testing-helpers": "^2.0.0",
-    "sinon": "^18.0.0"
+    "@vaadin/vaadin-lumo-styles": "25.0.0-beta2",
+    "sinon": "^21.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "bbe4720721e0955ffc87a79b412bee38b1f0eb1e"
+  "gitHead": "e078f8371ae266f05c7ca1ec25686cc489c83f24"
 }

package/src/styles/vaadin-menu-bar-base-styles.js

@@ -17,16 +17,15 @@ export const menuBarStyles = css`
   [part='container'] {
     display: flex;
     flex-wrap: nowrap;
-    margin: calc((var(--vaadin-focus-ring-width) + 1px) * -1);
+    margin: calc((var(--vaadin-focus-ring-width) + 2px) * -1);
     overflow: hidden;
-    padding: calc(var(--vaadin-focus-ring-width) + 1px);
+    padding: calc(var(--vaadin-focus-ring-width) + 2px);
     position: relative;
     width: 100%;
     --_gap: var(--vaadin-menu-bar-gap, 0px);
     --_bw: var(--vaadin-button-border-width, 1px);
     gap: var(--_gap);
     --_rad-button: var(--vaadin-button-border-radius, var(--vaadin-radius-m));
-    --_rad: min(var(--_gap) * 1000, var(--_rad-button));
   }
 
   ::slotted(vaadin-menu-bar-button:not(:first-of-type)) {
@@ -34,16 +33,18 @@ export const menuBarStyles = css`
   }
 
   ::slotted(vaadin-menu-bar-button) {
-    border-radius: var(--_rad);
+    border-radius: 0;
   }
 
   ::slotted([first-visible]),
-  :host([has-single-button]) ::slotted([slot='overflow']) {
+  :host([has-single-button]) ::slotted([slot='overflow']),
+  ::slotted(vaadin-menu-bar-button[theme~='tertiary']) {
     border-start-start-radius: var(--_rad-button);
     border-end-start-radius: var(--_rad-button);
   }
 
-  ::slotted(:is([last-visible], [slot='overflow'])) {
+  ::slotted(:is([last-visible], [slot='overflow'])),
+  ::slotted(vaadin-menu-bar-button[theme~='tertiary']) {
     border-start-end-radius: var(--_rad-button);
     border-end-end-radius: var(--_rad-button);
   }

package/src/styles/vaadin-menu-bar-button-base-styles.js

@@ -32,7 +32,7 @@ export const menuBarButtonStyles = css`
     background: currentColor;
     content: '';
     height: var(--vaadin-icon-size, 1lh);
-    mask-image: var(--_vaadin-icon-chevron-down);
+    mask: var(--_vaadin-icon-chevron-down) 50% / var(--vaadin-icon-visual-size, 100%) no-repeat;
     width: var(--vaadin-icon-size, 1lh);
   }
 

package/src/vaadin-menu-bar-button.d.ts

@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright (c) 2019 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { Button } from '@vaadin/button/src/vaadin-button.js';
+
+/**
+ * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.
+ */
+declare class MenuBarButton extends Button {}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'vaadin-menu-bar-button': MenuBarButton;
+  }
+}
+
+export { MenuBarButton };

package/src/vaadin-menu-bar-button.js

@@ -5,7 +5,7 @@
  */
 import { Button } from '@vaadin/button/src/vaadin-button.js';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
-import { menuBarButtonStyles } from './styles/vaadin-menu-bar-button-core-styles.js';
+import { menuBarButtonStyles } from './styles/vaadin-menu-bar-button-base-styles.js';
 
 /**
  * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.
@@ -54,3 +54,5 @@ class MenuBarButton extends Button {
 }
 
 defineCustomElement(MenuBarButton);
+
+export { MenuBarButton };

package/src/vaadin-menu-bar-item.js

@@ -10,7 +10,7 @@ import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
 import { ItemMixin } from '@vaadin/item/src/vaadin-item-mixin.js';
 import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { menuBarItemStyles } from './styles/vaadin-menu-bar-item-core-styles.js';
+import { menuBarItemStyles } from './styles/vaadin-menu-bar-item-base-styles.js';
 
 /**
  * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.

package/src/vaadin-menu-bar-list-box.js

@@ -8,7 +8,7 @@ import { ListMixin } from '@vaadin/a11y-base/src/list-mixin.js';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
 import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
-import { listBoxStyles } from '@vaadin/list-box/src/styles/vaadin-list-box-core-styles.js';
+import { listBoxStyles } from '@vaadin/list-box/src/styles/vaadin-list-box-base-styles.js';
 import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 

package/src/vaadin-menu-bar-mixin.d.ts

@@ -10,6 +10,7 @@ import type { KeyboardDirectionMixinClass } from '@vaadin/a11y-base/src/keyboard
 import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
 import type { I18nMixinClass } from '@vaadin/component-base/src/i18n-mixin.js';
 import type { ResizeMixinClass } from '@vaadin/component-base/src/resize-mixin.js';
+import type { MenuBarButton } from './vaadin-menu-bar-button.js';
 
 export type MenuBarItem<TItemData extends object = object> = {
   /**
@@ -113,7 +114,7 @@ export declare class MenuBarMixinClass<TItem extends MenuBarItem = MenuBarItem>
    * which makes disabled buttons focusable and hoverable, while still
    * preventing them from being triggered:
    *
-   * ```
+   * ```js
    * // Set before any menu bar is attached to the DOM.
    * window.Vaadin.featureFlags.accessibleDisabledButtons = true;
    * ```
@@ -126,7 +127,7 @@ export declare class MenuBarMixinClass<TItem extends MenuBarItem = MenuBarItem>
    * just the individual properties you want to change.
    *
    * The object has the following JSON structure and default values:
-   * ```
+   * ```js
    * {
    *   moreOptions: 'More options'
    * }
@@ -134,14 +135,6 @@ export declare class MenuBarMixinClass<TItem extends MenuBarItem = MenuBarItem>
    */
   i18n: MenuBarI18n;
 
-  /**
-   * A space-delimited list of CSS class names
-   * to set on each sub-menu overlay element.
-   *
-   * @attr {string} overlay-class
-   */
-  overlayClass: string;
-
   /**
    * If true, the submenu will open on hover (mouseover) instead of click.
    * @attr {boolean} open-on-hover
@@ -167,11 +160,11 @@ export declare class MenuBarMixinClass<TItem extends MenuBarItem = MenuBarItem>
    */
   close(): void;
 
-  protected readonly _buttons: HTMLElement[];
+  protected readonly _buttons: MenuBarButton[];
 
   protected readonly _container: HTMLElement;
 
-  protected readonly _overflow: HTMLElement;
+  protected readonly _overflow: MenuBarButton;
 
   protected _hasOverflow: boolean;
 }

package/src/vaadin-menu-bar-mixin.js

@@ -8,7 +8,7 @@ import { Directive, directive } from 'lit/directive.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { DisabledMixin } from '@vaadin/a11y-base/src/disabled-mixin.js';
 import { FocusMixin } from '@vaadin/a11y-base/src/focus-mixin.js';
-import { isElementFocused, isKeyboardActive } from '@vaadin/a11y-base/src/focus-utils.js';
+import { isElementFocused, isElementHidden, isKeyboardActive } from '@vaadin/a11y-base/src/focus-utils.js';
 import { KeyboardDirectionMixin } from '@vaadin/a11y-base/src/keyboard-direction-mixin.js';
 import { microTask } from '@vaadin/component-base/src/async.js';
 import { Debouncer } from '@vaadin/component-base/src/debounce.js';
@@ -76,10 +76,10 @@ export const MenuBarMixin = (superClass) =>
          * @property {string} text - Text to be set as the menu button component's textContent.
          * @property {string} tooltip - Text to be set as the menu button's tooltip.
          * Requires a `<vaadin-tooltip slot="tooltip">` element to be added inside the `<vaadin-menu-bar>`.
-         * @property {union: string | object} component - The component to represent the button content.
+         * @property {string | HTMLElement} component - The component to represent the button content.
          * Either a tagName or an element instance. Defaults to "vaadin-menu-bar-item".
          * @property {boolean} disabled - If true, the button is disabled and cannot be activated.
-         * @property {union: string | string[]} theme - Theme(s) to be set as the theme attribute of the button, overriding any theme set on the menu bar.
+         * @property {string | string[]} theme - Theme(s) to be set as the theme attribute of the button, overriding any theme set on the menu bar.
          * @property {SubMenuItem[]} children - Array of submenu items.
          */
 
@@ -87,7 +87,7 @@ export const MenuBarMixin = (superClass) =>
          * @typedef SubMenuItem
          * @type {object}
          * @property {string} text - Text to be set as the menu item component's textContent.
-         * @property {union: string | object} component - The component to represent the item.
+         * @property {string | HTMLElement} component - The component to represent the item.
          * Either a tagName or an element instance. Defaults to "vaadin-menu-bar-item".
          * @property {boolean} disabled - If true, the item is disabled and cannot be selected.
          * @property {boolean} checked - If true, the item shows a checkmark next to it.
@@ -136,12 +136,7 @@ export const MenuBarMixin = (superClass) =>
          * which makes disabled buttons focusable and hoverable, while still
          * preventing them from being triggered:
          *
-         * ```
-         * // Set before any menu bar is attached to the DOM.
-         * window.Vaadin.featureFlags.accessibleDisabledButtons = true;
-         * ```
-         *
-         * ```
+         * ```js
          * // Set before any menu bar is attached to the DOM.
          * window.Vaadin.featureFlags.accessibleDisabledButtons = true;
          * ```
@@ -154,16 +149,6 @@ export const MenuBarMixin = (superClass) =>
           value: () => [],
         },
 
-        /**
-         * A space-delimited list of CSS class names
-         * to set on each sub-menu overlay element.
-         *
-         * @attr {string} overlay-class
-         */
-        overlayClass: {
-          type: String,
-        },
-
         /**
          * If true, the submenu will open on hover (mouseover) instead of click.
          * @attr {boolean} open-on-hover
@@ -200,7 +185,7 @@ export const MenuBarMixin = (superClass) =>
      * just the individual properties you want to change.
      *
      * The object has the following JSON structure and default values:
-     * ```
+     * ```js
      * {
      *   moreOptions: 'More options'
      * }
@@ -348,10 +333,6 @@ export const MenuBarMixin = (superClass) =>
         this.__updateSubMenu();
       }
 
-      if (props.has('overlayClass')) {
-        this._subMenu.overlayClass = this.overlayClass;
-      }
-
       if (props.has('_theme')) {
         this._themeChanged(this._theme);
       }
@@ -428,7 +409,7 @@ export const MenuBarMixin = (superClass) =>
     __updateSubMenu() {
       const subMenu = this._subMenu;
       if (subMenu && subMenu.opened) {
-        const button = subMenu._overlayElement.positionTarget;
+        const button = subMenu._positionTarget;
 
         // Close sub-menu if the corresponding button is no longer in the DOM,
         // or if the item on it has been changed to no longer have children.
@@ -519,12 +500,6 @@ export const MenuBarMixin = (superClass) =>
 
         const items = buttons.filter((b) => !remaining.includes(b)).map((b) => b.item);
         this.__updateOverflow(items);
-
-        // Ensure there is at least one button with tabindex set to 0
-        // so that menu-bar is not skipped when navigating with Tab
-        if (remaining.length && !remaining.some((btn) => btn.getAttribute('tabindex') === '0')) {
-          this._setTabindex(remaining[remaining.length - 1], true);
-        }
       }
     }
 
@@ -555,13 +530,23 @@ export const MenuBarMixin = (superClass) =>
       const isSingleButton = newOverflowCount === buttons.length || (newOverflowCount === 0 && buttons.length === 1);
       this.toggleAttribute('has-single-button', isSingleButton);
 
+      // Collect visible buttons to detect if tabindex should be updated
+      const visibleButtons = buttons.filter((btn) => btn.style.visibility !== 'hidden');
+
+      if (!visibleButtons.length) {
+        // If all buttons except overflow are hidden, set tabindex on it
+        this._overflow.setAttribute('tabindex', '0');
+      } else if (!visibleButtons.some((btn) => btn.getAttribute('tabindex') === '0')) {
+        // Ensure there is at least one button with tabindex set to 0
+        // so that menu-bar is not skipped when navigating with Tab
+        this._setTabindex(visibleButtons[visibleButtons.length - 1], true);
+      }
+
       // Apply first/last visible attributes to the visible buttons
-      buttons
-        .filter((btn) => btn.style.visibility !== 'hidden')
-        .forEach((btn, index, visibleButtons) => {
-          btn.toggleAttribute('first-visible', index === 0);
-          btn.toggleAttribute('last-visible', !this._hasOverflow && index === visibleButtons.length - 1);
-        });
+      visibleButtons.forEach((btn, index, visibleButtons) => {
+        btn.toggleAttribute('first-visible', index === 0);
+        btn.toggleAttribute('last-visible', !this._hasOverflow && index === visibleButtons.length - 1);
+      });
     }
 
     /** @private */
@@ -712,17 +697,18 @@ export const MenuBarMixin = (superClass) =>
      * and open another one for the newly focused button.
      *
      * @param {Element} item
+     * @param {FocusOptions=} options
      * @param {boolean} navigating
      * @protected
      * @override
      */
-    _focusItem(item, navigating) {
+    _focusItem(item, options, navigating) {
       const wasExpanded = navigating && this.focused === this._expandedButton;
       if (wasExpanded) {
         this._close();
       }
 
-      super._focusItem(item, navigating);
+      super._focusItem(item, options, navigating);
 
       this._buttons.forEach((btn) => {
         this._setTabindex(btn, btn === item);
@@ -779,7 +765,7 @@ export const MenuBarMixin = (superClass) =>
      */
     _setFocused(focused) {
       if (focused) {
-        const target = this.tabNavigation ? this.querySelector('[focused]') : this.querySelector('[tabindex="0"]');
+        const target = this.__getFocusTarget();
         if (target) {
           this._buttons.forEach((btn) => {
             this._setTabindex(btn, btn === target);
@@ -793,6 +779,24 @@ export const MenuBarMixin = (superClass) =>
       }
     }
 
+    /** @private */
+    __getFocusTarget() {
+      // First, check if focus is moving to a visible button
+      let target = this._buttons.find((btn) => isElementFocused(btn));
+
+      if (!target) {
+        const selector = this.tabNavigation ? '[focused]' : '[tabindex="0"]';
+        // Next, check if there is a button that could be focused but is hidden
+        target = this.querySelector(`vaadin-menu-bar-button${selector}`);
+
+        if (isElementHidden(target)) {
+          target = this._buttons[this._getFocusableIndex()];
+        }
+      }
+
+      return target;
+    }
+
     /**
      * @param {!KeyboardEvent} event
      * @private
@@ -890,11 +894,11 @@ export const MenuBarMixin = (superClass) =>
         // Hide tooltip on mouseover to disabled button
         this._hideTooltip();
       } else if (button !== this._expandedButton) {
-        const isOpened = this._subMenu.opened;
-        if (button.item.children && (this.openOnHover || isOpened)) {
+        // Switch sub-menu when moving cursor over another button
+        // with children, regardless of whether openOnHover is set.
+        // If the button has no children, keep the sub-menu opened.
+        if (button.item.children && (this.openOnHover || this._subMenu.opened)) {
           this.__openSubMenu(button, false);
-        } else if (isOpened) {
-          this._close();
         }
 
         if (button === this._overflow || (this.openOnHover && button.item.children)) {
@@ -963,6 +967,7 @@ export const MenuBarMixin = (superClass) =>
 
       subMenu.items = items;
       subMenu.listenOn = button;
+      subMenu._positionTarget = button;
       const overlay = subMenu._overlayElement;
       overlay.noVerticalOverlap = true;
 
@@ -972,7 +977,6 @@ export const MenuBarMixin = (superClass) =>
       this._setExpanded(button, true);
 
       this.style.pointerEvents = 'auto';
-      overlay.positionTarget = button;
 
       button.dispatchEvent(
         new CustomEvent('opensubmenu', {
@@ -990,7 +994,8 @@ export const MenuBarMixin = (superClass) =>
           }
 
           if (options.keepFocus) {
-            this._focusItem(this._expandedButton, false);
+            const focusOptions = { focusVisible: isKeyboardActive() };
+            this._focusItem(this._expandedButton, focusOptions, false);
           }
 
           // Do not focus item when open not from keyboard
@@ -1034,7 +1039,8 @@ export const MenuBarMixin = (superClass) =>
       if (button && button.hasAttribute('expanded')) {
         this._setExpanded(button, false);
         if (restoreFocus) {
-          this._focusItem(button, false);
+          const focusOptions = { focusVisible: isKeyboardActive() };
+          this._focusItem(button, focusOptions, false);
         }
         this._expandedButton = null;
       }

package/src/vaadin-menu-bar-overlay.js

@@ -11,7 +11,7 @@ import { MenuOverlayMixin } from '@vaadin/context-menu/src/vaadin-menu-overlay-m
 import { OverlayMixin } from '@vaadin/overlay/src/vaadin-overlay-mixin.js';
 import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { menuBarOverlayStyles } from './styles/vaadin-menu-bar-overlay-core-styles.js';
+import { menuBarOverlayStyles } from './styles/vaadin-menu-bar-overlay-base-styles.js';
 
 /**
  * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.

package/src/vaadin-menu-bar-submenu.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright (c) 2019 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { ContextMenuMixin } from '@vaadin/context-menu/src/vaadin-context-menu-mixin.js';
+import { ThemePropertyMixin } from '@vaadin/vaadin-themable-mixin/vaadin-theme-property-mixin.js';
+
+/**
+ * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.
+ */
+declare class MenuBarSubmenu extends ContextMenuMixin(ThemePropertyMixin(HTMLElement)) {}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'vaadin-menu-bar-submenu': MenuBarSubmenu;
+  }
+}
+
+export { MenuBarSubmenu };

package/src/vaadin-menu-bar-submenu.js

@@ -10,19 +10,19 @@ import { css, html, LitElement } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { ContextMenuMixin } from '@vaadin/context-menu/src/vaadin-context-menu-mixin.js';
 import { ThemePropertyMixin } from '@vaadin/vaadin-themable-mixin/vaadin-theme-property-mixin.js';
-import { SubMenuMixin } from './vaadin-menu-bar-submenu-mixin.js';
 
 /**
  * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.
  *
  * @customElement
  * @extends HTMLElement
- * @mixes SubMenuMixin
+ * @mixes ContextMenuMixin
  * @mixes ThemePropertyMixin
  * @protected
  */
-class MenuBarSubmenu extends SubMenuMixin(ThemePropertyMixin(PolylitMixin(LitElement))) {
+class MenuBarSubmenu extends ContextMenuMixin(ThemePropertyMixin(PolylitMixin(LitElement))) {
   static get is() {
     return 'vaadin-menu-bar-submenu';
   }
@@ -39,6 +39,31 @@ class MenuBarSubmenu extends SubMenuMixin(ThemePropertyMixin(PolylitMixin(LitEle
     `;
   }
 
+  static get properties() {
+    return {
+      isRoot: {
+        type: Boolean,
+        reflectToAttribute: true,
+        sync: true,
+      },
+    };
+  }
+
+  constructor() {
+    super();
+
+    this.openOn = 'opensubmenu';
+  }
+
+  /**
+   * Tag name prefix used by overlay, list-box and items.
+   * @protected
+   * @return {string}
+   */
+  get _tagNamePrefix() {
+    return 'vaadin-menu-bar';
+  }
+
   /** @protected */
   render() {
     return html`
@@ -50,6 +75,8 @@ class MenuBarSubmenu extends SubMenuMixin(ThemePropertyMixin(PolylitMixin(LitEle
         .modeless="${this._modeless}"
         .renderer="${this.__itemsRenderer}"
         .withBackdrop="${this._phone}"
+        .positionTarget="${this._positionTarget}"
+        ?no-horizontal-overlap="${!this.isRoot}"
         ?phone="${this._phone}"
         theme="${ifDefined(this._theme)}"
         exportparts="backdrop, overlay, content"
@@ -61,6 +88,45 @@ class MenuBarSubmenu extends SubMenuMixin(ThemePropertyMixin(PolylitMixin(LitEle
       </vaadin-menu-bar-overlay>
     `;
   }
+
+  /**
+   * Overriding the observer to not add global "contextmenu" listener.
+   * @override
+   */
+  _openedChanged() {
+    // Do nothing
+  }
+
+  /**
+   * Overriding the public method to reset expanded button state.
+   */
+  close() {
+    super.close();
+
+    // Only handle 1st level submenu
+    if (this.hasAttribute('is-root')) {
+      this.parentElement._close();
+    }
+  }
+
+  /**
+   * Override method from `ContextMenuMixin` to prevent closing
+   * sub-menu on the same click event that was used to open it.
+   *
+   * @param {Event} event
+   * @return {boolean}
+   * @protected
+   * @override
+   */
+  _shouldCloseOnOutsideClick(event) {
+    if (this.hasAttribute('is-root') && event.composedPath().includes(this.listenOn)) {
+      return false;
+    }
+
+    return super._shouldCloseOnOutsideClick(event);
+  }
 }
 
 defineCustomElement(MenuBarSubmenu);
+
+export { MenuBarSubmenu };

package/src/vaadin-menu-bar.js

@@ -12,7 +12,7 @@ import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
 import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
 import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { menuBarStyles } from './styles/vaadin-menu-bar-core-styles.js';
+import { menuBarStyles } from './styles/vaadin-menu-bar-base-styles.js';
 import { MenuBarMixin } from './vaadin-menu-bar-mixin.js';
 
 /**

package/vaadin-menu-bar.js

@@ -1,2 +1,2 @@
-import './theme/lumo/vaadin-menu-bar.js';
+import './src/vaadin-menu-bar.js';
 export * from './src/vaadin-menu-bar.js';

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/menu-bar",
-  "version": "25.0.0-alpha9",
+  "version": "25.0.0-beta2",
   "description-markup": "markdown",
   "contributions": {
     "html": {
       "elements": [
         {
           "name": "vaadin-menu-bar",
-          "description": "`<vaadin-menu-bar>` is a Web Component providing a set of horizontally stacked buttons offering\nthe user quick access to a consistent set of commands. Each button can toggle a submenu with\nsupport for additional levels of nested menus.\n\nTo create the menu bar, first add the component to the page:\n\n```html\n<vaadin-menu-bar></vaadin-menu-bar>\n```\n\nAnd then use [`items`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-menu-bar#property-items) property to initialize the structure:\n\n```js\ndocument.querySelector('vaadin-menu-bar').items = [{text: 'File'}, {text: 'Edit'}];\n```\n\n### Styling\n\nThe following shadow DOM parts are exposed for styling:\n\nPart name         | Description\n------------------|----------------\n`container`       | The container wrapping menu bar buttons.\n\nThe following state attributes are available for styling:\n\nAttribute           | Description\n--------------------|----------------------------------\n`disabled`          | Set when the menu bar is disabled\n`has-single-button` | Set when there is only one button visible\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.\n\n### Internal components\n\nIn addition to `<vaadin-menu-bar>` itself, the following internal\ncomponents are themable:\n\n- `<vaadin-menu-bar-button>` - has the same API as [`<vaadin-button>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-button).\n- `<vaadin-menu-bar-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-item).\n- `<vaadin-menu-bar-list-box>` - has the same API as [`<vaadin-list-box>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-list-box).\n- `<vaadin-menu-bar-submenu>` - has the same API as [`<vaadin-context-menu>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-context-menu).\n\nThe `<vaadin-menu-bar-item>` sub-menu elements have the following additional state attributes\non top of the built-in `<vaadin-item>` state attributes:\n\nAttribute  | Description\n---------- |-------------\n`expanded` | Expanded parent item.",
+          "description": "`<vaadin-menu-bar>` is a Web Component providing a set of horizontally stacked buttons offering\nthe user quick access to a consistent set of commands. Each button can toggle a submenu with\nsupport for additional levels of nested menus.\n\nTo create the menu bar, first add the component to the page:\n\n```html\n<vaadin-menu-bar></vaadin-menu-bar>\n```\n\nAnd then use [`items`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-menu-bar#property-items) property to initialize the structure:\n\n```js\ndocument.querySelector('vaadin-menu-bar').items = [{text: 'File'}, {text: 'Edit'}];\n```\n\n### Styling\n\nThe following shadow DOM parts are exposed for styling:\n\nPart name         | Description\n------------------|----------------\n`container`       | The container wrapping menu bar buttons.\n\nThe following state attributes are available for styling:\n\nAttribute           | Description\n--------------------|----------------------------------\n`disabled`          | Set when the menu bar is disabled\n`has-single-button` | Set when there is only one button visible\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.\n\n### Internal components\n\nIn addition to `<vaadin-menu-bar>` itself, the following internal\ncomponents are themable:\n\n- `<vaadin-menu-bar-button>` - has the same API as [`<vaadin-button>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-button).\n- `<vaadin-menu-bar-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-item).\n- `<vaadin-menu-bar-list-box>` - has the same API as [`<vaadin-list-box>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-list-box).\n- `<vaadin-menu-bar-submenu>` - has the same API as [`<vaadin-context-menu>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-context-menu).\n\nThe `<vaadin-menu-bar-item>` sub-menu elements have the following additional state attributes\non top of the built-in `<vaadin-item>` state attributes:\n\nAttribute  | Description\n---------- |-------------\n`expanded` | Expanded parent item.",
           "attributes": [
             {
               "name": "disabled",
@@ -30,17 +30,6 @@
                 ]
               }
             },
-            {
-              "name": "overlay-class",
-              "description": "A space-delimited list of CSS class names\nto set on each sub-menu overlay element.",
-              "value": {
-                "type": [
-                  "string",
-                  "null",
-                  "undefined"
-                ]
-              }
-            },
             {
               "name": "open-on-hover",
               "description": "If true, the submenu will open on hover (mouseover) instead of click.",
@@ -101,7 +90,7 @@
               },
               {
                 "name": "i18n",
-                "description": "The object used to localize this component. To change the default\nlocalization, replace this with an object that provides all properties, or\njust the individual properties you want to change.\n\nThe object has the following JSON structure and default values:\n```\n{\n  moreOptions: 'More options'\n}\n```",
+                "description": "The object used to localize this component. To change the default\nlocalization, replace this with an object that provides all properties, or\njust the individual properties you want to change.\n\nThe object has the following JSON structure and default values:\n```js\n{\n  moreOptions: 'More options'\n}\n```",
                 "value": {
                   "type": [
                     "MenuBarI18n"
@@ -110,24 +99,13 @@
               },
               {
                 "name": "items",
-                "description": "Defines a hierarchical structure, where root level items represent menu bar buttons,\nand `children` property configures a submenu with items to be opened below\nthe button on click, Enter, Space, Up and Down arrow keys.\n\n#### Example\n\n```js\nmenubar.items = [\n  {\n    text: 'File',\n    className: 'file',\n    children: [\n      {text: 'Open', className: 'file open'}\n      {text: 'Auto Save', checked: true},\n    ]\n  },\n  {component: 'hr'},\n  {\n    text: 'Edit',\n    children: [\n      {text: 'Undo', disabled: true},\n      {text: 'Redo'}\n    ]\n  },\n  {text: 'Help'}\n];\n```\n\n#### Disabled buttons\n\nWhen disabled, menu bar buttons (root-level items) are rendered\nas \"dimmed\" and prevent all user interactions (mouse and keyboard).\n\nSince disabled buttons are not focusable and cannot react to hover\nevents by default, it can cause accessibility issues by making them\nentirely invisible to assistive technologies, and prevents the use\nof Tooltips to explain why the action is not available. This can be\naddressed by enabling the feature flag `accessibleDisabledButtons`,\nwhich makes disabled buttons focusable and hoverable, while still\npreventing them from being triggered:\n\n```\n// Set before any menu bar is attached to the DOM.\nwindow.Vaadin.featureFlags.accessibleDisabledButtons = true;\n```\n```\n// Set before any menu bar is attached to the DOM.\nwindow.Vaadin.featureFlags.accessibleDisabledButtons = true;\n```",
+                "description": "Defines a hierarchical structure, where root level items represent menu bar buttons,\nand `children` property configures a submenu with items to be opened below\nthe button on click, Enter, Space, Up and Down arrow keys.\n\n#### Example\n\n```js\nmenubar.items = [\n  {\n    text: 'File',\n    className: 'file',\n    children: [\n      {text: 'Open', className: 'file open'}\n      {text: 'Auto Save', checked: true},\n    ]\n  },\n  {component: 'hr'},\n  {\n    text: 'Edit',\n    children: [\n      {text: 'Undo', disabled: true},\n      {text: 'Redo'}\n    ]\n  },\n  {text: 'Help'}\n];\n```\n\n#### Disabled buttons\n\nWhen disabled, menu bar buttons (root-level items) are rendered\nas \"dimmed\" and prevent all user interactions (mouse and keyboard).\n\nSince disabled buttons are not focusable and cannot react to hover\nevents by default, it can cause accessibility issues by making them\nentirely invisible to assistive technologies, and prevents the use\nof Tooltips to explain why the action is not available. This can be\naddressed by enabling the feature flag `accessibleDisabledButtons`,\nwhich makes disabled buttons focusable and hoverable, while still\npreventing them from being triggered:\n\n```js\n// Set before any menu bar is attached to the DOM.\nwindow.Vaadin.featureFlags.accessibleDisabledButtons = true;\n```",
                 "value": {
                   "type": [
                     "Array.<MenuBarItem>"
                   ]
                 }
               },
-              {
-                "name": "overlayClass",
-                "description": "A space-delimited list of CSS class names\nto set on each sub-menu overlay element.",
-                "value": {
-                  "type": [
-                    "string",
-                    "null",
-                    "undefined"
-                  ]
-                }
-              },
               {
                 "name": "openOnHover",
                 "description": "If true, the submenu will open on hover (mouseover) instead of click.",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/menu-bar",
-  "version": "25.0.0-alpha9",
+  "version": "25.0.0-beta2",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -16,7 +16,7 @@
       "elements": [
         {
           "name": "vaadin-menu-bar",
-          "description": "`<vaadin-menu-bar>` is a Web Component providing a set of horizontally stacked buttons offering\nthe user quick access to a consistent set of commands. Each button can toggle a submenu with\nsupport for additional levels of nested menus.\n\nTo create the menu bar, first add the component to the page:\n\n```html\n<vaadin-menu-bar></vaadin-menu-bar>\n```\n\nAnd then use [`items`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-menu-bar#property-items) property to initialize the structure:\n\n```js\ndocument.querySelector('vaadin-menu-bar').items = [{text: 'File'}, {text: 'Edit'}];\n```\n\n### Styling\n\nThe following shadow DOM parts are exposed for styling:\n\nPart name         | Description\n------------------|----------------\n`container`       | The container wrapping menu bar buttons.\n\nThe following state attributes are available for styling:\n\nAttribute           | Description\n--------------------|----------------------------------\n`disabled`          | Set when the menu bar is disabled\n`has-single-button` | Set when there is only one button visible\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.\n\n### Internal components\n\nIn addition to `<vaadin-menu-bar>` itself, the following internal\ncomponents are themable:\n\n- `<vaadin-menu-bar-button>` - has the same API as [`<vaadin-button>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-button).\n- `<vaadin-menu-bar-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-item).\n- `<vaadin-menu-bar-list-box>` - has the same API as [`<vaadin-list-box>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-list-box).\n- `<vaadin-menu-bar-submenu>` - has the same API as [`<vaadin-context-menu>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-alpha9/#/elements/vaadin-context-menu).\n\nThe `<vaadin-menu-bar-item>` sub-menu elements have the following additional state attributes\non top of the built-in `<vaadin-item>` state attributes:\n\nAttribute  | Description\n---------- |-------------\n`expanded` | Expanded parent item.",
+          "description": "`<vaadin-menu-bar>` is a Web Component providing a set of horizontally stacked buttons offering\nthe user quick access to a consistent set of commands. Each button can toggle a submenu with\nsupport for additional levels of nested menus.\n\nTo create the menu bar, first add the component to the page:\n\n```html\n<vaadin-menu-bar></vaadin-menu-bar>\n```\n\nAnd then use [`items`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-menu-bar#property-items) property to initialize the structure:\n\n```js\ndocument.querySelector('vaadin-menu-bar').items = [{text: 'File'}, {text: 'Edit'}];\n```\n\n### Styling\n\nThe following shadow DOM parts are exposed for styling:\n\nPart name         | Description\n------------------|----------------\n`container`       | The container wrapping menu bar buttons.\n\nThe following state attributes are available for styling:\n\nAttribute           | Description\n--------------------|----------------------------------\n`disabled`          | Set when the menu bar is disabled\n`has-single-button` | Set when there is only one button visible\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.\n\n### Internal components\n\nIn addition to `<vaadin-menu-bar>` itself, the following internal\ncomponents are themable:\n\n- `<vaadin-menu-bar-button>` - has the same API as [`<vaadin-button>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-button).\n- `<vaadin-menu-bar-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-item).\n- `<vaadin-menu-bar-list-box>` - has the same API as [`<vaadin-list-box>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-list-box).\n- `<vaadin-menu-bar-submenu>` - has the same API as [`<vaadin-context-menu>`](https://cdn.vaadin.com/vaadin-web-components/25.0.0-beta2/#/elements/vaadin-context-menu).\n\nThe `<vaadin-menu-bar-item>` sub-menu elements have the following additional state attributes\non top of the built-in `<vaadin-item>` state attributes:\n\nAttribute  | Description\n---------- |-------------\n`expanded` | Expanded parent item.",
           "extension": true,
           "attributes": [
             {
@@ -49,21 +49,14 @@
             },
             {
               "name": ".i18n",
-              "description": "The object used to localize this component. To change the default\nlocalization, replace this with an object that provides all properties, or\njust the individual properties you want to change.\n\nThe object has the following JSON structure and default values:\n```\n{\n  moreOptions: 'More options'\n}\n```",
+              "description": "The object used to localize this component. To change the default\nlocalization, replace this with an object that provides all properties, or\njust the individual properties you want to change.\n\nThe object has the following JSON structure and default values:\n```js\n{\n  moreOptions: 'More options'\n}\n```",
               "value": {
                 "kind": "expression"
               }
             },
             {
               "name": ".items",
-              "description": "Defines a hierarchical structure, where root level items represent menu bar buttons,\nand `children` property configures a submenu with items to be opened below\nthe button on click, Enter, Space, Up and Down arrow keys.\n\n#### Example\n\n```js\nmenubar.items = [\n  {\n    text: 'File',\n    className: 'file',\n    children: [\n      {text: 'Open', className: 'file open'}\n      {text: 'Auto Save', checked: true},\n    ]\n  },\n  {component: 'hr'},\n  {\n    text: 'Edit',\n    children: [\n      {text: 'Undo', disabled: true},\n      {text: 'Redo'}\n    ]\n  },\n  {text: 'Help'}\n];\n```\n\n#### Disabled buttons\n\nWhen disabled, menu bar buttons (root-level items) are rendered\nas \"dimmed\" and prevent all user interactions (mouse and keyboard).\n\nSince disabled buttons are not focusable and cannot react to hover\nevents by default, it can cause accessibility issues by making them\nentirely invisible to assistive technologies, and prevents the use\nof Tooltips to explain why the action is not available. This can be\naddressed by enabling the feature flag `accessibleDisabledButtons`,\nwhich makes disabled buttons focusable and hoverable, while still\npreventing them from being triggered:\n\n```\n// Set before any menu bar is attached to the DOM.\nwindow.Vaadin.featureFlags.accessibleDisabledButtons = true;\n```\n```\n// Set before any menu bar is attached to the DOM.\nwindow.Vaadin.featureFlags.accessibleDisabledButtons = true;\n```",
-              "value": {
-                "kind": "expression"
-              }
-            },
-            {
-              "name": ".overlayClass",
-              "description": "A space-delimited list of CSS class names\nto set on each sub-menu overlay element.",
+              "description": "Defines a hierarchical structure, where root level items represent menu bar buttons,\nand `children` property configures a submenu with items to be opened below\nthe button on click, Enter, Space, Up and Down arrow keys.\n\n#### Example\n\n```js\nmenubar.items = [\n  {\n    text: 'File',\n    className: 'file',\n    children: [\n      {text: 'Open', className: 'file open'}\n      {text: 'Auto Save', checked: true},\n    ]\n  },\n  {component: 'hr'},\n  {\n    text: 'Edit',\n    children: [\n      {text: 'Undo', disabled: true},\n      {text: 'Redo'}\n    ]\n  },\n  {text: 'Help'}\n];\n```\n\n#### Disabled buttons\n\nWhen disabled, menu bar buttons (root-level items) are rendered\nas \"dimmed\" and prevent all user interactions (mouse and keyboard).\n\nSince disabled buttons are not focusable and cannot react to hover\nevents by default, it can cause accessibility issues by making them\nentirely invisible to assistive technologies, and prevents the use\nof Tooltips to explain why the action is not available. This can be\naddressed by enabling the feature flag `accessibleDisabledButtons`,\nwhich makes disabled buttons focusable and hoverable, while still\npreventing them from being triggered:\n\n```js\n// Set before any menu bar is attached to the DOM.\nwindow.Vaadin.featureFlags.accessibleDisabledButtons = true;\n```",
               "value": {
                 "kind": "expression"
               }

package/src/styles/vaadin-menu-bar-button-core-styles.d.ts

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import type { CSSResult } from 'lit';
-
-export const menuBarButtonStyles: CSSResult;

package/src/styles/vaadin-menu-bar-button-core-styles.js

@@ -1,16 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { css } from 'lit';
-
-export const menuBarButtonStyles = css`
-  :host {
-    flex-shrink: 0;
-  }
-
-  :host([slot='overflow']) {
-    margin-inline-end: 0;
-  }
-`;

package/src/styles/vaadin-menu-bar-core-styles.d.ts

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import type { CSSResult } from 'lit';
-
-export const menuBarStyles: CSSResult;

package/src/styles/vaadin-menu-bar-core-styles.js

@@ -1,24 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { css } from 'lit';
-
-export const menuBarStyles = css`
-  :host {
-    display: block;
-  }
-
-  :host([hidden]) {
-    display: none !important;
-  }
-
-  [part='container'] {
-    position: relative;
-    display: flex;
-    width: 100%;
-    flex-wrap: nowrap;
-    overflow: hidden;
-  }
-`;

package/src/styles/vaadin-menu-bar-item-core-styles.d.ts

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import type { CSSResult } from 'lit';
-
-export const menuBarItemStyles: CSSResult;

package/src/styles/vaadin-menu-bar-item-core-styles.js

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { itemStyles } from '@vaadin/item/src/styles/vaadin-item-core-styles.js';
-
-export const menuBarItemStyles = [itemStyles];

package/src/styles/vaadin-menu-bar-overlay-core-styles.d.ts

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import type { CSSResult } from 'lit';
-
-export const menuBarOverlayStyles: CSSResult;

package/src/styles/vaadin-menu-bar-overlay-core-styles.js

@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { menuOverlayStyles } from '@vaadin/context-menu/src/styles/vaadin-menu-overlay-core-styles.js';
-import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-core-styles.js';
-
-export const menuBarOverlayStyles = [overlayStyles, menuOverlayStyles];

package/src/vaadin-menu-bar-submenu-mixin.js

@@ -1,66 +0,0 @@
-/**
- * @license
- * Copyright (c) 2019 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { OverlayClassMixin } from '@vaadin/component-base/src/overlay-class-mixin.js';
-import { ContextMenuMixin } from '@vaadin/context-menu/src/vaadin-context-menu-mixin.js';
-
-/**
- * @polymerMixin
- * @mixes ContextMenuMixin
- * @mixes OverlayClassMixin
- */
-export const SubMenuMixin = (superClass) =>
-  class SubMenuMixinClass extends ContextMenuMixin(OverlayClassMixin(superClass)) {
-    constructor() {
-      super();
-
-      this.openOn = 'opensubmenu';
-    }
-
-    /**
-     * Tag name prefix used by overlay, list-box and items.
-     * @protected
-     * @return {string}
-     */
-    get _tagNamePrefix() {
-      return 'vaadin-menu-bar';
-    }
-
-    /**
-     * Overriding the observer to not add global "contextmenu" listener.
-     */
-    _openedChanged() {
-      // Do nothing
-    }
-
-    /**
-     * Overriding the public method to reset expanded button state.
-     */
-    close() {
-      super.close();
-
-      // Only handle 1st level submenu
-      if (this.hasAttribute('is-root')) {
-        this.parentElement._close();
-      }
-    }
-
-    /**
-     * Override method from `ContextMenuMixin` to prevent closing
-     * sub-menu on the same click event that was used to open it.
-     *
-     * @param {Event} event
-     * @return {boolean}
-     * @protected
-     * @override
-     */
-    _shouldCloseOnOutsideClick(event) {
-      if (this.hasAttribute('is-root') && event.composedPath().includes(this.listenOn)) {
-        return false;
-      }
-
-      return super._shouldCloseOnOutsideClick(event);
-    }
-  };

package/theme/lumo/vaadin-menu-bar-button-styles.d.ts

@@ -1 +0,0 @@
-export {};

package/theme/lumo/vaadin-menu-bar-button-styles.js

@@ -1,128 +0,0 @@
-import { button } from '@vaadin/button/theme/lumo/vaadin-button-styles.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const menuBarButton = css`
-  :host {
-    margin: calc(var(--lumo-space-xs) / 2);
-    margin-left: 0;
-    border-radius: 0;
-  }
-
-  [part='label'] {
-    width: 100%;
-  }
-
-  /* NOTE(web-padawan): avoid using shorthand padding property for IE11 */
-  [part='label'] ::slotted(vaadin-menu-bar-item) {
-    justify-content: center;
-    background-color: transparent;
-    height: var(--lumo-button-size);
-    margin: 0 calc((var(--lumo-size-m) / 3 + var(--lumo-border-radius-m) / 2) * -1);
-    padding-left: calc(var(--lumo-size-m) / 3 + var(--lumo-border-radius-m) / 2);
-    padding-right: calc(var(--lumo-size-m) / 3 + var(--lumo-border-radius-m) / 2);
-  }
-
-  :host([theme~='small']) [part='label'] ::slotted(vaadin-menu-bar-item) {
-    min-height: var(--lumo-size-s);
-    margin: 0 calc((var(--lumo-size-s) / 3 + var(--lumo-border-radius-m) / 2) * -1);
-    padding-left: calc(var(--lumo-size-s) / 3 + var(--lumo-border-radius-m) / 2);
-    padding-right: calc(var(--lumo-size-s) / 3 + var(--lumo-border-radius-m) / 2);
-  }
-
-  :host([theme~='tertiary']) [part='label'] ::slotted(vaadin-menu-bar-item) {
-    margin: 0 calc((var(--lumo-button-size) / 6) * -1);
-    padding-left: calc(var(--lumo-button-size) / 6);
-    padding-right: calc(var(--lumo-button-size) / 6);
-  }
-
-  :host([theme~='tertiary-inline']) {
-    margin-top: calc(var(--lumo-space-xs) / 2);
-    margin-bottom: calc(var(--lumo-space-xs) / 2);
-    margin-right: calc(var(--lumo-space-xs) / 2);
-  }
-
-  :host([theme~='tertiary-inline']) [part='label'] ::slotted(vaadin-menu-bar-item) {
-    margin: 0;
-    padding: 0;
-  }
-
-  :host([first-visible]) {
-    border-radius: var(--lumo-border-radius-m) 0 0 var(--lumo-border-radius-m);
-
-    /* Needed to retain the focus-ring with border-radius */
-    margin-left: calc(var(--lumo-space-xs) / 2);
-  }
-
-  :host([last-visible]),
-  :host([slot='overflow']) {
-    border-radius: 0 var(--lumo-border-radius-m) var(--lumo-border-radius-m) 0;
-  }
-
-  :host([theme~='tertiary']),
-  :host([theme~='tertiary-inline']) {
-    border-radius: var(--lumo-border-radius-m);
-  }
-
-  :host([slot='overflow']) {
-    min-width: var(--lumo-button-size);
-    padding-left: calc(var(--lumo-button-size) / 4);
-    padding-right: calc(var(--lumo-button-size) / 4);
-  }
-
-  :host([slot='overflow']) ::slotted(*) {
-    font-size: var(--lumo-font-size-xl);
-  }
-
-  :host([slot='overflow']) [part='prefix'],
-  :host([slot='overflow']) [part='suffix'] {
-    margin-left: 0;
-    margin-right: 0;
-  }
-
-  :host([theme~='dropdown-indicators']:not([slot='overflow']):not([theme~='icon'])[aria-haspopup]) [part='suffix'] {
-    margin-inline-start: 0;
-    width: 1em;
-    height: 1em;
-    line-height: 1;
-    font-size: var(--lumo-icon-size-s);
-    position: relative;
-    inset-inline-start: 0.15em;
-  }
-
-  /* prettier-ignore */
-  :host([theme~='dropdown-indicators']:not([slot='overflow']):not([theme~='icon'])[aria-haspopup]) [part='suffix']::after {
-    font-family: lumo-icons;
-    content: var(--lumo-icons-dropdown);
-  }
-
-  /* prettier-ignore */
-  :host([theme~='dropdown-indicators']:not([slot='overflow']):not([theme~='icon'])[theme~='tertiary'][aria-haspopup]) [part='suffix'] {
-    inset-inline-start: 0.05em;
-  }
-
-  /* prettier-ignore */
-  :host([theme~='dropdown-indicators']:not([slot='overflow']):not([theme~='icon'])[theme~='tertiary-inline'][aria-haspopup]) [part='suffix'] {
-    inset-inline-start: 0;
-  }
-
-  /* RTL styles */
-  :host([dir='rtl']) {
-    margin-left: calc(var(--lumo-space-xs) / 2);
-    margin-right: 0;
-    border-radius: 0;
-  }
-
-  :host([dir='rtl'][first-visible]) {
-    border-radius: 0 var(--lumo-border-radius-m) var(--lumo-border-radius-m) 0;
-    margin-right: calc(var(--lumo-space-xs) / 2);
-  }
-
-  :host([dir='rtl'][last-visible]),
-  :host([dir='rtl'][slot='overflow']) {
-    border-radius: var(--lumo-border-radius-m) 0 0 var(--lumo-border-radius-m);
-  }
-`;
-
-registerStyles('vaadin-menu-bar-button', [button, menuBarButton], {
-  moduleId: 'lumo-menu-bar-button',
-});

package/theme/lumo/vaadin-menu-bar-button.d.ts

@@ -1,2 +0,0 @@
-import './vaadin-menu-bar-button-styles.js';
-import '../../src/vaadin-menu-bar-button.js';

package/theme/lumo/vaadin-menu-bar-button.js

@@ -1,2 +0,0 @@
-import './vaadin-menu-bar-button-styles.js';
-import '../../src/vaadin-menu-bar-button.js';

package/theme/lumo/vaadin-menu-bar-item-styles.d.ts

@@ -1,2 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';

package/theme/lumo/vaadin-menu-bar-item-styles.js

@@ -1,27 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import { contextMenuItem } from '@vaadin/context-menu/theme/lumo/vaadin-context-menu-item-styles.js';
-import { item } from '@vaadin/item/theme/lumo/vaadin-item-styles.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const menuBarItem = css`
-  [part='content'] {
-    display: flex;
-    /* tweak to inherit centering from menu bar button */
-    align-items: inherit;
-    justify-content: inherit;
-  }
-
-  [part='content'] ::slotted(vaadin-icon) {
-    display: inline-block;
-    width: var(--lumo-icon-size-m);
-    height: var(--lumo-icon-size-m);
-  }
-
-  [part='content'] ::slotted(vaadin-icon[icon^='vaadin:']) {
-    padding: var(--lumo-space-xs);
-    box-sizing: border-box !important;
-  }
-`;
-
-registerStyles('vaadin-menu-bar-item', [item, contextMenuItem, menuBarItem], { moduleId: 'lumo-menu-bar-item' });

package/theme/lumo/vaadin-menu-bar-list-box-styles.d.ts

@@ -1 +0,0 @@
-export {};

package/theme/lumo/vaadin-menu-bar-list-box-styles.js

@@ -1,5 +0,0 @@
-import { contextMenuListBox } from '@vaadin/context-menu/theme/lumo/vaadin-context-menu-list-box-styles.js';
-import { listBox } from '@vaadin/list-box/theme/lumo/vaadin-list-box-styles.js';
-import { registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles('vaadin-menu-bar-list-box', [listBox, contextMenuListBox], { moduleId: 'lumo-menu-bar-list-box' });

package/theme/lumo/vaadin-menu-bar-overlay-styles.d.ts

@@ -1 +0,0 @@
-export {};

package/theme/lumo/vaadin-menu-bar-overlay-styles.js

@@ -1,13 +0,0 @@
-import { contextMenuOverlay } from '@vaadin/context-menu/theme/lumo/vaadin-context-menu-overlay-styles.js';
-import { menuOverlay } from '@vaadin/vaadin-lumo-styles/mixins/menu-overlay.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const menuBarOverlay = css`
-  :host(:first-of-type) {
-    padding-top: var(--lumo-space-xs);
-  }
-`;
-
-registerStyles('vaadin-menu-bar-overlay', [menuOverlay, contextMenuOverlay, menuBarOverlay], {
-  moduleId: 'lumo-menu-bar-overlay',
-});

package/theme/lumo/vaadin-menu-bar-styles.d.ts

@@ -1 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/style.js';

package/theme/lumo/vaadin-menu-bar-styles.js

@@ -1,17 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/style.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-menu-bar',
-  css`
-    :host([has-single-button]) ::slotted(vaadin-menu-bar-button) {
-      border-radius: var(--lumo-border-radius-m);
-    }
-
-    :host([theme~='end-aligned']) ::slotted(vaadin-menu-bar-button[first-visible]),
-    :host([theme~='end-aligned'][has-single-button]) ::slotted(vaadin-menu-bar-button) {
-      margin-inline-start: auto;
-    }
-  `,
-  { moduleId: 'lumo-menu-bar' },
-);

package/theme/lumo/vaadin-menu-bar.d.ts

@@ -1,6 +0,0 @@
-import './vaadin-menu-bar-button.js';
-import './vaadin-menu-bar-item-styles.js';
-import './vaadin-menu-bar-list-box-styles.js';
-import './vaadin-menu-bar-overlay-styles.js';
-import './vaadin-menu-bar-styles.js';
-import '../../src/vaadin-menu-bar.js';

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

@@ -1,6 +0,0 @@
-import './vaadin-menu-bar-button.js';
-import './vaadin-menu-bar-item-styles.js';
-import './vaadin-menu-bar-list-box-styles.js';
-import './vaadin-menu-bar-overlay-styles.js';
-import './vaadin-menu-bar-styles.js';
-import '../../src/vaadin-menu-bar.js';