@vaadin/menu-bar 23.2.0-dev.8a7678b70 → 23.3.0-alpha1

package/README.md

@@ -2,7 +2,7 @@
 
 A web component for creating a horizontal button bar with hierarchical drop-down menus.
 
-[Documentation + Live Demo ↗](https://vaadin.com/docs/latest/ds/components/menu-bar)
+[Documentation + Live Demo ↗](https://vaadin.com/docs/latest/components/menu-bar)
 
 [![npm version](https://badgen.net/npm/v/@vaadin/menu-bar)](https://www.npmjs.com/package/@vaadin/menu-bar)
 [![Discord](https://img.shields.io/discord/732335336448852018?label=discord)](https://discord.gg/PHmkCKC)
@@ -23,7 +23,7 @@ A web component for creating a horizontal button bar with hierarchical drop-down
 </script>
 ```
 
-[<img src="https://raw.githubusercontent.com/vaadin/web-components/master/packages/menu-bar/screenshot.png" width="345" alt="Screenshot of vaadin-menu-bar">](https://vaadin.com/docs/latest/ds/components/menu-bar)
+[<img src="https://raw.githubusercontent.com/vaadin/web-components/master/packages/menu-bar/screenshot.png" width="345" alt="Screenshot of vaadin-menu-bar">](https://vaadin.com/docs/latest/components/menu-bar)
 
 ## Installation
 
@@ -41,7 +41,7 @@ import '@vaadin/menu-bar';
 
 ## Themes
 
-Vaadin components come with two built-in [themes](https://vaadin.com/docs/latest/ds/customization/using-themes), Lumo and Material.
+Vaadin components come with two built-in [themes](https://vaadin.com/docs/latest/styling), Lumo and Material.
 The [main entrypoint](https://github.com/vaadin/web-components/blob/master/packages/menu-bar/vaadin-menu-bar.js) of the package uses the Lumo theme.
 
 To use the Material theme, import the component from the `theme/material` folder:
@@ -64,7 +64,7 @@ import '@vaadin/menu-bar/src/vaadin-menu-bar.js';
 
 ## Contributing
 
-Read the [contributing guide](https://vaadin.com/docs/latest/guide/contributing/overview) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.
+Read the [contributing guide](https://vaadin.com/docs/latest/contributing/overview) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/menu-bar",
-  "version": "23.2.0-dev.8a7678b70",
+  "version": "23.3.0-alpha1",
   "publishConfig": {
     "access": "public"
   },
@@ -23,7 +23,9 @@
     "src",
     "theme",
     "vaadin-*.d.ts",
-    "vaadin-*.js"
+    "vaadin-*.js",
+    "web-types.json",
+    "web-types.lit.json"
   ],
   "keywords": [
     "Vaadin",
@@ -35,18 +37,22 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "23.2.0-dev.8a7678b70",
-    "@vaadin/component-base": "23.2.0-dev.8a7678b70",
-    "@vaadin/vaadin-context-menu": "23.2.0-dev.8a7678b70",
-    "@vaadin/vaadin-lumo-styles": "23.2.0-dev.8a7678b70",
-    "@vaadin/vaadin-material-styles": "23.2.0-dev.8a7678b70",
-    "@vaadin/vaadin-themable-mixin": "23.2.0-dev.8a7678b70"
+    "@vaadin/button": "23.3.0-alpha1",
+    "@vaadin/component-base": "23.3.0-alpha1",
+    "@vaadin/context-menu": "23.3.0-alpha1",
+    "@vaadin/vaadin-lumo-styles": "23.3.0-alpha1",
+    "@vaadin/vaadin-material-styles": "23.3.0-alpha1",
+    "@vaadin/vaadin-themable-mixin": "23.3.0-alpha1"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/icon": "23.2.0-dev.8a7678b70",
+    "@vaadin/icon": "23.3.0-alpha1",
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^13.0.2"
   },
-  "gitHead": "85b403f96d8282f262322b56c0ff4289f843d02a"
+  "web-types": [
+    "web-types.json",
+    "web-types.lit.json"
+  ],
+  "gitHead": "beabc527d4b1274eb798ff701d406fed45cfe638"
 }

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

@@ -3,12 +3,12 @@
  * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { Constructor } from '@open-wc/dedupe-mixin';
-import { ResizeMixinClass } from '@vaadin/component-base/src/resize-mixin.js';
+import type { Constructor } from '@open-wc/dedupe-mixin';
+import type { ResizeMixinClass } from '@vaadin/component-base/src/resize-mixin.js';
 
 export declare function ButtonsMixin<T extends Constructor<HTMLElement>>(
   base: T,
-): T & Constructor<ButtonsMixinClass> & Constructor<ResizeMixinClass>;
+): Constructor<ButtonsMixinClass> & Constructor<ResizeMixinClass> & T;
 
 export declare class ButtonsMixinClass {
   protected readonly _buttons: HTMLElement[];

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

@@ -163,6 +163,9 @@ export const ButtonsMixin = (superClass) =>
       if (oldOverflowCount !== newOverflowCount && this._subMenu.opened) {
         this._subMenu.close();
       }
+
+      const isSingleButton = newOverflowCount === buttons.length || (newOverflowCount === 0 && buttons.length === 1);
+      this.toggleAttribute('has-single-button', isSingleButton);
     }
 
     /** @protected */

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

@@ -3,11 +3,18 @@
  * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { Constructor } from '@open-wc/dedupe-mixin';
+import type { Constructor } from '@open-wc/dedupe-mixin';
+import type { FocusMixinClass } from '@vaadin/component-base/src/focus-mixin.js';
+import type { KeyboardDirectionMixinClass } from '@vaadin/component-base/src/keyboard-direction-mixin.js';
+import type { KeyboardMixinClass } from '@vaadin/component-base/src/keyboard-mixin.js';
 
 export declare function InteractionsMixin<T extends Constructor<HTMLElement>>(
   base: T,
-): T & Constructor<InteractionsMixinClass>;
+): Constructor<FocusMixinClass> &
+  Constructor<InteractionsMixinClass> &
+  Constructor<KeyboardDirectionMixinClass> &
+  Constructor<KeyboardMixinClass> &
+  T;
 
 export declare class InteractionsMixinClass {
   /**

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

@@ -3,12 +3,17 @@
  * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js';
+import { isKeyboardActive } from '@vaadin/component-base/src/focus-utils.js';
+import { KeyboardDirectionMixin } from '@vaadin/component-base/src/keyboard-direction-mixin.js';
 
 /**
  * @polymerMixin
+ * @mixes FocusMixin
+ * @mixes KeyboardDirectionMixinClass
  */
 export const InteractionsMixin = (superClass) =>
-  class InteractionsMixin extends superClass {
+  class InteractionsMixin extends KeyboardDirectionMixin(FocusMixin(superClass)) {
     static get properties() {
       return {
         /**
@@ -34,8 +39,8 @@ export const InteractionsMixin = (superClass) =>
     ready() {
       super.ready();
 
-      this.addEventListener('keydown', (e) => this._onKeydown(e));
-      this.addEventListener('focusin', (e) => this._onFocusin(e));
+      this.addEventListener('mousedown', () => this._hideTooltip());
+      this.addEventListener('mouseleave', () => this._hideTooltip());
 
       this._subMenu.addEventListener('item-selected', this.__onItemSelected.bind(this));
       this._subMenu.addEventListener('close-all-menus', this.__onEscapeClose.bind(this));
@@ -49,11 +54,71 @@ export const InteractionsMixin = (superClass) =>
       container.addEventListener('mouseover', (e) => this._onMouseOver(e));
     }
 
+    /**
+     * Override getter from `KeyboardDirectionMixin`
+     * to look for activeElement in shadow root, or
+     * use the expanded button as a fallback.
+     *
+     * @return {Element | null}
+     * @protected
+     * @override
+     */
+    get focused() {
+      return this.shadowRoot.activeElement || this._expandedButton;
+    }
+
+    /**
+     * Override getter from `KeyboardDirectionMixin`.
+     *
+     * @return {boolean}
+     * @protected
+     * @override
+     */
+    get _vertical() {
+      return false;
+    }
+
+    /**
+     * Override method inherited from `KeyboardDirectionMixin`
+     * to use the list of menu-bar buttons as items.
+     *
+     * @return {Element[]}
+     * @protected
+     * @override
+     */
+    _getItems() {
+      return this._buttons;
+    }
+
     /** @private */
     get __isRTL() {
       return this.getAttribute('dir') === 'rtl';
     }
 
+    /** @protected */
+    disconnectedCallback() {
+      super.disconnectedCallback();
+      this._hideTooltip();
+    }
+
+    /**
+     * @param {HTMLElement} button
+     * @protected
+     */
+    _showTooltip(button) {
+      // Check if there is a slotted vaadin-tooltip element.
+      if (this._tooltipController.node && this._tooltipController.node.isConnected && !this._subMenu.opened) {
+        this._tooltipController.setTarget(button);
+        this._tooltipController.setContext({ item: button.item });
+        this._tooltipController.setOpened(true);
+      }
+    }
+
+    /** @protected */
+    _hideTooltip() {
+      this._tooltipController.setOpened(false);
+    }
+
     /** @protected */
     _setExpanded(button, expanded) {
       button.toggleAttribute('expanded', expanded);
@@ -66,135 +131,135 @@ export const InteractionsMixin = (superClass) =>
       button.setAttribute('tabindex', focused ? '0' : '-1');
     }
 
-    /** @private */
-    _focusButton(button) {
-      button.focus();
-      button.setAttribute('focus-ring', '');
+    /**
+     * Override method inherited from `KeyboardDirectionMixin`
+     * to close the submenu for the previously focused button
+     * and open another one for the newly focused button.
+     *
+     * @param {Element} item
+     * @param {boolean} navigating
+     * @protected
+     * @override
+     */
+    _focusItem(item, navigating) {
+      const wasExpanded = navigating && this.focused === this._expandedButton;
+      if (wasExpanded) {
+        this._close();
+      }
+
+      super._focusItem(item, navigating);
+
       this._buttons.forEach((btn) => {
-        this._setTabindex(btn, btn === button);
+        this._setTabindex(btn, btn === item);
       });
-    }
 
-    /** @private */
-    _getButtonFromEvent(e) {
-      return Array.from(e.composedPath()).filter((el) => el.localName === 'vaadin-menu-bar-button')[0];
+      if (wasExpanded && item.item && item.item.children) {
+        this.__openSubMenu(item, true, { keepFocus: true });
+      } else if (item === this._overflow) {
+        this._hideTooltip();
+      } else {
+        this._showTooltip(item);
+      }
     }
 
     /** @private */
-    _getCurrentButton() {
-      return this.shadowRoot.activeElement || this._expandedButton;
+    _getButtonFromEvent(e) {
+      return Array.from(e.composedPath()).find((el) => el.localName === 'vaadin-menu-bar-button');
     }
 
     /**
-     * @param {!FocusEvent} event
+     * Override method inherited from `FocusMixin`
+     *
+     * @param {boolean} focused
+     * @override
      * @protected
      */
-    _onFocusin() {
-      const target = this.shadowRoot.querySelector('[part$="button"][tabindex="0"]');
-      if (target) {
-        this._buttons.forEach((btn) => {
-          this._setTabindex(btn, btn === target);
-        });
+    _setFocused(focused) {
+      if (focused) {
+        const target = this.shadowRoot.querySelector('[part$="button"][tabindex="0"]');
+        if (target) {
+          this._buttons.forEach((btn) => {
+            this._setTabindex(btn, btn === target);
+            if (btn === target && btn !== this._overflow && isKeyboardActive()) {
+              this._showTooltip(btn);
+            }
+          });
+        }
+      } else {
+        this._hideTooltip();
       }
     }
 
     /**
      * @param {!KeyboardEvent} event
-     * @protected
+     * @private
      */
-    _onKeydown(event) {
+    _onArrowDown(event) {
+      // Prevent page scroll.
+      event.preventDefault();
+
       const button = this._getButtonFromEvent(event);
-      if (button) {
-        if (event.keyCode === 40) {
-          // ArrowDown, prevent page scroll
-          event.preventDefault();
-          if (button === this._expandedButton) {
-            // Menu opened previously, focus first item
-            this._focusFirstItem();
-          } else {
-            this.__openSubMenu(button, event);
-          }
-        } else if (event.keyCode === 38) {
-          // ArrowUp, prevent page scroll
-          event.preventDefault();
-          if (button === this._expandedButton) {
-            // Menu opened previously, focus last item
-            this._focusLastItem();
-          } else {
-            this.__openSubMenu(button, event, { focusLast: true });
-          }
-        } else if (event.keyCode === 27 && button === this._expandedButton) {
-          this._close(true);
-        } else {
-          this._navigateByKey(event);
-        }
+      if (button === this._expandedButton) {
+        // Menu opened previously, focus first item
+        this._focusFirstItem();
+      } else {
+        this.__openSubMenu(button, true);
       }
     }
 
-    /** @private */
-    _navigateByKey(event) {
-      // IE names for arrows do not include the Arrow prefix
-      const key = event.key.replace(/^Arrow/, '');
-      const buttons = this._buttons;
-      const currentBtn = this._getCurrentButton();
-      const currentIdx = buttons.indexOf(currentBtn);
-      let idx;
-      let increment;
-      const dirIncrement = this.__isRTL ? -1 : 1;
-
-      switch (key) {
-        case 'Left':
-          increment = -dirIncrement;
-          idx = currentIdx - dirIncrement;
-          break;
-        case 'Right':
-          increment = dirIncrement;
-          idx = currentIdx + dirIncrement;
-          break;
-        case 'Home':
-          increment = 1;
-          idx = 0;
-          break;
-        case 'End':
-          increment = -1;
-          idx = buttons.length - 1;
-          break;
-        default:
-        // Do nothing.
-      }
+    /**
+     * @param {!KeyboardEvent} event
+     * @private
+     */
+    _onArrowUp(event) {
+      // Prevent page scroll.
+      event.preventDefault();
 
-      idx = this._getAvailableIndex(idx, increment, buttons);
-      if (idx >= 0) {
-        event.preventDefault();
-        const btn = buttons[idx];
-        const wasExpanded = currentBtn === this._expandedButton;
-        if (wasExpanded) {
-          this._close();
-        }
-        this._focusButton(btn);
-        if (wasExpanded && btn.item && btn.item.children) {
-          this.__openSubMenu(btn, event, { keepFocus: true });
-        }
+      const button = this._getButtonFromEvent(event);
+      if (button === this._expandedButton) {
+        // Menu opened previously, focus last item
+        this._focusLastItem();
+      } else {
+        this.__openSubMenu(button, true, { focusLast: true });
       }
     }
 
-    /** @private */
-    _getAvailableIndex(index, increment, buttons) {
-      const totalItems = buttons.length;
-      let idx = index;
-      for (let i = 0; typeof idx === 'number' && i < totalItems; i++, idx += increment || 1) {
-        if (idx < 0) {
-          idx = totalItems - 1;
-        } else if (idx >= totalItems) {
-          idx = 0;
-        }
+    /**
+     * Override an event listener from `KeyboardMixin`:
+     * - to close the sub-menu for expanded button,
+     * - to close a tooltip for collapsed button.
+     *
+     * @param {!KeyboardEvent} event
+     * @protected
+     * @override
+     */
+    _onEscape(event) {
+      if (event.composedPath().includes(this._expandedButton)) {
+        this._close(true);
+      }
 
-        const btn = buttons[idx];
-        if (!btn.disabled && !btn.hasAttribute('hidden')) {
-          return idx;
-        }
+      this._hideTooltip();
+    }
+
+    /**
+     * Override an event listener from `KeyboardMixin`.
+     *
+     * @param {!KeyboardEvent} event
+     * @protected
+     * @override
+     */
+    _onKeyDown(event) {
+      switch (event.key) {
+        case 'ArrowDown':
+          this._onArrowDown(event);
+          break;
+        case 'ArrowUp':
+          this._onArrowUp(event);
+          break;
+        default:
+          super._onKeyDown(event);
+          break;
       }
-      return -1;
     }
 
     /** @private */
@@ -243,16 +308,22 @@ export const InteractionsMixin = (superClass) =>
       if (button && button !== this._expandedButton) {
         const isOpened = this._subMenu.opened;
         if (button.item.children && (this.openOnHover || isOpened)) {
-          this.__openSubMenu(button, e);
+          this.__openSubMenu(button, false);
         } else if (isOpened) {
           this._close();
         }
+
+        if (button === this._overflow || (this.openOnHover && button.item.children)) {
+          this._hideTooltip();
+        } else {
+          this._showTooltip(button);
+        }
       }
     }
 
     /** @private */
     __onContextMenuKeydown(e) {
-      const item = Array.from(e.composedPath()).filter((el) => el._item)[0];
+      const item = Array.from(e.composedPath()).find((el) => el._item);
       if (item) {
         const list = item.parentNode;
         if (e.keyCode === 38 && item === list.items[0]) {
@@ -262,11 +333,7 @@ export const InteractionsMixin = (superClass) =>
         if (e.keyCode === 37 || (e.keyCode === 39 && !item._item.children)) {
           // Prevent ArrowLeft from being handled in context-menu
           e.stopImmediatePropagation();
-          this._navigateByKey(e);
-          const button = this.shadowRoot.activeElement;
-          if (button && button.item && button.item.children) {
-            this.__openSubMenu(button, e, { keepFocus: true });
-          }
+          this._onKeyDown(e);
         }
       }
     }
@@ -281,12 +348,12 @@ export const InteractionsMixin = (superClass) =>
       e.stopPropagation();
       const button = this._getButtonFromEvent(e);
       if (button) {
-        this.__openSubMenu(button, e);
+        this.__openSubMenu(button, false);
       }
     }
 
     /** @private */
-    __openSubMenu(button, event, options = {}) {
+    __openSubMenu(button, keydown, options = {}) {
       const subMenu = this._subMenu;
       const item = button.item;
 
@@ -319,27 +386,33 @@ export const InteractionsMixin = (superClass) =>
             },
           }),
         );
+        this._hideTooltip();
 
         this._setExpanded(button, true);
       });
 
-      if (options.focusLast) {
-        this.__onceOpened(() => this._focusLastItem());
-      }
+      this.style.pointerEvents = 'auto';
 
-      if (options.keepFocus) {
-        this.__onceOpened(() => {
-          this._focusButton(this._expandedButton);
-        });
-      }
+      overlay.addEventListener(
+        'vaadin-overlay-open',
+        () => {
+          if (options.focusLast) {
+            this._focusLastItem();
+          }
 
-      this.__onceOpened(() => {
-        // Do not focus item when open not from keyboard
-        if (event.type !== 'keydown') {
-          subMenu.$.overlay.$.overlay.focus();
-        }
-        overlay._updatePosition();
-      });
+          if (options.keepFocus) {
+            this._focusItem(this._expandedButton, false);
+          }
+
+          // Do not focus item when open not from keyboard
+          if (!keydown) {
+            overlay.$.overlay.focus();
+          }
+
+          overlay._updatePosition();
+        },
+        { once: true },
+      );
     }
 
     /** @private */
@@ -357,17 +430,6 @@ export const InteractionsMixin = (superClass) =>
       }
     }
 
-    /** @private */
-    __onceOpened(cb) {
-      this.style.pointerEvents = 'auto';
-      const overlay = this._subMenu.$.overlay;
-      const listener = () => {
-        cb();
-        overlay.removeEventListener('vaadin-overlay-open', listener);
-      };
-      overlay.addEventListener('vaadin-overlay-open', listener);
-    }
-
     /** @private */
     __onItemSelected(e) {
       e.stopPropagation();
@@ -386,7 +448,7 @@ export const InteractionsMixin = (superClass) =>
       if (button && button.hasAttribute('expanded')) {
         this._setExpanded(button, false);
         if (restoreFocus) {
-          this._focusButton(button);
+          this._focusItem(button, false);
         }
         this._expandedButton = null;
       }

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

@@ -3,7 +3,7 @@
  * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { ContextMenu } from '@vaadin/vaadin-context-menu/src/vaadin-context-menu.js';
+import { ContextMenu } from '@vaadin/context-menu/src/vaadin-context-menu.js';
 
 /**
  * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.

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

@@ -3,6 +3,7 @@
  * Copyright (c) 2019 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
 import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
@@ -11,17 +12,17 @@ import { InteractionsMixin } from './vaadin-menu-bar-interactions-mixin.js';
 
 export interface MenuBarItem {
   text?: string;
-  component?: string | HTMLElement;
+  component?: HTMLElement | string;
   disabled?: boolean;
-  theme?: string | string[];
+  theme?: string[] | string;
   children?: SubMenuItem[];
 }
 
 export interface SubMenuItem {
   text?: string;
-  component?: string | HTMLElement;
+  component?: HTMLElement | string;
   disabled?: boolean;
-  theme?: string | string[];
+  theme?: string[] | string;
   checked?: boolean;
   children?: SubMenuItem[];
 }
@@ -68,7 +69,14 @@ export interface MenuBarEventMap extends HTMLElementEventMap, MenuBarCustomEvent
  * `menu-bar-button` | The menu bar button.
  * `overflow-button` | The "overflow" button appearing when menu bar width is not enough to fit all the buttons.
  *
- * See [Styling Components](https://vaadin.com/docs/latest/ds/customization/styling-components) documentation.
+ * The following state attributes are available for styling:
+ *
+ * Attribute           | Description
+ * --------------------|----------------------------------
+ * `disabled`          | Set when the menu bar is disabled
+ * `has-single-button` | Set when there is only one button visible
+ *
+ * See [Styling Components](https://vaadin.com/docs/latest/styling/custom-theme/styling-components) documentation.
  *
  * ### Internal components
  *
@@ -82,7 +90,9 @@ export interface MenuBarEventMap extends HTMLElementEventMap, MenuBarCustomEvent
  *
  * @fires {CustomEvent} item-selected - Fired when a submenu item or menu bar button without children is clicked.
  */
-declare class MenuBar extends ButtonsMixin(DisabledMixin(InteractionsMixin(ElementMixin(ThemableMixin(HTMLElement))))) {
+declare class MenuBar extends ButtonsMixin(
+  DisabledMixin(InteractionsMixin(ElementMixin(ThemableMixin(ControllerMixin(HTMLElement))))),
+) {
   /**
    * Defines a hierarchical structure, where root level items represent menu bar buttons,
    * and `children` property configures a submenu with items to be opened below
@@ -138,13 +148,13 @@ declare class MenuBar extends ButtonsMixin(DisabledMixin(InteractionsMixin(Eleme
   addEventListener<K extends keyof MenuBarEventMap>(
     type: K,
     listener: (this: MenuBar, ev: MenuBarEventMap[K]) => void,
-    options?: boolean | AddEventListenerOptions,
+    options?: AddEventListenerOptions | boolean,
   ): void;
 
   removeEventListener<K extends keyof MenuBarEventMap>(
     type: K,
     listener: (this: MenuBar, ev: MenuBarEventMap[K]) => void,
-    options?: boolean | EventListenerOptions,
+    options?: EventListenerOptions | boolean,
   ): void;
 
   /**

package/src/vaadin-menu-bar.js

@@ -6,8 +6,10 @@
 import './vaadin-menu-bar-submenu.js';
 import './vaadin-menu-bar-button.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
 import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
+import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { ButtonsMixin } from './vaadin-menu-bar-buttons-mixin.js';
 import { InteractionsMixin } from './vaadin-menu-bar-interactions-mixin.js';
@@ -39,7 +41,14 @@ import { InteractionsMixin } from './vaadin-menu-bar-interactions-mixin.js';
  * `menu-bar-button` | The menu bar button.
  * `overflow-button` | The "overflow" button appearing when menu bar width is not enough to fit all the buttons.
  *
- * See [Styling Components](https://vaadin.com/docs/latest/ds/customization/styling-components) documentation.
+ * The following state attributes are available for styling:
+ *
+ * Attribute           | Description
+ * --------------------|----------------------------------
+ * `disabled`          | Set when the menu bar is disabled
+ * `has-single-button` | Set when there is only one button visible
+ *
+ * See [Styling Components](https://vaadin.com/docs/latest/styling/custom-theme/styling-components) documentation.
  *
  * ### Internal components
  *
@@ -54,12 +63,16 @@ import { InteractionsMixin } from './vaadin-menu-bar-interactions-mixin.js';
  * @fires {CustomEvent<boolean>} item-selected - Fired when a submenu item or menu bar button without children is clicked.
  *
  * @extends HTMLElement
+ * @mixes ControllerMixin
  * @mixes ButtonsMixin
  * @mixes InteractionsMixin
+ * @mixes DisabledMixin
  * @mixes ElementMixin
  * @mixes ThemableMixin
  */
-class MenuBar extends ButtonsMixin(DisabledMixin(InteractionsMixin(ElementMixin(ThemableMixin(PolymerElement))))) {
+class MenuBar extends ButtonsMixin(
+  DisabledMixin(InteractionsMixin(ElementMixin(ThemableMixin(ControllerMixin(PolymerElement))))),
+) {
   static get template() {
     return html`
       <style>
@@ -101,6 +114,8 @@ class MenuBar extends ButtonsMixin(DisabledMixin(InteractionsMixin(ElementMixin(
         </vaadin-menu-bar-button>
       </div>
       <vaadin-menu-bar-submenu is-root=""></vaadin-menu-bar-submenu>
+
+      <slot name="tooltip"></slot>
     `;
   }
 
@@ -205,6 +220,15 @@ class MenuBar extends ButtonsMixin(DisabledMixin(InteractionsMixin(ElementMixin(
     return ['_themeChanged(_theme)'];
   }
 
+  /** @protected */
+  ready() {
+    super.ready();
+
+    this._tooltipController = new TooltipController(this);
+    this._tooltipController.setManual(true);
+    this.addController(this._tooltipController);
+  }
+
   /**
    * Override method inherited from `DisabledMixin`
    * to update the `disabled` property for the buttons

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

@@ -0,0 +1,17 @@
+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]) [part$='button'] {
+      border-radius: var(--lumo-border-radius-m);
+    }
+
+    :host([theme~='end-aligned']) [part$='button']:first-child,
+    :host([theme~='end-aligned'][has-single-button]) [part$='button'] {
+      margin-inline-start: auto;
+    }
+  `,
+  { moduleId: 'lumo-menu-bar' },
+);

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

@@ -1,5 +1,6 @@
 import './vaadin-menu-bar-button.js';
 import './vaadin-menu-bar-item-styles.js';
 import './vaadin-menu-bar-overlay-styles.js';
-import '@vaadin/vaadin-context-menu/theme/lumo/vaadin-context-menu.js';
+import './vaadin-menu-bar-styles.js';
+import '@vaadin/context-menu/theme/lumo/vaadin-context-menu.js';
 import '../../src/vaadin-menu-bar.js';

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

@@ -14,8 +14,8 @@ const menuBarButton = css`
     justify-content: center;
   }
 
-  :host([theme='outlined']),
-  :host([theme='contained']) {
+  :host([theme~='outlined']),
+  :host([theme~='contained']) {
     border-radius: 0;
   }
 
@@ -36,7 +36,7 @@ const menuBarButton = css`
     transition: 0s;
   }
 
-  :host([theme='contained'][expanded]) {
+  :host([theme~='contained'][expanded]) {
     box-shadow: var(--material-shadow-elevation-8dp);
   }
 
@@ -45,7 +45,7 @@ const menuBarButton = css`
     opacity: 0;
   }
 
-  :host([theme='contained']:not([dir='rtl'])) {
+  :host([theme~='contained']:not([dir='rtl'])) {
     margin-right: 1px;
   }
 
@@ -68,16 +68,16 @@ const menuBarButton = css`
     font-size: 24px;
   }
 
-  :host([theme='outlined']:not([dir='rtl'])) {
+  :host([theme~='outlined']:not([dir='rtl'])) {
     margin-right: -1px;
   }
 
-  :host([theme='outlined']:not([dir='rtl']):nth-last-of-type(2)),
-  :host([theme='outlined']:not([dir='rtl'])[part~='overflow-button']) {
+  :host([theme~='outlined']:not([dir='rtl']):nth-last-of-type(2)),
+  :host([theme~='outlined']:not([dir='rtl'])[part~='overflow-button']) {
     margin-right: 0;
   }
 
-  :host([theme='text']),
+  :host([theme~='text']),
   :host(:not([theme])) {
     border-radius: 4px;
   }
@@ -92,16 +92,16 @@ const menuBarButton = css`
     border-radius: 4px 0 0 4px;
   }
 
-  :host([dir='rtl'][theme='contained']) {
+  :host([dir='rtl'][theme~='contained']) {
     margin-left: 1px;
   }
 
-  :host([dir='rtl'][theme='outlined']) {
+  :host([dir='rtl'][theme~='outlined']) {
     margin-left: -1px;
   }
 
-  :host([theme='outlined'][dir='rtl']:nth-last-of-type(2)),
-  :host([theme='outlined'][dir='rtl'][part~='overflow-button']) {
+  :host([theme~='outlined'][dir='rtl']:nth-last-of-type(2)),
+  :host([theme~='outlined'][dir='rtl'][part~='overflow-button']) {
     margin-left: 0;
   }
 `;

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

@@ -7,6 +7,15 @@ registerStyles(
       /* To retain the box-shadow */
       padding-bottom: 5px;
     }
+
+    :host([has-single-button]) [part$='button'] {
+      border-radius: 4px;
+    }
+
+    :host([theme~='end-aligned']) [part$='button']:first-child,
+    :host([theme~='end-aligned'][has-single-button]) [part$='button'] {
+      margin-inline-start: auto;
+    }
   `,
   { moduleId: 'material-menu-bar' },
 );

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

@@ -2,5 +2,5 @@ import './vaadin-menu-bar-button.js';
 import './vaadin-menu-bar-item-styles.js';
 import './vaadin-menu-bar-styles.js';
 import './vaadin-menu-bar-overlay-styles.js';
-import '@vaadin/vaadin-context-menu/theme/material/vaadin-context-menu.js';
+import '@vaadin/context-menu/theme/material/vaadin-context-menu.js';
 import '../../src/vaadin-menu-bar.js';

package/web-types.json

@@ -0,0 +1,101 @@
+{
+  "$schema": "https://json.schemastore.org/web-types",
+  "name": "@vaadin/menu-bar",
+  "version": "23.3.0-alpha1",
+  "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```\n<vaadin-menu-bar></vaadin-menu-bar>\n```\n\nAnd then use [`items`](https://cdn.vaadin.com/vaadin-web-components/23.3.0-alpha1/#/elements/vaadin-menu-bar#property-items) property to initialize the structure:\n\n```\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`menu-bar-button` | The menu bar button.\n`overflow-button` | The \"overflow\" button appearing when menu bar width is not enough to fit all the 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/custom-theme/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/23.3.0-alpha1/#/elements/vaadin-button).\n- `<vaadin-context-menu-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/23.3.0-alpha1/#/elements/vaadin-item).\n- `<vaadin-context-menu-list-box>` - has the same API as [`<vaadin-list-box>`](https://cdn.vaadin.com/vaadin-web-components/23.3.0-alpha1/#/elements/vaadin-list-box).\n- `<vaadin-context-menu-overlay>` - has the same API as [`<vaadin-overlay>`](https://cdn.vaadin.com/vaadin-web-components/23.3.0-alpha1/#/elements/vaadin-overlay).",
+          "attributes": [
+            {
+              "name": "open-on-hover",
+              "description": "If true, the submenu will open on hover (mouseover) instead of click.",
+              "value": {
+                "type": [
+                  "boolean",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "disabled",
+              "description": "If true, the user cannot interact with this element.",
+              "value": {
+                "type": [
+                  "boolean",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "theme",
+              "description": "The theme variants to apply to the component.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            }
+          ],
+          "js": {
+            "properties": [
+              {
+                "name": "openOnHover",
+                "description": "If true, the submenu will open on hover (mouseover) instead of click.",
+                "value": {
+                  "type": [
+                    "boolean",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "disabled",
+                "description": "If true, the user cannot interact with this element.",
+                "value": {
+                  "type": [
+                    "boolean",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "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    children: [\n      {text: '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```",
+                "value": {
+                  "type": [
+                    "Array.<MenuBarItem>"
+                  ]
+                }
+              },
+              {
+                "name": "i18n",
+                "description": "The object used to localize this component.\nTo change the default localization, replace the entire\n`i18n` object with a custom one.\n\nTo update individual properties, extend the existing i18n object like so:\n```\nmenuBar.i18n = {\n  ...menuBar.i18n,\n  moreOptions: 'More options'\n}\n```\n\nThe object has the following JSON structure and default values:\n```\n{\n  moreOptions: 'More options'\n}\n```",
+                "value": {
+                  "type": [
+                    "MenuBarI18n"
+                  ]
+                }
+              }
+            ],
+            "events": [
+              {
+                "name": "item-selected",
+                "description": "Fired when either a submenu item or menu bar button without nested children is clicked."
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}

package/web-types.lit.json

@@ -0,0 +1,62 @@
+{
+  "$schema": "https://json.schemastore.org/web-types",
+  "name": "@vaadin/menu-bar",
+  "version": "23.3.0-alpha1",
+  "description-markup": "markdown",
+  "framework": "lit",
+  "framework-config": {
+    "enable-when": {
+      "node-packages": [
+        "lit"
+      ]
+    }
+  },
+  "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```\n<vaadin-menu-bar></vaadin-menu-bar>\n```\n\nAnd then use [`items`](https://cdn.vaadin.com/vaadin-web-components/23.3.0-alpha1/#/elements/vaadin-menu-bar#property-items) property to initialize the structure:\n\n```\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`menu-bar-button` | The menu bar button.\n`overflow-button` | The \"overflow\" button appearing when menu bar width is not enough to fit all the 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/custom-theme/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/23.3.0-alpha1/#/elements/vaadin-button).\n- `<vaadin-context-menu-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/23.3.0-alpha1/#/elements/vaadin-item).\n- `<vaadin-context-menu-list-box>` - has the same API as [`<vaadin-list-box>`](https://cdn.vaadin.com/vaadin-web-components/23.3.0-alpha1/#/elements/vaadin-list-box).\n- `<vaadin-context-menu-overlay>` - has the same API as [`<vaadin-overlay>`](https://cdn.vaadin.com/vaadin-web-components/23.3.0-alpha1/#/elements/vaadin-overlay).",
+          "extension": true,
+          "attributes": [
+            {
+              "name": "?openOnHover",
+              "description": "If true, the submenu will open on hover (mouseover) instead of click.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "?disabled",
+              "description": "If true, the user cannot interact with this element.",
+              "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    children: [\n      {text: '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```",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".i18n",
+              "description": "The object used to localize this component.\nTo change the default localization, replace the entire\n`i18n` object with a custom one.\n\nTo update individual properties, extend the existing i18n object like so:\n```\nmenuBar.i18n = {\n  ...menuBar.i18n,\n  moreOptions: 'More options'\n}\n```\n\nThe object has the following JSON structure and default values:\n```\n{\n  moreOptions: 'More options'\n}\n```",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "@item-selected",
+              "description": "Fired when either a submenu item or menu bar button without nested children is clicked.",
+              "value": {
+                "kind": "expression"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}