@vaadin/menu-bar 25.4.0-dev.55bb86e155 → 25.4.0-dev.c9532cd333

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/menu-bar",
-  "version": "25.4.0-dev.55bb86e155",
+  "version": "25.4.0-dev.c9532cd333",
   "publishConfig": {
     "access": "public"
   },
@@ -35,23 +35,23 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.4.0-dev.55bb86e155",
-    "@vaadin/button": "25.4.0-dev.55bb86e155",
-    "@vaadin/component-base": "25.4.0-dev.55bb86e155",
-    "@vaadin/context-menu": "25.4.0-dev.55bb86e155",
-    "@vaadin/item": "25.4.0-dev.55bb86e155",
-    "@vaadin/list-box": "25.4.0-dev.55bb86e155",
-    "@vaadin/overlay": "25.4.0-dev.55bb86e155",
-    "@vaadin/vaadin-themable-mixin": "25.4.0-dev.55bb86e155",
+    "@vaadin/a11y-base": "25.4.0-dev.c9532cd333",
+    "@vaadin/button": "25.4.0-dev.c9532cd333",
+    "@vaadin/component-base": "25.4.0-dev.c9532cd333",
+    "@vaadin/context-menu": "25.4.0-dev.c9532cd333",
+    "@vaadin/item": "25.4.0-dev.c9532cd333",
+    "@vaadin/list-box": "25.4.0-dev.c9532cd333",
+    "@vaadin/overlay": "25.4.0-dev.c9532cd333",
+    "@vaadin/vaadin-themable-mixin": "25.4.0-dev.c9532cd333",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/aura": "25.4.0-dev.55bb86e155",
-    "@vaadin/chai-plugins": "25.4.0-dev.55bb86e155",
-    "@vaadin/icon": "25.4.0-dev.55bb86e155",
-    "@vaadin/test-runner-commands": "25.4.0-dev.55bb86e155",
+    "@vaadin/aura": "25.4.0-dev.c9532cd333",
+    "@vaadin/chai-plugins": "25.4.0-dev.c9532cd333",
+    "@vaadin/icon": "25.4.0-dev.c9532cd333",
+    "@vaadin/test-runner-commands": "25.4.0-dev.c9532cd333",
     "@vaadin/testing-helpers": "^2.0.0",
-    "@vaadin/vaadin-lumo-styles": "25.4.0-dev.55bb86e155",
+    "@vaadin/vaadin-lumo-styles": "25.4.0-dev.c9532cd333",
     "sinon": "^22.0.0"
   },
   "customElements": "custom-elements.json",
@@ -59,5 +59,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "5db8e58fb088121b067290b0ed90d12d7d4084f2"
+  "gitHead": "1fbf460cf3602f011721b6ed7d98961d1c1bf85e"
 }

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

@@ -15,6 +15,12 @@ export const menuBarStyles = css`
     display: none !important;
   }
 
+  /* Keep the width measured with all buttons in flow while the host is frozen */
+  :host([overflow-frozen]) {
+    contain: inline-size !important;
+    contain-intrinsic-inline-size: var(--_vaadin-menu-bar-content-width);
+  }
+
   [part='container'] {
     display: flex;
     flex-wrap: nowrap;

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

@@ -464,7 +464,6 @@ export const MenuBarMixin = (superClass) =>
       buttons.forEach((button) => {
         button.style.visibility = '';
         button.style.position = '';
-        button.style.width = '';
 
         // Teleport item component back from "overflow" sub-menu
         const item = button.item?.component;
@@ -529,8 +528,9 @@ export const MenuBarMixin = (superClass) =>
     }
 
     /**
-     * Positions of the buttons, read in one batch before any of them is hidden.
-     * Mirrored in RTL so that a larger value is always further along the inline axis.
+     * Layout of the buttons, the overflow button and the container, read in one batch
+     * before any button is hidden. Positions are mirrored in RTL so that a larger value
+     * is always further along the inline axis.
      *
      * @typedef {object} MenuBarOverflowLayout
      * @property {number[]} starts Inline start of each button
@@ -538,6 +538,7 @@ export const MenuBarMixin = (superClass) =>
      * @property {number[]} margins Inline start margin of each button
      * @property {number} overflowExtent Space the overflow button adds after the last button
      * @property {number} containerWidth Width of the container
+     * @property {number} contentWidth Width of all buttons and the overflow button in flow
      */
 
     /**
@@ -546,18 +547,22 @@ export const MenuBarMixin = (superClass) =>
      * @return {!MenuBarOverflowLayout}
      * @private
      */
-    __measureButtons(buttons, overflow) {
+    __getOverflowLayout(buttons, overflow) {
       const isRTL = this.__isRTL;
       const rects = buttons.map((btn) => btn.getBoundingClientRect());
       const ends = rects.map(({ left, right }) => (isRTL ? -left : right));
+      const overflowEnd = this.__getInlineEnd(overflow);
+      const containerRect = this._container.getBoundingClientRect();
+      const containerStart = isRTL ? -containerRect.right : containerRect.left;
 
       return {
         starts: rects.map(({ left, right }) => (isRTL ? -right : left)),
         ends,
         // `auto` resolves to 0 while the content overflows.
         margins: buttons.map((btn) => parseFloat(getComputedStyle(btn).marginInlineStart) || 0),
-        overflowExtent: this.__getInlineEnd(overflow) - ends.at(-1),
-        containerWidth: this._container.getBoundingClientRect().width,
+        overflowExtent: overflowEnd - ends.at(-1),
+        containerWidth: containerRect.width,
+        contentWidth: overflowEnd - containerStart,
       };
     }
 
@@ -588,30 +593,32 @@ export const MenuBarMixin = (superClass) =>
     }
 
     /**
-     * Hides the buttons that do not fit next to the overflow button.
+     * Keeps the intrinsic width of the host at the given value. A parent sized by content,
+     * such as a split layout pane, shrinks the host once the buttons are out of flow. The
+     * width the host had with all buttons in flow keeps the collapse that was decided for it.
+     * The `overflow-frozen` attribute marks the frozen state for the styles and for the next
+     * detection. It is internal and not documented.
      *
-     * @param {!Array<!HTMLElement>} buttons
-     * @param {!MenuBarOverflowLayout} layout
-     * @return {!Array<!HTMLElement>} hidden buttons, in DOM order
+     * @param {number} width
      * @private
      */
-    __collapseButtons(buttons, layout) {
-      const collapsed = this.__getButtonsToCollapse(buttons, layout);
-      // Read button widths once outside of the loop to avoid repetitive layout
-      const widths = collapsed.map((btn) => getComputedStyle(btn).width);
+    __freezeWidth(width) {
+      this.style.setProperty('--_vaadin-menu-bar-content-width', `${width}px`);
+      this.setAttribute('overflow-frozen', '');
+    }
 
-      // Write the DOM state
-      collapsed.forEach((btn, i) => {
-        btn.style.width = widths[i];
-        btn.style.visibility = 'hidden';
-        btn.style.position = 'absolute';
-      });
-      return collapsed;
+    /** @private */
+    __unfreezeWidth() {
+      this.style.removeProperty('--_vaadin-menu-bar-content-width');
+      this.removeAttribute('overflow-frozen');
     }
 
     /**
      * Shows the overflow button and collapses buttons into it when the last button
-     * does not fit in the container.
+     * does not fit in the container. Freezes the host width when the parent shrinks
+     * the host after the collapse. A frozen host stays frozen until all buttons and the
+     * overflow button fit, so that its flex basis does not change between detections
+     * when another element in the same row depends on it.
      *
      * @param {!Array<!HTMLElement>} buttons
      * @param {!HTMLElement} overflow
@@ -619,15 +626,31 @@ export const MenuBarMixin = (superClass) =>
      */
     __setOverflowItems(buttons, overflow) {
       const lastButton = buttons.at(-1);
-      if (!lastButton || !this.__isPastContainerEnd(lastButton)) {
+      // A frozen host is as wide as all buttons plus the overflow button, so the quick
+      // check would report a fit one overflow button too early. Measure instead.
+      const wasFrozen = this.hasAttribute('overflow-frozen');
+      if (!lastButton || (!wasFrozen && !this.__isPastContainerEnd(lastButton))) {
+        this.__unfreezeWidth();
         return;
       }
       this._hasOverflow = true;
 
       // Read the layout once the overflow button is in flow
-      const layout = this.__measureButtons(buttons, overflow);
-      const collapsed = this.__collapseButtons(buttons, layout);
+      const layout = this.__getOverflowLayout(buttons, overflow);
+      const collapsed = this.__getButtonsToCollapse(buttons, layout);
+
+      // Write the DOM state
+      collapsed.forEach((btn) => {
+        btn.style.visibility = 'hidden';
+        btn.style.position = 'absolute';
+      });
       this.__updateOverflow(collapsed.map((btn) => btn.item));
+
+      if (collapsed.length === 0) {
+        this.__unfreezeWidth();
+      } else if (wasFrozen || this.__isPastContainerEnd(overflow)) {
+        this.__freezeWidth(layout.contentWidth);
+      }
     }
 
     /** @private */

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/menu-bar",
-  "version": "25.4.0-dev.55bb86e155",
+  "version": "25.4.0-dev.c9532cd333",
   "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.4.0-dev.55bb86e155/#/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-overflow`      | Set when one or more buttons are collapsed into the overflow sub-menu\n`has-single-button` | Set when there is only one button visible\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property         |\n:---------------------------|\n| `--vaadin-menu-bar-gap`   |\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.4.0-dev.55bb86e155/#/elements/vaadin-button).\n- `<vaadin-menu-bar-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.4.0-dev.55bb86e155/#/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.4.0-dev.55bb86e155/#/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.4.0-dev.55bb86e155/#/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.4.0-dev.c9532cd333/#/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-overflow`      | Set when one or more buttons are collapsed into the overflow sub-menu\n`has-single-button` | Set when there is only one button visible\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property         |\n:---------------------------|\n| `--vaadin-menu-bar-gap`   |\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.4.0-dev.c9532cd333/#/elements/vaadin-button).\n- `<vaadin-menu-bar-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.4.0-dev.c9532cd333/#/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.4.0-dev.c9532cd333/#/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.4.0-dev.c9532cd333/#/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",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/menu-bar",
-  "version": "25.4.0-dev.55bb86e155",
+  "version": "25.4.0-dev.c9532cd333",
   "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.4.0-dev.55bb86e155/#/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-overflow`      | Set when one or more buttons are collapsed into the overflow sub-menu\n`has-single-button` | Set when there is only one button visible\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property         |\n:---------------------------|\n| `--vaadin-menu-bar-gap`   |\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.4.0-dev.55bb86e155/#/elements/vaadin-button).\n- `<vaadin-menu-bar-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.4.0-dev.55bb86e155/#/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.4.0-dev.55bb86e155/#/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.4.0-dev.55bb86e155/#/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.4.0-dev.c9532cd333/#/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-overflow`      | Set when one or more buttons are collapsed into the overflow sub-menu\n`has-single-button` | Set when there is only one button visible\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property         |\n:---------------------------|\n| `--vaadin-menu-bar-gap`   |\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.4.0-dev.c9532cd333/#/elements/vaadin-button).\n- `<vaadin-menu-bar-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.4.0-dev.c9532cd333/#/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.4.0-dev.c9532cd333/#/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.4.0-dev.c9532cd333/#/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": [
             {