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

package/package.json

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

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,126 @@
+/**
+ * @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/style-props.js';
+import { css } from 'lit';
+
+export const inputContainerStyles = css`
+  @layer base {
+    :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-strong));
+      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-container-inline));
+      background: var(--vaadin-input-field-background, var(--_vaadin-background));
+      color: var(--vaadin-input-field-value-color, var(--_vaadin-color-strong));
+      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;
+    }
+
+    ::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-color));
+    }
+
+    :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([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-color-subtle));
+      --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/styles/vaadin-input-container-core-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/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 { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-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-core-styles.js';
 
 /**
  * @customElement
  * @extends HTMLElement
  * @mixes ThemableMixin
  * @mixes DirMixin
- * @mixes InputContainerMixin
  */
-export class InputContainer extends InputContainerMixin(ThemableMixin(DirMixin(PolylitMixin(LitElement)))) {
+export class InputContainer extends CSSInjectionMixin(ThemableMixin(DirMixin(PolylitMixin(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/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());
-        }
-      });
-    }
-  };