@vaadin/menu-bar 22.0.0-alpha9 → 22.0.0

package/README.md

@@ -1,54 +1,66 @@
-# <vaadin-menu-bar>
+# @vaadin/menu-bar
 
-[Live Demo ↗](https://vaadin.com/components/vaadin-menu-bar/html-examples)
-|
-[API documentation ↗](https://vaadin.com/components/vaadin-menu-bar/html-api)
+A web component for creating a horizontal button bar with hierarchical drop-down menus.
 
-[<vaadin-menu-bar>](https://vaadin.com/components/vaadin-menu-bar) is a Web Component providing application menu functionality, part of the [Vaadin components](https://vaadin.com/components).
+[Documentation + Live Demo ↗](https://vaadin.com/docs/latest/ds/components/menu-bar)
 
 [![npm version](https://badgen.net/npm/v/@vaadin/menu-bar)](https://www.npmjs.com/package/@vaadin/menu-bar)
-[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/vaadinvaadin-menu-bar)
 [![Discord](https://img.shields.io/discord/732335336448852018?label=discord)](https://discord.gg/PHmkCKC)
 
 ```html
 <vaadin-menu-bar></vaadin-menu-bar>
+
+<script>
+  document.querySelector('vaadin-menu-bar').items = [
+    { text: 'View' },
+    { text: 'Edit' },
+    {
+      text: 'Move',
+      children: [{ text: 'To folder' }, { text: 'To trash' }]
+    },
+    { text: 'Duplicate' }
+  ];
+</script>
 ```
 
-[<img src="https://raw.githubusercontent.com/vaadin/vaadin-menu-bar/master/screenshot.png" width="200" alt="Screenshot of vaadin-menu-bar">](https://vaadin.com/components/vaadin-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/ds/components/menu-bar)
 
 ## Installation
 
-Install `vaadin-menu-bar`:
+Install the component:
 
 ```sh
-npm i @vaadin/menu-bar --save
+npm i @vaadin/menu-bar
 ```
 
-Once installed, import it in your application:
+Once installed, import the component in your application:
 
 ```js
-import '@vaadin/menu-bar/vaadin-menu-bar.js';
+import '@vaadin/menu-bar';
 ```
 
-## Getting started
-
-Vaadin components use the Lumo theme by default.
-
-To use the Material theme, import the correspondent file from the `theme/material` folder.
+## Themes
 
-## Entry points
+Vaadin components come with two built-in [themes](https://vaadin.com/docs/latest/ds/customization/using-themes), 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.
 
-- The component with the Lumo theme:
+To use the Material theme, import the component from the `theme/material` folder:
 
-  `theme/lumo/vaadin-menu-bar.js`
+```js
+import '@vaadin/menu-bar/theme/material/vaadin-menu-bar.js';
+```
 
-- The component with the Material theme:
+You can also import the Lumo version of the component explicitly:
 
-  `theme/material/vaadin-menu-bar.js`
+```js
+import '@vaadin/menu-bar/theme/lumo/vaadin-menu-bar.js';
+```
 
-- Alias for `theme/lumo/vaadin-menu-bar.js`:
+Finally, you can import the un-themed component from the `src` folder to get a minimal starting point:
 
-  `vaadin-menu-bar.js`
+```js
+import '@vaadin/menu-bar/src/vaadin-menu-bar.js';
+```
 
 ## Contributing
 
@@ -58,4 +70,5 @@ Read the [contributing guide](https://vaadin.com/docs/latest/guide/contributing/
 
 Apache License 2.0
 
-Vaadin collects development time usage statistics to improve this product. For details and to opt-out, see https://github.com/vaadin/vaadin-usage-statistics.
+Vaadin collects usage statistics at development time to improve this product.
+For details and to opt-out, see https://github.com/vaadin/vaadin-usage-statistics.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/menu-bar",
-  "version": "22.0.0-alpha9",
+  "version": "22.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -32,20 +32,21 @@
     "polymer"
   ],
   "dependencies": {
+    "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/iron-resizable-behavior": "^3.0.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "22.0.0-alpha9",
-    "@vaadin/component-base": "22.0.0-alpha9",
-    "@vaadin/vaadin-context-menu": "22.0.0-alpha9",
-    "@vaadin/vaadin-lumo-styles": "22.0.0-alpha9",
-    "@vaadin/vaadin-material-styles": "22.0.0-alpha9",
-    "@vaadin/vaadin-themable-mixin": "22.0.0-alpha9"
+    "@vaadin/button": "^22.0.0",
+    "@vaadin/component-base": "^22.0.0",
+    "@vaadin/vaadin-context-menu": "^22.0.0",
+    "@vaadin/vaadin-lumo-styles": "^22.0.0",
+    "@vaadin/vaadin-material-styles": "^22.0.0",
+    "@vaadin/vaadin-themable-mixin": "^22.0.0"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/icon": "22.0.0-alpha9",
-    "@vaadin/testing-helpers": "^0.3.0",
+    "@vaadin/icon": "^22.0.0",
+    "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^9.2.1"
   },
-  "gitHead": "6e8c899dc65918f97e3c0acb2076122c4b2ef274"
+  "gitHead": "b668e9b1a975227fbe34beb70d1cd5b03dce2348"
 }

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

@@ -4,7 +4,7 @@
  * 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';
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
+import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 registerStyles(
   'vaadin-menu-bar-button',

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

@@ -3,21 +3,16 @@
  * Copyright (c) 2021 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';
 
-declare function ButtonsMixin<T extends new (...args: any[]) => {}>(base: T): T & ButtonsMixinConstructor;
+export declare function ButtonsMixin<T extends Constructor<HTMLElement>>(base: T): T & Constructor<ButtonsMixinClass>;
 
-interface ButtonsMixinConstructor {
-  new (...args: any[]): ButtonsMixin;
-}
-
-interface ButtonsMixin {
-  readonly _buttons: HTMLElement[];
+export declare class ButtonsMixinClass {
+  protected readonly _buttons: HTMLElement[];
 
-  readonly _container: HTMLElement;
+  protected readonly _container: HTMLElement;
 
-  readonly _overflow: HTMLElement;
+  protected readonly _overflow: HTMLElement;
 
-  _hasOverflow: boolean;
+  protected _hasOverflow: boolean;
 }
-
-export { ButtonsMixin, ButtonsMixinConstructor };

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

@@ -3,14 +3,13 @@
  * Copyright (c) 2021 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';
 
-declare function InteractionsMixin<T extends new (...args: any[]) => {}>(base: T): T & InteractionsMixinConstructor;
+export declare function InteractionsMixin<T extends Constructor<HTMLElement>>(
+  base: T
+): T & Constructor<InteractionsMixinClass>;
 
-interface InteractionsMixinConstructor {
-  new (...args: any[]): InteractionsMixin;
-}
-
-interface InteractionsMixin {
+export declare class InteractionsMixinClass {
   /**
    * If true, the submenu will open on hover (mouseover) instead of click.
    * @attr {boolean} open-on-hover
@@ -23,5 +22,3 @@ interface InteractionsMixin {
    */
   notifyResize(): void;
 }
-
-export { InteractionsMixin, InteractionsMixinConstructor };

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

@@ -66,6 +66,7 @@ export const InteractionsMixin = (superClass) =>
     /** @protected */
     _setExpanded(button, expanded) {
       button.toggleAttribute('expanded', expanded);
+      button.toggleAttribute('active', expanded);
       button.setAttribute('aria-expanded', expanded ? 'true' : 'false');
     }
 
@@ -313,16 +314,16 @@ export const InteractionsMixin = (superClass) =>
 
       subMenu.items = items;
       subMenu.listenOn = button;
-      this._expandedButton = button;
+      const overlay = subMenu.$.overlay;
+      overlay.positionTarget = button;
+      overlay.noVerticalOverlap = true;
 
-      const rect = button.getBoundingClientRect();
+      this._expandedButton = button;
 
       requestAnimationFrame(() => {
         button.dispatchEvent(
           new CustomEvent('opensubmenu', {
             detail: {
-              x: this.__isRTL ? rect.right : rect.left,
-              y: rect.bottom,
               children: items
             }
           })
@@ -341,12 +342,13 @@ export const InteractionsMixin = (superClass) =>
         });
       }
 
-      // do not focus item when open not from keyboard
-      if (event.type !== 'keydown') {
-        this.__onceOpened(() => {
+      this.__onceOpened(() => {
+        // do not focus item when open not from keyboard
+        if (event.type !== 'keydown') {
           subMenu.$.overlay.$.overlay.focus();
-        });
-      }
+        }
+        overlay._updatePosition();
+      });
     }
 
     /** @private */

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

@@ -20,6 +20,7 @@ export interface SubMenuItem {
   text?: string;
   component?: string | HTMLElement;
   disabled?: boolean;
+  theme?: string | string[];
   checked?: boolean;
   children?: SubMenuItem[];
 }

package/src/vaadin-menu-bar.js

@@ -3,13 +3,13 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
+import './vaadin-menu-bar-submenu.js';
+import './vaadin-menu-bar-button.js';
+import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.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';
-import './vaadin-menu-bar-submenu.js';
-import './vaadin-menu-bar-button.js';
 
 /**
  * `<vaadin-menu-bar>` is a Web Component providing a set of horizontally stacked buttons offering

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

@@ -1,5 +1,5 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
 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 {
@@ -15,6 +15,7 @@ const menuBarButton = css`
   /* NOTE(web-padawan): avoid using shorthand padding property for IE11 */
   [part='label'] ::slotted(vaadin-context-menu-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);
@@ -45,24 +46,6 @@ const menuBarButton = css`
     padding: 0;
   }
 
-  :host([expanded]) {
-    background-color: var(--lumo-primary-color-10pct);
-  }
-
-  :host([expanded][theme~='primary']) {
-    background-color: var(--lumo-primary-color-50pct);
-  }
-
-  :host([disabled][theme~='primary']) {
-    color: var(--lumo-disabled-text-color);
-    background-color: var(--lumo-contrast-5pct);
-  }
-
-  :host([expanded][theme~='tertiary']),
-  :host([expanded][theme~='tertiary-inline']) {
-    background-color: var(--lumo-primary-color-10pct) !important;
-  }
-
   :host(:first-of-type) {
     border-radius: var(--lumo-border-radius-m) 0 0 var(--lumo-border-radius-m);
 

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

@@ -1,6 +1,6 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
 import '@vaadin/vaadin-lumo-styles/sizing.js';
 import '@vaadin/vaadin-lumo-styles/spacing.js';
+import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 registerStyles(
   'vaadin-context-menu-item',

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

@@ -1,4 +1,4 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
+import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 registerStyles(
   'vaadin-context-menu-overlay',

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

@@ -1,5 +1,5 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
 import { button } from '@vaadin/button/theme/material/vaadin-button-styles';
+import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 const menuBarButton = css`
   [part='label'] {
@@ -8,6 +8,7 @@ const menuBarButton = css`
 
   [part='label'] ::slotted(vaadin-context-menu-item) {
     line-height: 20px;
+    background-color: transparent;
     margin: -8px;
     padding: 8px;
     justify-content: center;

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

@@ -1,5 +1,5 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
 import '@vaadin/vaadin-material-styles/typography.js';
+import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 registerStyles(
   'vaadin-context-menu-item',

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

@@ -1,4 +1,4 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
+import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 registerStyles(
   'vaadin-context-menu-overlay',

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

@@ -1,4 +1,4 @@
-import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
+import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 registerStyles(
   'vaadin-menu-bar',