@vaadin/input-container 25.0.0-alpha2 → 25.0.0-alpha21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/input-container",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha21",
   "publishConfig": {
     "access": "public"
   },
@@ -21,8 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "!src/vaadin-input-container-base-styles.js",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js"
   ],
@@ -32,18 +30,18 @@
     "web-component"
   ],
   "dependencies": {
-    "@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/icon": "25.0.0-alpha2",
-    "@vaadin/icons": "25.0.0-alpha2",
-    "@vaadin/test-runner-commands": "25.0.0-alpha2",
+    "@vaadin/chai-plugins": "25.0.0-alpha21",
+    "@vaadin/icon": "25.0.0-alpha21",
+    "@vaadin/icons": "25.0.0-alpha21",
+    "@vaadin/test-runner-commands": "25.0.0-alpha21",
     "@vaadin/testing-helpers": "^2.0.0",
-    "sinon": "^18.0.0"
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha21",
+    "sinon": "^21.0.0"
   },
-  "gitHead": "67ffcd5355cf21ce1b5039c598525109fc4c164b"
+  "gitHead": "8fb9e9710c01449edf623a1aaac4655cdc11a933"
 }

package/src/styles/vaadin-input-container-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2021 - 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 inputContainerStyles: CSSResult;

package/src/styles/vaadin-input-container-base-styles.js

@@ -0,0 +1,129 @@
+/**
+ * @license
+ * Copyright (c) 2021 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/styles/style-props.js';
+import { css } from 'lit';
+
+export const inputContainerStyles = css`
+  :host {
+    display: flex;
+    align-items: center;
+    --_radius: var(--vaadin-input-field-border-radius, var(--vaadin-radius-m));
+    border-radius:
+      /* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius */
+      var(--vaadin-input-field-top-start-radius, var(--_radius))
+      var(--vaadin-input-field-top-end-radius, var(--_radius))
+      var(--vaadin-input-field-bottom-end-radius, var(--_radius))
+      var(--vaadin-input-field-bottom-start-radius, var(--_radius));
+    border: var(--vaadin-input-field-border-width, 1px) solid
+      var(--vaadin-input-field-border-color, var(--vaadin-border-color));
+    box-sizing: border-box;
+    cursor: text;
+    padding: var(--vaadin-input-field-padding, var(--vaadin-padding-container));
+    gap: var(--vaadin-input-field-gap, var(--vaadin-gap-s));
+    background: var(--vaadin-input-field-background, var(--vaadin-background-color));
+    color: var(--vaadin-input-field-value-color, var(--vaadin-text-color));
+    font-size: var(--vaadin-input-field-value-font-size, inherit);
+    line-height: var(--vaadin-input-field-value-line-height, inherit);
+    font-weight: var(--vaadin-input-field-value-font-weight, 400);
+  }
+
+  :host([dir='rtl']) {
+    --_radius: var(--vaadin-input-field-border-radius, var(--vaadin-radius-m));
+    border-radius:
+      /* Don't use logical props, see https://github.com/vaadin/vaadin-time-picker/issues/145 */
+      var(--vaadin-input-field-top-end-radius, var(--_radius))
+      var(--vaadin-input-field-top-start-radius, var(--_radius))
+      var(--vaadin-input-field-bottom-start-radius, var(--_radius))
+      var(--vaadin-input-field-bottom-end-radius, var(--_radius));
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  /* Reset the native input styles */
+  ::slotted(:is(input, textarea)) {
+    appearance: none;
+    align-self: stretch;
+    box-sizing: border-box;
+    flex: auto;
+    white-space: nowrap;
+    overflow: hidden;
+    width: 100%;
+    height: auto;
+    outline: none;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    border-radius: 0;
+    min-width: 0;
+    font: inherit;
+    font-size: 1em;
+    color: inherit;
+    background: transparent;
+    cursor: inherit;
+    caret-color: var(--vaadin-input-field-value-color);
+  }
+
+  ::slotted(*) {
+    flex: none;
+  }
+
+  slot[name$='fix'] {
+    cursor: auto;
+  }
+
+  ::slotted(:is(input, textarea))::placeholder {
+    /* Use ::slotted(:is(input, textarea):placeholder-shown) to style the placeholder */
+    /* because ::slotted(...)::placeholder does not work in Safari. */
+    font: inherit;
+    color: inherit;
+  }
+
+  ::slotted(:is(input, textarea):placeholder-shown) {
+    color: var(--vaadin-input-field-placeholder-color, var(--vaadin-text-color-secondary));
+  }
+
+  :host(:focus-within) {
+    outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
+    outline-offset: calc(var(--vaadin-input-field-border-width, 1px) * -1);
+  }
+
+  :host([invalid]) {
+    --vaadin-input-field-border-color: var(--vaadin-input-field-error-color, var(--vaadin-text-color));
+  }
+
+  :host([readonly]) {
+    border-style: dashed;
+  }
+
+  :host([readonly]:focus-within) {
+    outline-style: dashed;
+    --vaadin-input-field-border-color: transparent;
+  }
+
+  :host([disabled]) {
+    --vaadin-input-field-value-color: var(--vaadin-input-field-disabled-text-color, var(--vaadin-text-color-disabled));
+    --vaadin-input-field-background: var(
+      --vaadin-input-field-disabled-background,
+      var(--vaadin-background-container-strong)
+    );
+    --vaadin-input-field-border-color: transparent;
+  }
+
+  @media (forced-colors: active) {
+    :host {
+      --vaadin-input-field-background: Field;
+      --vaadin-input-field-value-color: FieldText;
+      --vaadin-input-field-placeholder-color: GrayText;
+    }
+
+    :host([disabled]) {
+      --vaadin-input-field-value-color: GrayText;
+      --vaadin-icon-color: GrayText;
+    }
+  }
+`;

package/src/vaadin-input-container.js

@@ -7,18 +7,17 @@ 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 { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { inputContainerStyles } from './vaadin-input-container-core-styles.js';
-import { InputContainerMixin } from './vaadin-input-container-mixin.js';
+import { inputContainerStyles } from './styles/vaadin-input-container-base-styles.js';
 
 /**
  * @customElement
  * @extends HTMLElement
  * @mixes ThemableMixin
  * @mixes DirMixin
- * @mixes InputContainerMixin
  */
-export class InputContainer extends InputContainerMixin(ThemableMixin(DirMixin(PolylitMixin(LitElement)))) {
+export class InputContainer extends ThemableMixin(DirMixin(PolylitMixin(LumoInjectionMixin(LitElement)))) {
   static get is() {
     return 'vaadin-input-container';
   }
@@ -27,6 +26,34 @@ export class InputContainer extends InputContainerMixin(ThemableMixin(DirMixin(P
     return inputContainerStyles;
   }
 
+  static get properties() {
+    return {
+      /**
+       * If true, the user cannot interact with this element.
+       */
+      disabled: {
+        type: Boolean,
+        reflectToAttribute: true,
+      },
+
+      /**
+       * Set to true to make this element read-only.
+       */
+      readonly: {
+        type: Boolean,
+        reflectToAttribute: true,
+      },
+
+      /**
+       * Set to true when the element is invalid.
+       */
+      invalid: {
+        type: Boolean,
+        reflectToAttribute: true,
+      },
+    };
+  }
+
   /** @protected */
   render() {
     return html`
@@ -35,6 +62,29 @@ export class InputContainer extends InputContainerMixin(ThemableMixin(DirMixin(P
       <slot name="suffix"></slot>
     `;
   }
+
+  /** @protected */
+  ready() {
+    super.ready();
+
+    this.addEventListener('pointerdown', (event) => {
+      if (event.target === this) {
+        // Prevent direct clicks to the input container from blurring the input
+        event.preventDefault();
+      }
+    });
+
+    this.addEventListener('click', (event) => {
+      if (event.target === this) {
+        // The vaadin-input-container element was directly clicked,
+        // focus any focusable child element from the default slot
+        this.shadowRoot
+          .querySelector('slot:not([name])')
+          .assignedNodes({ flatten: true })
+          .forEach((node) => node.focus && node.focus());
+      }
+    });
+  }
 }
 
 defineCustomElement(InputContainer);

package/vaadin-input-container.js

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

package/src/vaadin-input-container-core-styles.js

@@ -1,74 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 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 inputContainerStyles = css`
-  :host {
-    display: flex;
-    align-items: center;
-    flex: 0 1 auto;
-    border-radius:
-            /* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius */
-      var(--vaadin-input-field-top-start-radius, var(--__border-radius))
-      var(--vaadin-input-field-top-end-radius, var(--__border-radius))
-      var(--vaadin-input-field-bottom-end-radius, var(--__border-radius))
-      var(--vaadin-input-field-bottom-start-radius, var(--__border-radius));
-    --_border-radius: var(--vaadin-input-field-border-radius, 0);
-    --_input-border-width: var(--vaadin-input-field-border-width, 0px);
-    --_input-border-color: var(--vaadin-input-field-border-color, transparent);
-    /* stylelint-disable-next-line length-zero-no-unit */
-    box-shadow: inset 0 0 0 var(--_input-border-width, 0) var(--_input-border-color);
-  }
-
-  :host([dir='rtl']) {
-    border-radius:
-            /* Don't use logical props, see https://github.com/vaadin/vaadin-time-picker/issues/145 */
-      var(--vaadin-input-field-top-end-radius, var(--_border-radius))
-      var(--vaadin-input-field-top-start-radius, var(--_border-radius))
-      var(--vaadin-input-field-bottom-start-radius, var(--_border-radius))
-      var(--vaadin-input-field-bottom-end-radius, var(--_border-radius));
-  }
-
-  :host([hidden]) {
-    display: none !important;
-  }
-
-  /* Reset the native input styles */
-  ::slotted(input) {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    flex: auto;
-    white-space: nowrap;
-    overflow: hidden;
-    width: 100%;
-    height: 100%;
-    outline: none;
-    margin: 0;
-    padding: 0;
-    border: 0;
-    border-radius: 0;
-    min-width: 0;
-    font: inherit;
-    line-height: normal;
-    color: inherit;
-    background-color: transparent;
-    /* Disable default invalid style in Firefox */
-    box-shadow: none;
-  }
-
-  ::slotted(*) {
-    flex: none;
-  }
-
-  ::slotted(:is(input, textarea))::placeholder {
-    /* Use ::slotted(input:placeholder-shown) in themes to style the placeholder. */
-    /* because ::slotted(...)::placeholder does not work in Safari. */
-    font: inherit;
-    color: inherit;
-    /* Override default opacity in Firefox */
-    opacity: 1;
-  }
-`;

package/src/vaadin-input-container-mixin.js

@@ -1,62 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-
-/**
- * @polymerMixin
- */
-export const InputContainerMixin = (superClass) =>
-  class InputContainerMixinClass extends superClass {
-    static get properties() {
-      return {
-        /**
-         * If true, the user cannot interact with this element.
-         */
-        disabled: {
-          type: Boolean,
-          reflectToAttribute: true,
-        },
-
-        /**
-         * Set to true to make this element read-only.
-         */
-        readonly: {
-          type: Boolean,
-          reflectToAttribute: true,
-        },
-
-        /**
-         * Set to true when the element is invalid.
-         */
-        invalid: {
-          type: Boolean,
-          reflectToAttribute: true,
-        },
-      };
-    }
-
-    /** @protected */
-    ready() {
-      super.ready();
-
-      this.addEventListener('pointerdown', (event) => {
-        if (event.target === this) {
-          // Prevent direct clicks to the input container from blurring the input
-          event.preventDefault();
-        }
-      });
-
-      this.addEventListener('click', (event) => {
-        if (event.target === this) {
-          // The vaadin-input-container element was directly clicked,
-          // focus any focusable child element from the default slot
-          this.shadowRoot
-            .querySelector('slot:not([name])')
-            .assignedNodes({ flatten: true })
-            .forEach((node) => node.focus && node.focus());
-        }
-      });
-    }
-  };

package/theme/lumo/vaadin-input-container-styles.d.ts

@@ -1,4 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';

package/theme/lumo/vaadin-input-container-styles.js

@@ -1,189 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-input-container',
-  css`
-    :host {
-      background: var(--_background);
-      padding: 0 calc(0.375em + var(--_input-container-radius) / 4 - 1px);
-      font-weight: var(--vaadin-input-field-value-font-weight, 500);
-      line-height: 1;
-      position: relative;
-      cursor: text;
-      box-sizing: border-box;
-      border-radius:
-        /* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius#syntax */
-        var(--vaadin-input-field-top-start-radius, var(--_input-container-radius))
-        var(--vaadin-input-field-top-end-radius, var(--_input-container-radius))
-        var(--vaadin-input-field-bottom-end-radius, var(--_input-container-radius))
-        var(--vaadin-input-field-bottom-start-radius, var(--_input-container-radius));
-      /* Fallback */
-      --_input-container-radius: var(--vaadin-input-field-border-radius, var(--lumo-border-radius-m));
-      --_input-height: var(--lumo-text-field-size, var(--lumo-size-m));
-      /* Default values */
-      --_background: var(--vaadin-input-field-background, var(--lumo-contrast-10pct));
-      --_hover-highlight: var(--vaadin-input-field-hover-highlight, var(--lumo-contrast-50pct));
-      --_input-border-color: var(--vaadin-input-field-border-color, var(--lumo-contrast-50pct));
-      --_icon-color: var(--vaadin-input-field-icon-color, var(--lumo-contrast-60pct));
-      --_icon-size: var(--vaadin-input-field-icon-size, var(--lumo-icon-size-m));
-      --_invalid-background: var(--vaadin-input-field-invalid-background, var(--lumo-error-color-10pct));
-      --_invalid-hover-highlight: var(--vaadin-input-field-invalid-hover-highlight, var(--lumo-error-color-50pct));
-      --_disabled-background: var(--vaadin-input-field-disabled-background, var(--lumo-contrast-5pct));
-      --_disabled-value-color: var(--vaadin-input-field-disabled-value-color, var(--lumo-disabled-text-color));
-    }
-
-    :host([dir='rtl']) {
-      border-radius:
-        /* Don't use logical props, see https://github.com/vaadin/vaadin-time-picker/issues/145 */
-        var(--vaadin-input-field-top-end-radius, var(--_input-container-radius))
-        var(--vaadin-input-field-top-start-radius, var(--_input-container-radius))
-        var(--vaadin-input-field-bottom-start-radius, var(--_input-container-radius))
-        var(--vaadin-input-field-bottom-end-radius, var(--_input-container-radius));
-    }
-
-    /* Used for hover and activation effects */
-    :host::after {
-      content: '';
-      position: absolute;
-      inset: 0;
-      border-radius: inherit;
-      pointer-events: none;
-      background: var(--_hover-highlight);
-      opacity: 0;
-      transition:
-        transform 0.15s,
-        opacity 0.2s;
-      transform-origin: 100% 0;
-    }
-
-    ::slotted(:not([slot$='fix'])) {
-      cursor: inherit;
-      min-height: var(--vaadin-input-field-height, var(--_input-height));
-      padding: 0 0.25em;
-      --_lumo-text-field-overflow-mask-image: linear-gradient(to left, transparent, #000 1.25em);
-      -webkit-mask-image: var(--_lumo-text-field-overflow-mask-image);
-      mask-image: var(--_lumo-text-field-overflow-mask-image);
-    }
-
-    /* Read-only */
-    :host([readonly]) {
-      color: var(--lumo-secondary-text-color);
-      background-color: transparent;
-      cursor: default;
-    }
-
-    :host([readonly])::after {
-      background-color: transparent;
-      opacity: 1;
-      border: var(--vaadin-input-field-readonly-border, 1px dashed var(--lumo-contrast-30pct));
-    }
-
-    /* Disabled */
-    :host([disabled]) {
-      background: var(--_disabled-background);
-    }
-
-    :host([disabled]) ::slotted(:not([slot$='fix'])) {
-      -webkit-text-fill-color: var(--_disabled-value-color);
-      color: var(--_disabled-value-color);
-    }
-
-    /* Invalid */
-    :host([invalid]) {
-      background: var(--_invalid-background);
-    }
-
-    :host([invalid]:not([readonly]))::after {
-      background: var(--_invalid-hover-highlight);
-    }
-
-    /* Slotted icons */
-    ::slotted(vaadin-icon) {
-      color: var(--_icon-color);
-      width: var(--_icon-size);
-      height: var(--_icon-size);
-    }
-
-    /* Vaadin icons are based on a 16x16 grid (unlike Lumo and Material icons with 24x24), so they look too big by default */
-    ::slotted(vaadin-icon[icon^='vaadin:']) {
-      padding: 0.25em;
-      box-sizing: border-box !important;
-    }
-
-    /* Text align */
-    :host([dir='rtl']) ::slotted(:not([slot$='fix'])) {
-      --_lumo-text-field-overflow-mask-image: linear-gradient(to right, transparent, #000 1.25em);
-    }
-
-    @-moz-document url-prefix() {
-      :host([dir='rtl']) ::slotted(:not([slot$='fix'])) {
-        mask-image: var(--_lumo-text-field-overflow-mask-image);
-      }
-    }
-
-    :host([theme~='align-left']) ::slotted(:not([slot$='fix'])) {
-      text-align: start;
-      --_lumo-text-field-overflow-mask-image: none;
-    }
-
-    :host([theme~='align-center']) ::slotted(:not([slot$='fix'])) {
-      text-align: center;
-      --_lumo-text-field-overflow-mask-image: none;
-    }
-
-    :host([theme~='align-right']) ::slotted(:not([slot$='fix'])) {
-      text-align: end;
-      --_lumo-text-field-overflow-mask-image: none;
-    }
-
-    @-moz-document url-prefix() {
-      /* Firefox is smart enough to align overflowing text to right */
-      :host([theme~='align-right']) ::slotted(:not([slot$='fix'])) {
-        --_lumo-text-field-overflow-mask-image: linear-gradient(to right, transparent 0.25em, #000 1.5em);
-      }
-    }
-
-    @-moz-document url-prefix() {
-      /* Firefox is smart enough to align overflowing text to right */
-      :host([theme~='align-left']) ::slotted(:not([slot$='fix'])) {
-        --_lumo-text-field-overflow-mask-image: linear-gradient(to left, transparent 0.25em, #000 1.5em);
-      }
-    }
-
-    /* RTL specific styles */
-    :host([dir='rtl'])::after {
-      transform-origin: 0% 0;
-    }
-
-    :host([theme~='align-left'][dir='rtl']) ::slotted(:not([slot$='fix'])) {
-      --_lumo-text-field-overflow-mask-image: none;
-    }
-
-    :host([theme~='align-center'][dir='rtl']) ::slotted(:not([slot$='fix'])) {
-      --_lumo-text-field-overflow-mask-image: none;
-    }
-
-    :host([theme~='align-right'][dir='rtl']) ::slotted(:not([slot$='fix'])) {
-      --_lumo-text-field-overflow-mask-image: none;
-    }
-
-    @-moz-document url-prefix() {
-      /* Firefox is smart enough to align overflowing text to right */
-      :host([theme~='align-right'][dir='rtl']) ::slotted(:not([slot$='fix'])) {
-        --_lumo-text-field-overflow-mask-image: linear-gradient(to right, transparent 0.25em, #000 1.5em);
-      }
-    }
-
-    @-moz-document url-prefix() {
-      /* Firefox is smart enough to align overflowing text to right */
-      :host([theme~='align-left'][dir='rtl']) ::slotted(:not([slot$='fix'])) {
-        --_lumo-text-field-overflow-mask-image: linear-gradient(to left, transparent 0.25em, #000 1.5em);
-      }
-    }
-  `,
-  { moduleId: 'lumo-input-container' },
-);

package/theme/lumo/vaadin-input-container.d.ts

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

package/theme/lumo/vaadin-input-container.js

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