@vaadin/login 24.8.4 → 25.0.0-alpha10

package/README.md

@@ -26,32 +26,6 @@ Once installed, import the component in your application:
 import '@vaadin/login';
 ```
 
-## Themes
-
-Vaadin components come with two built-in [themes](https://vaadin.com/docs/latest/styling), Lumo and Material.
-The [main entrypoint](https://github.com/vaadin/web-components/blob/main/packages/list-box/vaadin-list-box.js) of the package uses Lumo theme.
-
-To use the Material theme, import the components from the `theme/material` folder:
-
-```js
-import '@vaadin/login/theme/material/vaadin-login-overlay.js';
-import '@vaadin/login/theme/material/vaadin-login-form.js';
-```
-
-You can also import the Lumo version of the components explicitly:
-
-```js
-import '@vaadin/login/theme/lumo/vaadin-login-overlay.js';
-import '@vaadin/login/theme/lumo/vaadin-login-form.js';
-```
-
-Finally, you can import the un-themed components from the `src` folder to get a minimal starting point:
-
-```js
-import '@vaadin/login/src/vaadin-login-overlay.js';
-import '@vaadin/login/src/vaadin-login-form.js';
-```
-
 ## Contributing
 
 Read the [contributing guide](https://vaadin.com/docs/latest/contributing) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/login",
-  "version": "24.8.4",
+  "version": "25.0.0-alpha10",
   "publishConfig": {
     "access": "public"
   },
@@ -21,6 +21,8 @@
   "type": "module",
   "files": [
     "src",
+    "!src/styles/*-base-styles.d.ts",
+    "!src/styles/*-base-styles.js",
     "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
@@ -31,32 +33,30 @@
     "Vaadin",
     "vaadin-login",
     "web-components",
-    "web-component",
-    "polymer"
+    "web-component"
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "~24.8.4",
-    "@vaadin/component-base": "~24.8.4",
-    "@vaadin/overlay": "~24.8.4",
-    "@vaadin/password-field": "~24.8.4",
-    "@vaadin/text-field": "~24.8.4",
-    "@vaadin/vaadin-lumo-styles": "~24.8.4",
-    "@vaadin/vaadin-material-styles": "~24.8.4",
-    "@vaadin/vaadin-themable-mixin": "~24.8.4",
+    "@vaadin/button": "25.0.0-alpha10",
+    "@vaadin/component-base": "25.0.0-alpha10",
+    "@vaadin/overlay": "25.0.0-alpha10",
+    "@vaadin/password-field": "25.0.0-alpha10",
+    "@vaadin/text-field": "25.0.0-alpha10",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha10",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha10",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~24.8.4",
-    "@vaadin/checkbox": "~24.8.4",
-    "@vaadin/test-runner-commands": "~24.8.4",
-    "@vaadin/testing-helpers": "^1.1.0",
+    "@vaadin/a11y-base": "25.0.0-alpha10",
+    "@vaadin/chai-plugins": "25.0.0-alpha10",
+    "@vaadin/checkbox": "25.0.0-alpha10",
+    "@vaadin/test-runner-commands": "25.0.0-alpha10",
+    "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^18.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "849e54e967563080a685965e2dced02060b3ab23"
+  "gitHead": "6cc6c94079e805fa5b2f0af4dbf3b2a7485e57d0"
 }

package/src/styles/vaadin-login-form-wrapper-base-styles.js

@@ -0,0 +1,65 @@
+/**
+ * @license
+ * Copyright (c) 2018 - 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 loginFormWrapperStyles = css`
+  :host {
+    background: var(--vaadin-login-form-background, transparent);
+    border-radius: var(--vaadin-login-form-border-radius, 0);
+    display: flex;
+    box-sizing: border-box;
+    flex-direction: column;
+    gap: var(--vaadin-login-form-gap, var(--vaadin-gap-container-block));
+    padding: var(--vaadin-login-form-padding, var(--vaadin-padding));
+    max-width: 100%;
+    width: var(--vaadin-login-form-width, 360px);
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  ::slotted(form) {
+    display: flex;
+    flex-direction: column;
+    gap: var(--vaadin-login-form-gap, var(--vaadin-gap-container-block));
+  }
+
+  ::slotted([slot='form-title']) {
+    color: var(--vaadin-login-form-title-color, var(--vaadin-color));
+    font-size: var(--vaadin-login-form-title-font-size, 1.25rem);
+    font-weight: var(--vaadin-login-form-title-font-weight, 600);
+    line-height: var(--vaadin-login-form-title-line-height, inherit);
+  }
+
+  :host([error]) [part='error-message'] {
+    display: grid;
+  }
+
+  [part='error-message'] {
+    color: var(--vaadin-login-form-error-color, var(--vaadin-color));
+    font-size: var(--vaadin-login-form-error-font-size, inherit);
+    font-weight: var(--vaadin-login-form-error-font-weight, 400);
+    gap: var(--vaadin-login-form-error-gap, 0 var(--vaadin-gap-container-inline));
+    grid-template-columns: auto 1fr;
+    line-height: var(--vaadin-login-form-error-line-height, inherit);
+  }
+
+  [part='error-message']::before {
+    background: currentColor;
+    content: '';
+    display: inline-block;
+    flex: none;
+    height: var(--vaadin-icon-size, 1lh);
+    mask-image: var(--_vaadin-icon-warn);
+    width: var(--vaadin-icon-size, 1lh);
+  }
+
+  [part='error-message-description'] {
+    grid-column: 2;
+  }
+`;

package/src/styles/vaadin-login-form-wrapper-core-styles.d.ts

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

package/src/{vaadin-login-form-wrapper-styles.js → styles/vaadin-login-form-wrapper-core-styles.js}

@@ -7,26 +7,25 @@ import { css } from 'lit';
 
 export const loginFormWrapperStyles = css`
   :host {
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
     overflow: hidden;
-    display: inline-block;
   }
 
   :host([hidden]) {
     display: none !important;
   }
 
-  [part='form'] {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-  }
-
-  [part='form-title'] {
+  ::slotted([slot='form-title']) {
     margin: 0;
   }
 
   [part='error-message'] {
     position: relative;
   }
+
+  strong {
+    font-weight: 600;
+  }
 `;

package/src/styles/vaadin-login-overlay-wrapper-base-styles.js

@@ -0,0 +1,55 @@
+/**
+ * @license
+ * Copyright (c) 2018 - 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';
+import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-base-styles.js';
+
+const loginOverlayWrapper = css`
+  [part='overlay'] {
+    background: var(
+      --vaadin-login-overlay-background,
+      var(--vaadin-overlay-background, var(--vaadin-background-color))
+    );
+    border: var(--vaadin-login-overlay-border-width, var(--vaadin-overlay-border-width, 1px)) solid
+      var(--vaadin-login-overlay-border-color, var(--vaadin-overlay-border-color, var(--vaadin-border-color)));
+    border-radius: var(--vaadin-login-overlay-border-radius, var(--vaadin-radius-l));
+    box-shadow: var(
+      --vaadin-login-overlay-box-shadow,
+      var(--vaadin-overlay-box-shadow, 0 8px 24px -4px rgba(0, 0, 0, 0.3))
+    );
+  }
+
+  [part='card'] {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    max-width: 100%;
+    overflow: hidden;
+  }
+
+  [part='brand'] {
+    background: var(--vaadin-login-overlay-brand-background, var(--vaadin-background-container));
+    display: flex;
+    flex-direction: column;
+    padding: var(--vaadin-login-overlay-brand-padding, var(--vaadin-padding));
+  }
+
+  ::slotted([slot='title']) {
+    color: var(--vaadin-login-overlay-title-color, var(--vaadin-color));
+    font-size: var(--vaadin-login-overlay-title-font-size, inherit);
+    font-weight: var(--vaadin-login-overlay-title-font-weight, 600);
+    line-height: var(--vaadin-login-overlay-title-line-height, inherit);
+  }
+
+  [part='description'] {
+    color: var(--vaadin-login-overlay-description-color, var(--vaadin-color-subtle));
+    font-size: var(--vaadin-login-overlay-description-font-size, inherit);
+    font-weight: var(--vaadin-login-overlay-description-font-weight, inherit);
+    line-height: var(--vaadin-login-overlay-description-line-height, inherit);
+  }
+`;
+
+export const loginOverlayWrapperStyles = [overlayStyles, loginOverlayWrapper];

package/src/styles/vaadin-login-overlay-wrapper-core-styles.d.ts

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

package/src/{vaadin-login-overlay-wrapper-styles.js → styles/vaadin-login-overlay-wrapper-core-styles.js}

@@ -4,8 +4,9 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { css } from 'lit';
+import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-core-styles.js';
 
-export const loginOverlayWrapperStyles = css`
+const loginOverlayWrapper = css`
   [part='overlay'] {
     outline: none;
   }
@@ -28,8 +29,10 @@ export const loginOverlayWrapperStyles = css`
     justify-content: flex-end;
   }
 
-  [part='title'] {
+  ::slotted([slot='title']) {
     color: inherit;
     margin: 0;
   }
 `;
+
+export const loginOverlayWrapperStyles = [overlayStyles, loginOverlayWrapper];

package/src/title-controller.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright (c) 2018 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { SlotChildObserveController } from '@vaadin/component-base/src/slot-child-observe-controller.js';
+
+/**
+ * A controller to manage the title element.
+ */
+export class TitleController extends SlotChildObserveController {}

package/src/title-controller.js

@@ -0,0 +1,100 @@
+/**
+ * @license
+ * Copyright (c) 2018 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { SlotChildObserveController } from '@vaadin/component-base/src/slot-child-observe-controller.js';
+
+/**
+ * A controller to manage the title element.
+ */
+export class TitleController extends SlotChildObserveController {
+  constructor(host) {
+    super(host, 'title', 'div');
+  }
+
+  /**
+   * Set title based on corresponding host property.
+   *
+   * @param {string} title
+   */
+  setTitle(title) {
+    this.title = title;
+
+    // Restore the default title, if needed.
+    const titleNode = this.getSlotChild();
+    if (!titleNode) {
+      this.restoreDefaultNode();
+    }
+
+    // When default title is used, update it.
+    if (this.node === this.defaultNode) {
+      this.updateDefaultNode(this.node);
+    }
+  }
+
+  /**
+   * Set level based on corresponding host property.
+   *
+   * @param {string} level
+   */
+  setLevel(level) {
+    this.level = level;
+
+    // When default title is used, update it.
+    if (this.node === this.defaultNode) {
+      this.updateDefaultNode(this.node);
+    }
+  }
+
+  /**
+   * Override method inherited from `SlotController`
+   * to customize heading on the default title node.
+   *
+   * @param {Node} node
+   * @protected
+   * @override
+   */
+  initNode(node) {
+    if (node === this.defaultNode) {
+      node.setAttribute('role', 'heading');
+    }
+
+    this.host.setAttribute('aria-labelledby', node.id);
+  }
+
+  /**
+   * Override method inherited from `SlotChildObserveController`
+   * to restore the default title element.
+   *
+   * @protected
+   * @override
+   */
+  restoreDefaultNode() {
+    const { title } = this;
+
+    // Restore the default title.
+    if (title && title.trim() !== '') {
+      const node = this.attachDefaultNode();
+      this.initNode(node);
+    }
+  }
+
+  /**
+   * Override method inherited from `SlotChildObserveController`
+   * to update the default title element.
+   *
+   * @param {Node | undefined} node
+   * @protected
+   * @override
+   */
+  updateDefaultNode(node) {
+    if (node) {
+      node.textContent = this.title;
+      node.setAttribute('aria-level', this.level);
+    }
+
+    // Notify the host after update.
+    super.updateDefaultNode(node);
+  }
+}

package/src/vaadin-login-form-mixin.js

@@ -3,6 +3,8 @@
  * Copyright (c) 2018 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { html, render } from 'lit';
+import { ifDefined } from 'lit/directives/if-defined.js';
 import { LoginMixin } from './vaadin-login-mixin.js';
 
 function isCheckbox(field) {
@@ -15,16 +17,43 @@ function isCheckbox(field) {
  */
 export const LoginFormMixin = (superClass) =>
   class LoginFormMixin extends LoginMixin(superClass) {
-    static get observers() {
-      return ['_errorChanged(error)'];
-    }
-
+    /** @protected */
     get _customFields() {
-      return [...this.$.vaadinLoginFormWrapper.children].filter((node) => {
+      return [...this.children].filter((node) => {
         return node.getAttribute('slot') === 'custom-form-area' && node.hasAttribute('name');
       });
     }
 
+    /** @protected */
+    get _userNameField() {
+      return this.querySelector('#vaadinLoginUsername');
+    }
+
+    /** @protected */
+    get _passwordField() {
+      return this.querySelector('#vaadinLoginPassword');
+    }
+
+    /**
+     * Override update to render slotted form and buttons
+     * into light DOM after rendering shadow DOM.
+     * @protected
+     */
+    update(props) {
+      super.update(props);
+
+      this.__renderSlottedForm();
+    }
+
+    /** @protected */
+    updated(props) {
+      super.updated(props);
+
+      if (props.has('error') && this.error && !this._preventAutoEnable) {
+        this.disabled = false;
+      }
+    }
+
     /** @protected */
     async connectedCallback() {
       super.connectedCallback();
@@ -32,23 +61,70 @@ export const LoginFormMixin = (superClass) =>
       if (!this.noAutofocus) {
         // Wait for the form to fully render.
         await new Promise(requestAnimationFrame);
-        this.$.vaadinLoginUsername.focus();
+        this._userNameField.focus();
       }
     }
 
-    /** @private */
-    _errorChanged() {
-      if (this.error && !this._preventAutoEnable) {
-        this.disabled = false;
-      }
+    __renderSlottedForm() {
+      render(
+        html`
+          <form method="POST" action="${ifDefined(this.action)}" @formdata="${this._onFormData}" slot="form">
+            <input id="csrf" type="hidden" />
+            <vaadin-text-field
+              name="username"
+              .label="${this.__effectiveI18n.form.username}"
+              .errorMessage="${this.__effectiveI18n.errorMessage.username}"
+              id="vaadinLoginUsername"
+              required
+              @keydown="${this._handleInputKeydown}"
+              autocapitalize="none"
+              autocorrect="off"
+              spellcheck="false"
+              autocomplete="username"
+              manual-validation
+            >
+              <input type="text" slot="input" @keyup="${this._handleInputKeyup}" />
+            </vaadin-text-field>
+
+            <vaadin-password-field
+              name="password"
+              .label="${this.__effectiveI18n.form.password}"
+              .errorMessage="${this.__effectiveI18n.errorMessage.password}"
+              id="vaadinLoginPassword"
+              required
+              @keydown="${this._handleInputKeydown}"
+              spellcheck="false"
+              autocomplete="current-password"
+              manual-validation
+            >
+              <input type="password" slot="input" @keyup="${this._handleInputKeyup}" />
+            </vaadin-password-field>
+          </form>
+
+          <vaadin-button slot="submit" theme="primary submit" @click="${this.submit}" .disabled="${this.disabled}">
+            ${this.__effectiveI18n.form.submit}
+          </vaadin-button>
+
+          <vaadin-button
+            slot="forgot-password"
+            theme="tertiary small"
+            @click="${this._onForgotPasswordClick}"
+            ?hidden="${this.noForgotPassword}"
+          >
+            ${this.__effectiveI18n.form.forgotPassword}
+          </vaadin-button>
+        `,
+        this,
+        { host: this },
+      );
     }
 
     /**
      * Submits the form.
      */
     submit() {
-      const userName = this.$.vaadinLoginUsername;
-      const password = this.$.vaadinLoginPassword;
+      const userName = this._userNameField;
+      const password = this._passwordField;
 
       // eslint-disable-next-line no-restricted-syntax
       userName.validate();
@@ -91,8 +167,9 @@ export const LoginFormMixin = (superClass) =>
         const csrfMetaName = document.querySelector('meta[name=_csrf_parameter]');
         const csrfMetaValue = document.querySelector('meta[name=_csrf]');
         if (csrfMetaName && csrfMetaValue) {
-          this.$.csrf.name = csrfMetaName.content;
-          this.$.csrf.value = csrfMetaValue.content;
+          const csrf = this.querySelector('#csrf');
+          csrf.name = csrfMetaName.content;
+          csrf.value = csrfMetaValue.content;
         }
         this.querySelector('form').submit();
       }
@@ -117,8 +194,7 @@ export const LoginFormMixin = (superClass) =>
     _handleInputKeydown(e) {
       if (e.key === 'Enter') {
         const { currentTarget: inputActive } = e;
-        const nextInput =
-          inputActive.id === 'vaadinLoginUsername' ? this.$.vaadinLoginPassword : this.$.vaadinLoginUsername;
+        const nextInput = inputActive.id === 'vaadinLoginUsername' ? this._passwordField : this._userNameField;
         // eslint-disable-next-line no-restricted-syntax
         if (inputActive.validate()) {
           if (nextInput.checkValidity()) {

package/src/vaadin-login-form-wrapper.js

@@ -3,14 +3,12 @@
  * Copyright (c) 2018 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { html, LitElement } from 'lit';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
-import { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { loginFormWrapperStyles } from './vaadin-login-form-wrapper-styles.js';
-
-registerStyles('vaadin-login-form-wrapper', loginFormWrapperStyles, {
-  moduleId: 'vaadin-login-form-wrapper-styles',
-});
+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 { loginFormWrapperStyles } from './styles/vaadin-login-form-wrapper-core-styles.js';
 
 /**
  * An element used internally by `<vaadin-login-form>`. Not intended to be used separately.
@@ -19,36 +17,15 @@ registerStyles('vaadin-login-form-wrapper', loginFormWrapperStyles, {
  * @mixes ThemableMixin
  * @private
  */
-class LoginFormWrapper extends ThemableMixin(PolymerElement) {
-  static get template() {
-    return html`
-      <section part="form">
-        <div part="form-title" part="form-title" role="heading" aria-level$="[[headingLevel]]">[[i18n.form.title]]</div>
-        <div part="error-message" hidden$="[[!error]]">
-          <strong part="error-message-title">[[i18n.errorMessage.title]]</strong>
-          <p part="error-message-description">[[i18n.errorMessage.message]]</p>
-        </div>
-
-        <slot name="form"></slot>
-
-        <slot name="custom-form-area"></slot>
-
-        <slot name="submit"></slot>
-
-        <slot name="forgot-password"></slot>
-
-        <div part="footer">
-          <slot name="footer"></slot>
-          <p>[[i18n.additionalInformation]]</p>
-        </div>
-      </section>
-    `;
-  }
-
+class LoginFormWrapper extends ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))) {
   static get is() {
     return 'vaadin-login-form-wrapper';
   }
 
+  static get styles() {
+    return loginFormWrapperStyles;
+  }
+
   static get properties() {
     return {
       /**
@@ -68,15 +45,32 @@ class LoginFormWrapper extends ThemableMixin(PolymerElement) {
       i18n: {
         type: Object,
       },
-
-      /**
-       * Used to customize the `aria-level` attribute on the heading element.
-       */
-      headingLevel: {
-        type: Number,
-      },
     };
   }
+
+  /** @protected */
+  render() {
+    return html`
+      <slot name="form-title"></slot>
+      <div part="error-message" ?hidden="${!this.error}">
+        <strong part="error-message-title">${this.i18n.errorMessage.title}</strong>
+        <div part="error-message-description">${this.i18n.errorMessage.message}</div>
+      </div>
+
+      <slot name="form"></slot>
+
+      <slot name="custom-form-area"></slot>
+
+      <slot name="submit"></slot>
+
+      <slot name="forgot-password"></slot>
+
+      <div part="footer">
+        <slot name="footer"></slot>
+        <div>${this.i18n.additionalInformation}</div>
+      </div>
+    `;
+  }
 }
 
 defineCustomElement(LoginFormWrapper);