@vaadin/menu-bar 24.8.4 → 25.0.0-alpha10

package/README.md

@@ -38,29 +38,6 @@ Once installed, import the component in your application:
 import '@vaadin/menu-bar';
 ```
 
-## Themes
-
-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/main/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:
-
-```js
-import '@vaadin/menu-bar/theme/material/vaadin-menu-bar.js';
-```
-
-You can also import the Lumo version of the component explicitly:
-
-```js
-import '@vaadin/menu-bar/theme/lumo/vaadin-menu-bar.js';
-```
-
-Finally, you can import the un-themed component from the `src` folder to get a minimal starting point:
-
-```js
-import '@vaadin/menu-bar/src/vaadin-menu-bar.js';
-```
-
 ## Contributing
 
 Read the [contributing guide](https://vaadin.com/docs/latest/contributing) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/menu-bar",
-  "version": "24.8.4",
+  "version": "25.0.0-alpha10",
   "publishConfig": {
     "access": "public"
   },
@@ -21,6 +21,8 @@
   "type": "module",
   "files": [
     "src",
+    "!src/styles/*-base-styles.d.ts",
+    "!src/styles/*-base-styles.js",
     "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
@@ -31,34 +33,31 @@
     "Vaadin",
     "vaadin-menu-bar",
     "web-components",
-    "web-component",
-    "polymer"
+    "web-component"
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "~24.8.4",
-    "@vaadin/button": "~24.8.4",
-    "@vaadin/component-base": "~24.8.4",
-    "@vaadin/context-menu": "~24.8.4",
-    "@vaadin/item": "~24.8.4",
-    "@vaadin/list-box": "~24.8.4",
-    "@vaadin/overlay": "~24.8.4",
-    "@vaadin/vaadin-lumo-styles": "~24.8.4",
-    "@vaadin/vaadin-material-styles": "~24.8.4",
-    "@vaadin/vaadin-themable-mixin": "~24.8.4",
+    "@vaadin/a11y-base": "25.0.0-alpha10",
+    "@vaadin/button": "25.0.0-alpha10",
+    "@vaadin/component-base": "25.0.0-alpha10",
+    "@vaadin/context-menu": "25.0.0-alpha10",
+    "@vaadin/item": "25.0.0-alpha10",
+    "@vaadin/list-box": "25.0.0-alpha10",
+    "@vaadin/overlay": "25.0.0-alpha10",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha10",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha10",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~24.8.4",
-    "@vaadin/icon": "~24.8.4",
-    "@vaadin/test-runner-commands": "~24.8.4",
-    "@vaadin/testing-helpers": "^1.1.0",
+    "@vaadin/chai-plugins": "25.0.0-alpha10",
+    "@vaadin/icon": "25.0.0-alpha10",
+    "@vaadin/test-runner-commands": "25.0.0-alpha10",
+    "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^18.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "849e54e967563080a685965e2dced02060b3ab23"
+  "gitHead": "6cc6c94079e805fa5b2f0af4dbf3b2a7485e57d0"
 }

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

@@ -0,0 +1,8 @@
+/**
+ * @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-base-styles.js

@@ -0,0 +1,55 @@
+/**
+ * @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'] {
+    display: flex;
+    flex-wrap: nowrap;
+    margin: calc((var(--vaadin-focus-ring-width) + 1px) * -1);
+    overflow: hidden;
+    padding: calc(var(--vaadin-focus-ring-width) + 1px);
+    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)) {
+    margin-inline-start: min(var(--_bw) * -1 + var(--_gap) * 1000, 0px);
+  }
+
+  ::slotted(vaadin-menu-bar-button) {
+    border-radius: var(--_rad);
+  }
+
+  ::slotted([first-visible]),
+  :host([has-single-button]) ::slotted([slot='overflow']) {
+    border-start-start-radius: var(--_rad-button);
+    border-end-start-radius: var(--_rad-button);
+  }
+
+  ::slotted(:is([last-visible], [slot='overflow'])) {
+    border-start-end-radius: var(--_rad-button);
+    border-end-end-radius: var(--_rad-button);
+  }
+
+  :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;
+  }
+`;

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

@@ -0,0 +1,8 @@
+/**
+ * @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-base-styles.js

@@ -0,0 +1,47 @@
+/**
+ * @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([focus-ring]) {
+    z-index: 1;
+  }
+
+  :host([slot='overflow']) {
+    margin-inline-end: 0;
+  }
+
+  .vaadin-button-container {
+    gap: inherit;
+  }
+
+  :host(:not([slot='overflow']):not([theme~='icon'])[aria-haspopup]) [part='suffix'] {
+    display: flex;
+    align-items: center;
+    gap: inherit;
+  }
+
+  :host(:not([slot='overflow']):not([theme~='icon'])[aria-haspopup]) [part='suffix']::after {
+    background: currentColor;
+    content: '';
+    height: var(--vaadin-icon-size, 1lh);
+    mask-image: var(--_vaadin-icon-chevron-down);
+    width: var(--vaadin-icon-size, 1lh);
+  }
+
+  ::slotted(vaadin-menu-bar-item) {
+    padding: 0;
+    gap: 0;
+  }
+
+  ::slotted(vaadin-menu-bar-item)::after {
+    display: none;
+  }
+`;

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

@@ -0,0 +1,8 @@
+/**
+ * @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

@@ -0,0 +1,16 @@
+/**
+ * @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

@@ -0,0 +1,8 @@
+/**
+ * @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

@@ -0,0 +1,24 @@
+/**
+ * @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-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @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-base-styles.js

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

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

@@ -0,0 +1,8 @@
+/**
+ * @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

@@ -0,0 +1,8 @@
+/**
+ * @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-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @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-base-styles.js

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 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-base-styles.js';
+import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-base-styles.js';
+
+export const menuBarOverlayStyles = [overlayStyles, menuOverlayStyles];

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

@@ -0,0 +1,8 @@
+/**
+ * @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

@@ -0,0 +1,9 @@
+/**
+ * @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-button.js

@@ -5,21 +5,7 @@
  */
 import { Button } from '@vaadin/button/src/vaadin-button.js';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-menu-bar-button',
-  css`
-    :host {
-      flex-shrink: 0;
-    }
-
-    :host([slot='overflow']) {
-      margin-inline-end: 0;
-    }
-  `,
-  { moduleId: 'vaadin-menu-bar-button-styles' },
-);
+import { menuBarButtonStyles } from './styles/vaadin-menu-bar-button-core-styles.js';
 
 /**
  * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.
@@ -33,8 +19,14 @@ class MenuBarButton extends Button {
     return 'vaadin-menu-bar-button';
   }
 
+  static get styles() {
+    return [super.styles, menuBarButtonStyles];
+  }
+
   /**
-   * Override method inherited from `ButtonMixin`. Sets a flag based on whether the key is an active key. Unlike a mouse click, Enter and Space should also focus the first item. This flag is used in menu bar to identify the action that triggered the click.
+   * Override method inherited from `ButtonMixin` to set a flag based on whether the key
+   * is Enter and Space. Unlike mouse click, these keys should also focus the first item.
+   * This flag is used in menu bar to identify the action that triggered the click.
    *
    * @param {KeyboardEvent} event
    * @protected

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

@@ -3,11 +3,14 @@
  * Copyright (c) 2019 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { html, LitElement } from 'lit';
 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 { 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';
 
 /**
  * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.
@@ -19,22 +22,18 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * @mixes ThemableMixin
  * @protected
  */
-class MenuBarItem extends ItemMixin(ThemableMixin(DirMixin(PolymerElement))) {
+class MenuBarItem extends ItemMixin(ThemableMixin(DirMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-menu-bar-item';
   }
 
-  static get template() {
-    return html`
-      <style>
-        :host {
-          display: inline-block;
-        }
+  static get styles() {
+    return menuBarItemStyles;
+  }
 
-        :host([hidden]) {
-          display: none !important;
-        }
-      </style>
+  /** @protected */
+  render() {
+    return html`
       <span part="checkmark" aria-hidden="true"></span>
       <div part="content">
         <slot></slot>

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

@@ -4,14 +4,13 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { ListMixin } from '@vaadin/a11y-base/src/list-mixin.js';
-import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
 import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 /**
  * An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.
  */
-declare class MenuBarListBox extends ListMixin(DirMixin(ThemableMixin(ControllerMixin(HTMLElement)))) {}
+declare class MenuBarListBox extends ListMixin(DirMixin(ThemableMixin(HTMLElement))) {}
 
 declare global {
   interface HTMLElementTagNameMap {

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

@@ -3,11 +3,13 @@
  * Copyright (c) 2019 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { html, LitElement } from 'lit';
 import { ListMixin } from '@vaadin/a11y-base/src/list-mixin.js';
-import { ControllerMixin } from '@vaadin/component-base/src/controller-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 { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 /**
@@ -15,39 +17,18 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  *
  * @customElement
  * @extends HTMLElement
- * @mixes ControllerMixin
  * @mixes DirMixin
  * @mixes ListMixin
  * @mixes ThemableMixin
  * @protected
  */
-class MenuBarListBox extends ListMixin(ThemableMixin(DirMixin(ControllerMixin(PolymerElement)))) {
+class MenuBarListBox extends ListMixin(ThemableMixin(DirMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-menu-bar-list-box';
   }
 
-  static get template() {
-    return html`
-      <style>
-        :host {
-          display: flex;
-        }
-
-        :host([hidden]) {
-          display: none !important;
-        }
-
-        [part='items'] {
-          height: 100%;
-          width: 100%;
-          overflow-y: auto;
-          -webkit-overflow-scrolling: touch;
-        }
-      </style>
-      <div part="items">
-        <slot></slot>
-      </div>
-    `;
+  static get styles() {
+    return listBoxStyles;
   }
 
   static get properties() {
@@ -56,6 +37,7 @@ class MenuBarListBox extends ListMixin(ThemableMixin(DirMixin(ControllerMixin(Po
       // but we don't want it to be modified, or be shown in the API docs.
       /** @private */
       orientation: {
+        type: String,
         readOnly: true,
       },
     };
@@ -70,6 +52,15 @@ class MenuBarListBox extends ListMixin(ThemableMixin(DirMixin(ControllerMixin(Po
     return this.shadowRoot.querySelector('[part="items"]');
   }
 
+  /** @protected */
+  render() {
+    return html`
+      <div part="items">
+        <slot></slot>
+      </div>
+    `;
+  }
+
   /** @protected */
   ready() {
     super.ready();

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

@@ -8,7 +8,6 @@ import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js
 import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
 import type { KeyboardDirectionMixinClass } from '@vaadin/a11y-base/src/keyboard-direction-mixin.js';
 import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
-import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
 import type { I18nMixinClass } from '@vaadin/component-base/src/i18n-mixin.js';
 import type { ResizeMixinClass } from '@vaadin/component-base/src/resize-mixin.js';
 
@@ -62,8 +61,7 @@ export interface MenuBarI18n {
 
 export declare function MenuBarMixin<T extends Constructor<HTMLElement>, TItem extends MenuBarItem = MenuBarItem>(
   base: T,
-): Constructor<ControllerMixinClass> &
-  Constructor<DisabledMixinClass> &
+): Constructor<DisabledMixinClass> &
   Constructor<FocusMixinClass> &
   Constructor<I18nMixinClass<MenuBarI18n>> &
   Constructor<KeyboardDirectionMixinClass> &
@@ -179,8 +177,7 @@ export declare class MenuBarMixinClass<TItem extends MenuBarItem = MenuBarItem>
 }
 
 export declare interface MenuBarMixinClass
-  extends ControllerMixinClass,
-    DisabledMixinClass,
+  extends DisabledMixinClass,
     FocusMixinClass,
     KeyboardDirectionMixinClass,
     KeyboardMixinClass,