@vaadin/horizontal-layout 25.0.0-alpha2 → 25.0.0-alpha21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/horizontal-layout",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha21",
   "publishConfig": {
     "access": "public"
   },
@@ -21,7 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
@@ -35,19 +34,19 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/component-base": "25.0.0-alpha2",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha2",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha2",
+    "@vaadin/component-base": "25.0.0-alpha21",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha21",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha2",
-    "@vaadin/test-runner-commands": "25.0.0-alpha2",
-    "@vaadin/testing-helpers": "^2.0.0"
+    "@vaadin/chai-plugins": "25.0.0-alpha21",
+    "@vaadin/test-runner-commands": "25.0.0-alpha21",
+    "@vaadin/testing-helpers": "^2.0.0",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha21"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "67ffcd5355cf21ce1b5039c598525109fc4c164b"
+  "gitHead": "8fb9e9710c01449edf623a1aaac4655cdc11a933"
 }

package/src/{vaadin-horizontal-layout-styles.js → styles/vaadin-horizontal-layout-base-styles.js}

@@ -3,7 +3,8 @@
  * Copyright (c) 2017 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import '@vaadin/component-base/src/styles/style-props.js';
+import { css } from 'lit';
 
 export const baseStyles = css`
   :host {
@@ -17,15 +18,19 @@ export const baseStyles = css`
 
   /* Theme variations */
   :host([theme~='margin']) {
-    margin: 1em;
+    margin: var(--vaadin-horizontal-layout-margin, var(--vaadin-padding-m));
   }
 
   :host([theme~='padding']) {
-    padding: 1em;
+    padding: var(--vaadin-horizontal-layout-margin, var(--vaadin-padding-m));
   }
 
   :host([theme~='spacing']) {
-    gap: 1em;
+    gap: var(--vaadin-horizontal-layout-gap, var(--vaadin-gap-s));
+  }
+
+  :host([theme~='wrap']) {
+    flex-wrap: wrap;
   }
 
   :host([has-end]:not([has-middle])) ::slotted([last-start-child]) {

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

@@ -10,7 +10,7 @@ import { HorizontalLayoutMixin } from './vaadin-horizontal-layout-mixin.js';
 /**
  * `<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.
  *
- * ```
+ * ```html
  * <vaadin-horizontal-layout>
  *   <div>Item 1</div>
  *   <div>Item 2</div>

package/src/vaadin-horizontal-layout.js

@@ -7,14 +7,15 @@ import { html, LitElement } from 'lit';
 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 { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { horizontalLayoutStyles } from './styles/vaadin-horizontal-layout-base-styles.js';
 import { HorizontalLayoutMixin } from './vaadin-horizontal-layout-mixin.js';
-import { horizontalLayoutStyles } from './vaadin-horizontal-layout-styles.js';
 
 /**
  * `<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.
  *
- * ```
+ * ```html
  * <vaadin-horizontal-layout>
  *   <div>Item 1</div>
  *   <div>Item 2</div>
@@ -48,7 +49,9 @@ import { horizontalLayoutStyles } from './vaadin-horizontal-layout-styles.js';
  * @mixes ElementMixin
  * @mixes HorizontalLayoutMixin
  */
-class HorizontalLayout extends HorizontalLayoutMixin(ThemableMixin(ElementMixin(PolylitMixin(LitElement)))) {
+class HorizontalLayout extends HorizontalLayoutMixin(
+  ThemableMixin(ElementMixin(PolylitMixin(LumoInjectionMixin(LitElement)))),
+) {
   static get is() {
     return 'vaadin-horizontal-layout';
   }
@@ -57,6 +60,12 @@ class HorizontalLayout extends HorizontalLayoutMixin(ThemableMixin(ElementMixin(
     return horizontalLayoutStyles;
   }
 
+  static get lumoInjector() {
+    return {
+      includeBaseStyles: true,
+    };
+  }
+
   /** @protected */
   render() {
     return html`

package/vaadin-horizontal-layout.js

@@ -1,2 +1,2 @@
-import './theme/lumo/vaadin-horizontal-layout.js';
+import './src/vaadin-horizontal-layout.js';
 export * from './src/vaadin-horizontal-layout.js';

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/horizontal-layout",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha21",
   "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\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",
+          "description": "`<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.\n\n```html\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": "25.0.0-alpha2",
+  "version": "25.0.0-alpha21",
   "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\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",
+          "description": "`<vaadin-horizontal-layout>` provides a simple way to horizontally align your HTML elements.\n\n```html\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": []
         }

package/theme/lumo/vaadin-horizontal-layout-styles.d.ts

@@ -1 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/spacing.js';

package/theme/lumo/vaadin-horizontal-layout-styles.js

@@ -1,38 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const horizontalLayout = css`
-  :host([theme~='margin']) {
-    margin: var(--lumo-space-m);
-  }
-
-  :host([theme~='padding']) {
-    padding: var(--lumo-space-m);
-  }
-
-  :host([theme~='spacing-xs']) {
-    gap: var(--lumo-space-xs);
-  }
-
-  :host([theme~='spacing-s']) {
-    gap: var(--lumo-space-s);
-  }
-
-  :host([theme~='spacing']) {
-    gap: var(--lumo-space-m);
-  }
-
-  :host([theme~='spacing-l']) {
-    gap: var(--lumo-space-l);
-  }
-
-  :host([theme~='spacing-xl']) {
-    gap: var(--lumo-space-xl);
-  }
-
-  :host([theme~='wrap']) {
-    flex-wrap: wrap;
-  }
-`;
-
-registerStyles('vaadin-horizontal-layout', horizontalLayout, { moduleId: 'lumo-horizontal-layout' });

package/theme/lumo/vaadin-horizontal-layout.d.ts

@@ -1,2 +0,0 @@
-import './vaadin-horizontal-layout-styles.js';
-import '../../src/vaadin-horizontal-layout.js';

package/theme/lumo/vaadin-horizontal-layout.js

@@ -1,2 +0,0 @@
-import './vaadin-horizontal-layout-styles.js';
-import '../../src/vaadin-horizontal-layout.js';