@vaadin/horizontal-layout 24.7.0-alpha8 → 24.7.0-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/horizontal-layout",
-  "version": "24.7.0-alpha8",
+  "version": "24.7.0-beta1",
   "publishConfig": {
     "access": "public"
   },
@@ -36,20 +36,20 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "24.7.0-alpha8",
-    "@vaadin/vaadin-lumo-styles": "24.7.0-alpha8",
-    "@vaadin/vaadin-material-styles": "24.7.0-alpha8",
-    "@vaadin/vaadin-themable-mixin": "24.7.0-alpha8",
+    "@vaadin/component-base": "24.7.0-beta1",
+    "@vaadin/vaadin-lumo-styles": "24.7.0-beta1",
+    "@vaadin/vaadin-material-styles": "24.7.0-beta1",
+    "@vaadin/vaadin-themable-mixin": "24.7.0-beta1",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "24.7.0-alpha8",
-    "@vaadin/test-runner-commands": "24.7.0-alpha8",
+    "@vaadin/chai-plugins": "24.7.0-beta1",
+    "@vaadin/test-runner-commands": "24.7.0-beta1",
     "@vaadin/testing-helpers": "^1.1.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "d015035192480fcc8cc9df5d00a950f177b83c32"
+  "gitHead": "4043c518ef9b915cde612d2907ddc9bd10e5af17"
 }

package/src/vaadin-horizontal-layout-mixin.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2017 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { Constructor } from '@open-wc/dedupe-mixin';
+
+export declare function HorizontalLayoutMixin<T extends Constructor<HTMLElement>>(base: T): T;

package/src/vaadin-horizontal-layout-mixin.js

@@ -0,0 +1,85 @@
+/**
+ * @license
+ * Copyright (c) 2017 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { isEmptyTextNode } from '@vaadin/component-base/src/dom-utils.js';
+import { SlotObserver } from '@vaadin/component-base/src/slot-observer.js';
+
+/**
+ * @polymerMixin
+ */
+export const HorizontalLayoutMixin = (superClass) =>
+  class extends superClass {
+    /** @protected */
+    ready() {
+      super.ready();
+
+      const startSlot = this.shadowRoot.querySelector('slot:not([name])');
+      this.__startSlotObserver = new SlotObserver(startSlot, ({ currentNodes, removedNodes }) => {
+        if (removedNodes.length) {
+          this.__clearAttribute(removedNodes, 'last-start-child');
+        }
+
+        const children = currentNodes.filter((node) => node.nodeType === Node.ELEMENT_NODE);
+        this.__updateAttributes(children, 'start', false, true);
+
+        const nodes = currentNodes.filter((node) => !isEmptyTextNode(node));
+        this.toggleAttribute('has-start', nodes.length > 0);
+      });
+
+      const endSlot = this.shadowRoot.querySelector('[name="end"]');
+      this.__endSlotObserver = new SlotObserver(endSlot, ({ currentNodes, removedNodes }) => {
+        if (removedNodes.length) {
+          this.__clearAttribute(removedNodes, 'first-end-child');
+        }
+
+        this.__updateAttributes(currentNodes, 'end', true, false);
+
+        this.toggleAttribute('has-end', currentNodes.length > 0);
+      });
+
+      const middleSlot = this.shadowRoot.querySelector('[name="middle"]');
+      this.__middleSlotObserver = new SlotObserver(middleSlot, ({ currentNodes, removedNodes }) => {
+        if (removedNodes.length) {
+          this.__clearAttribute(removedNodes, 'first-middle-child');
+          this.__clearAttribute(removedNodes, 'last-middle-child');
+        }
+
+        this.__updateAttributes(currentNodes, 'middle', true, true);
+
+        this.toggleAttribute('has-middle', currentNodes.length > 0);
+      });
+    }
+
+    /** @private */
+    __clearAttribute(nodes, attr) {
+      const el = nodes.find((node) => node.nodeType === Node.ELEMENT_NODE && node.hasAttribute(attr));
+      if (el) {
+        el.removeAttribute(attr);
+      }
+    }
+
+    /** @private */
+    __updateAttributes(nodes, slot, setFirst, setLast) {
+      nodes.forEach((child, idx) => {
+        if (setFirst) {
+          const attr = `first-${slot}-child`;
+          if (idx === 0) {
+            child.setAttribute(attr, '');
+          } else if (child.hasAttribute(attr)) {
+            child.removeAttribute(attr);
+          }
+        }
+
+        if (setLast) {
+          const attr = `last-${slot}-child`;
+          if (idx === nodes.length - 1) {
+            child.setAttribute(attr, '');
+          } else if (child.hasAttribute(attr)) {
+            child.removeAttribute(attr);
+          }
+        }
+      });
+    }
+  };

package/src/vaadin-horizontal-layout-styles.js

@@ -27,6 +27,22 @@ export const baseStyles = css`
   :host([theme~='spacing']) {
     gap: 1em;
   }
+
+  :host([has-end]:not([has-middle])) ::slotted([last-start-child]) {
+    margin-inline-end: auto;
+  }
+
+  ::slotted([first-middle-child]) {
+    margin-inline-start: auto;
+  }
+
+  ::slotted([last-middle-child]) {
+    margin-inline-end: auto;
+  }
+
+  :host([has-start]:not([has-middle])) ::slotted([first-end-child]) {
+    margin-inline-start: auto;
+  }
 `;
 
 // Layout improvements are part of a feature for Flow users where children that have been configured to use full size

package/src/vaadin-horizontal-layout.d.ts

@@ -5,6 +5,7 @@
  */
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { HorizontalLayoutMixin } from './vaadin-horizontal-layout-mixin.js';
 
 /**
  * `<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.
@@ -26,8 +27,18 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * `theme="padding"` | Applies the default amount of CSS padding for the host element (specified by the theme)
  * `theme="spacing"` | Applies the default amount of CSS margin between items (specified by the theme)
  * `theme="wrap"` | Items wrap to the next row when they exceed the layout width
+ *
+ * ### Component's slots
+ *
+ * The following slots are available to be set:
+ *
+ * Slot name          | Description
+ * -------------------|---------------
+ * no name            | Default slot
+ * `middle`           | Slot for the content placed in the middle
+ * `end`              | Slot for the content placed at the end
  */
-declare class HorizontalLayout extends ThemableMixin(ElementMixin(HTMLElement)) {}
+declare class HorizontalLayout extends HorizontalLayoutMixin(ThemableMixin(ElementMixin(HTMLElement))) {}
 
 declare global {
   interface HTMLElementTagNameMap {

package/src/vaadin-horizontal-layout.js

@@ -7,6 +7,7 @@ import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { HorizontalLayoutMixin } from './vaadin-horizontal-layout-mixin.js';
 import { horizontalLayoutStyles } from './vaadin-horizontal-layout-styles.js';
 
 registerStyles('vaadin-horizontal-layout', horizontalLayoutStyles, { moduleId: 'vaadin-horizontal-layout-styles' });
@@ -32,14 +33,29 @@ registerStyles('vaadin-horizontal-layout', horizontalLayoutStyles, { moduleId: '
  * `theme="spacing"` | Applies the default amount of CSS margin between items (specified by the theme)
  * `theme="wrap"` | Items wrap to the next row when they exceed the layout width
  *
+ * ### Component's slots
+ *
+ * The following slots are available to be set:
+ *
+ * Slot name          | Description
+ * -------------------|---------------
+ * no name            | Default slot
+ * `middle`           | Slot for the content placed in the middle
+ * `end`              | Slot for the content placed at the end
+ *
  * @customElement
  * @extends HTMLElement
  * @mixes ThemableMixin
  * @mixes ElementMixin
+ * @mixes HorizontalLayoutMixin
  */
-class HorizontalLayout extends ElementMixin(ThemableMixin(PolymerElement)) {
+class HorizontalLayout extends HorizontalLayoutMixin(ElementMixin(ThemableMixin(PolymerElement))) {
   static get template() {
-    return html`<slot></slot>`;
+    return html`
+      <slot></slot>
+      <slot name="middle"></slot>
+      <slot name="end"></slot>
+    `;
   }
 
   static get is() {

package/src/vaadin-lit-horizontal-layout.js

@@ -8,6 +8,7 @@ import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { HorizontalLayoutMixin } from './vaadin-horizontal-layout-mixin.js';
 import { horizontalLayoutStyles } from './vaadin-horizontal-layout-styles.js';
 
 /**
@@ -19,7 +20,7 @@ import { horizontalLayoutStyles } from './vaadin-horizontal-layout-styles.js';
  * There is no ETA regarding specific Vaadin version where it'll land.
  * Feel free to try this code in your apps as per Apache 2.0 license.
  */
-class HorizontalLayout extends ThemableMixin(ElementMixin(PolylitMixin(LitElement))) {
+class HorizontalLayout extends HorizontalLayoutMixin(ThemableMixin(ElementMixin(PolylitMixin(LitElement)))) {
   static get is() {
     return 'vaadin-horizontal-layout';
   }
@@ -30,7 +31,11 @@ class HorizontalLayout extends ThemableMixin(ElementMixin(PolylitMixin(LitElemen
 
   /** @protected */
   render() {
-    return html`<slot></slot>`;
+    return html`
+      <slot></slot>
+      <slot name="middle"></slot>
+      <slot name="end"></slot>
+    `;
   }
 }
 

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/horizontal-layout",
-  "version": "24.7.0-alpha8",
+  "version": "24.7.0-beta1",
   "description-markup": "markdown",
   "contributions": {
     "html": {
       "elements": [
         {
           "name": "vaadin-horizontal-layout",
-          "description": "`<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.\n\n```\n<vaadin-horizontal-layout>\n  <div>Item 1</div>\n  <div>Item 2</div>\n</vaadin-horizontal-layout>\n```\n\n### Built-in Theme Variations\n\n`<vaadin-horizontal-layout>` supports the following theme variations:\n\nTheme variation | Description\n---|---\n`theme=\"margin\"` | Applies the default amount of CSS margin for the host element (specified by the theme)\n`theme=\"padding\"` | Applies the default amount of CSS padding for the host element (specified by the theme)\n`theme=\"spacing\"` | Applies the default amount of CSS margin between items (specified by the theme)\n`theme=\"wrap\"` | Items wrap to the next row when they exceed the layout width",
+          "description": "`<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.\n\n```\n<vaadin-horizontal-layout>\n  <div>Item 1</div>\n  <div>Item 2</div>\n</vaadin-horizontal-layout>\n```\n\n### Built-in Theme Variations\n\n`<vaadin-horizontal-layout>` supports the following theme variations:\n\nTheme variation | Description\n---|---\n`theme=\"margin\"` | Applies the default amount of CSS margin for the host element (specified by the theme)\n`theme=\"padding\"` | Applies the default amount of CSS padding for the host element (specified by the theme)\n`theme=\"spacing\"` | Applies the default amount of CSS margin between items (specified by the theme)\n`theme=\"wrap\"` | Items wrap to the next row when they exceed the layout width\n\n### Component's slots\n\nThe following slots are available to be set:\n\nSlot name          | Description\n-------------------|---------------\nno name            | Default slot\n`middle`           | Slot for the content placed in the middle\n`end`              | Slot for the content placed at the end",
           "attributes": [
             {
               "name": "theme",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/horizontal-layout",
-  "version": "24.7.0-alpha8",
+  "version": "24.7.0-beta1",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -16,7 +16,7 @@
       "elements": [
         {
           "name": "vaadin-horizontal-layout",
-          "description": "`<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.\n\n```\n<vaadin-horizontal-layout>\n  <div>Item 1</div>\n  <div>Item 2</div>\n</vaadin-horizontal-layout>\n```\n\n### Built-in Theme Variations\n\n`<vaadin-horizontal-layout>` supports the following theme variations:\n\nTheme variation | Description\n---|---\n`theme=\"margin\"` | Applies the default amount of CSS margin for the host element (specified by the theme)\n`theme=\"padding\"` | Applies the default amount of CSS padding for the host element (specified by the theme)\n`theme=\"spacing\"` | Applies the default amount of CSS margin between items (specified by the theme)\n`theme=\"wrap\"` | Items wrap to the next row when they exceed the layout width",
+          "description": "`<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.\n\n```\n<vaadin-horizontal-layout>\n  <div>Item 1</div>\n  <div>Item 2</div>\n</vaadin-horizontal-layout>\n```\n\n### Built-in Theme Variations\n\n`<vaadin-horizontal-layout>` supports the following theme variations:\n\nTheme variation | Description\n---|---\n`theme=\"margin\"` | Applies the default amount of CSS margin for the host element (specified by the theme)\n`theme=\"padding\"` | Applies the default amount of CSS padding for the host element (specified by the theme)\n`theme=\"spacing\"` | Applies the default amount of CSS margin between items (specified by the theme)\n`theme=\"wrap\"` | Items wrap to the next row when they exceed the layout width\n\n### Component's slots\n\nThe following slots are available to be set:\n\nSlot name          | Description\n-------------------|---------------\nno name            | Default slot\n`middle`           | Slot for the content placed in the middle\n`end`              | Slot for the content placed at the end",
           "extension": true,
           "attributes": []
         }