@vaadin/login 24.0.0-alpha2 → 24.0.0-alpha4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/login",
-  "version": "24.0.0-alpha2",
+  "version": "24.0.0-alpha4",
   "publishConfig": {
     "access": "public"
   },
@@ -37,14 +37,14 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "24.0.0-alpha2",
-    "@vaadin/component-base": "24.0.0-alpha2",
-    "@vaadin/overlay": "24.0.0-alpha2",
-    "@vaadin/password-field": "24.0.0-alpha2",
-    "@vaadin/text-field": "24.0.0-alpha2",
-    "@vaadin/vaadin-lumo-styles": "24.0.0-alpha2",
-    "@vaadin/vaadin-material-styles": "24.0.0-alpha2",
-    "@vaadin/vaadin-themable-mixin": "24.0.0-alpha2"
+    "@vaadin/button": "24.0.0-alpha4",
+    "@vaadin/component-base": "24.0.0-alpha4",
+    "@vaadin/overlay": "24.0.0-alpha4",
+    "@vaadin/password-field": "24.0.0-alpha4",
+    "@vaadin/text-field": "24.0.0-alpha4",
+    "@vaadin/vaadin-lumo-styles": "24.0.0-alpha4",
+    "@vaadin/vaadin-material-styles": "24.0.0-alpha4",
+    "@vaadin/vaadin-themable-mixin": "24.0.0-alpha4"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
@@ -55,5 +55,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "0c16c01a6807e629a84f5a982793afecc1a7ced0"
+  "gitHead": "66be46e82c4d0a673859fbc9bdb1581dd89f360c"
 }

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

@@ -3,22 +3,17 @@
  * Copyright (c) 2018 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import '@vaadin/button/src/vaadin-button.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
-import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { LoginMixin } from './vaadin-login-mixin.js';
 
 /**
  * An element used internally by `<vaadin-login-form>`. Not intended to be used separately.
  *
  * @extends HTMLElement
- * @mixes ElementMixin
  * @mixes ThemableMixin
- * @mixes LoginMixin
  * @private
  */
-class LoginFormWrapper extends LoginMixin(ElementMixin(ThemableMixin(PolymerElement))) {
+class LoginFormWrapper extends ThemableMixin(PolymerElement) {
   static get template() {
     return html`
       <style>
@@ -55,13 +50,7 @@ class LoginFormWrapper extends LoginMixin(ElementMixin(ThemableMixin(PolymerElem
 
         <slot name="form"></slot>
 
-        <vaadin-button
-          id="forgotPasswordButton"
-          theme="tertiary small forgot-password"
-          on-click="_forgotPassword"
-          hidden$="[[noForgotPassword]]"
-          >[[i18n.form.forgotPassword]]</vaadin-button
-        >
+        <slot name="forgot-password"></slot>
 
         <div part="footer">
           <p>[[i18n.additionalInformation]]</p>
@@ -74,8 +63,26 @@ class LoginFormWrapper extends LoginMixin(ElementMixin(ThemableMixin(PolymerElem
     return 'vaadin-login-form-wrapper';
   }
 
-  _forgotPassword() {
-    this.dispatchEvent(new CustomEvent('forgot-password'));
+  static get properties() {
+    return {
+      /**
+       * If set, the error message is shown. The message is hidden by default.
+       * When set, it changes the disabled state of the submit button.
+       * @type {boolean}
+       */
+      error: {
+        type: Boolean,
+        value: false,
+        reflectToAttribute: true,
+      },
+
+      /**
+       * The object used to localize this component.
+       */
+      i18n: {
+        type: Object,
+      },
+    };
   }
 }
 

package/src/vaadin-login-form.js

@@ -3,6 +3,7 @@
  * Copyright (c) 2018 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import '@vaadin/button/src/vaadin-button.js';
 import '@vaadin/text-field/src/vaadin-text-field.js';
 import '@vaadin/password-field/src/vaadin-password-field.js';
 import './vaadin-login-form-wrapper.js';
@@ -58,14 +59,7 @@ class LoginForm extends LoginMixin(ElementMixin(ThemableMixin(PolymerElement)))
           width: 100%;
         }
       </style>
-      <vaadin-login-form-wrapper
-        theme$="[[_theme]]"
-        error="[[error]]"
-        no-forgot-password="[[noForgotPassword]]"
-        i18n="[[i18n]]"
-        on-login="_retargetEvent"
-        on-forgot-password="_retargetEvent"
-      >
+      <vaadin-login-form-wrapper theme$="[[_theme]]" error="[[error]]" i18n="[[i18n]]">
         <form method="POST" action$="[[action]]" slot="form">
           <input id="csrf" type="hidden" />
           <vaadin-text-field
@@ -97,6 +91,15 @@ class LoginForm extends LoginMixin(ElementMixin(ThemableMixin(PolymerElement)))
             [[i18n.form.submit]]
           </vaadin-button>
         </form>
+
+        <vaadin-button
+          slot="forgot-password"
+          theme="tertiary small"
+          on-click="_onForgotPasswordClick"
+          hidden$="[[noForgotPassword]]"
+        >
+          [[i18n.form.forgotPassword]]
+        </vaadin-button>
       </vaadin-login-form-wrapper>
     `;
   }
@@ -189,6 +192,11 @@ class LoginForm extends LoginMixin(ElementMixin(ThemableMixin(PolymerElement)))
       input.select();
     }
   }
+
+  /** @private */
+  _onForgotPasswordClick() {
+    this.dispatchEvent(new CustomEvent('forgot-password'));
+  }
 }
 
 customElements.define(LoginForm.is, LoginForm);

package/src/vaadin-login-mixin.d.ts

@@ -89,6 +89,4 @@ export declare class LoginMixinClass {
    * ```
    */
   i18n: LoginI18n;
-
-  protected _retargetEvent(e: Event): void;
 }

package/src/vaadin-login-mixin.js

@@ -140,19 +140,4 @@ export const LoginMixin = (superClass) =>
         },
       };
     }
-
-    /**
-     * @param {!Event} e
-     * @protected
-     */
-    _retargetEvent(e) {
-      e.stopPropagation();
-      const { detail, composed, cancelable, bubbles } = e;
-
-      const firedEvent = this.dispatchEvent(new CustomEvent(e.type, { bubbles, cancelable, composed, detail }));
-      // Check if `eventTarget.preventDefault()` was called to prevent default in the original event
-      if (!firedEvent) {
-        e.preventDefault();
-      }
-    }
   };

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

@@ -3,56 +3,56 @@
  * Copyright (c) 2018 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { DomModule } from '@polymer/polymer/lib/elements/dom-module.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { Overlay } from '@vaadin/overlay/src/vaadin-overlay.js';
+import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
-const template = document.createElement('template');
-
-template.innerHTML = `<dom-module id="vaadin-login-overlay-wrapper-template">
-  <template>
-    <style>
-      [part="overlay"] {
-        outline: none;
-      }
+registerStyles(
+  'vaadin-login-overlay-wrapper',
+  css`
+    [part='overlay'] {
+      outline: none;
+    }
 
-      [part="card"] {
-        max-width: 100%;
-        box-sizing: border-box;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
-      }
+    [part='card'] {
+      max-width: 100%;
+      box-sizing: border-box;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+    }
 
-      [part="brand"] {
-        box-sizing: border-box;
-        overflow: hidden;
-        flex-grow: 1;
-        flex-shrink: 0;
-        display: flex;
-        flex-direction: column;
-        justify-content: flex-end;
-      }
+    [part='brand'] {
+      box-sizing: border-box;
+      overflow: hidden;
+      flex-grow: 1;
+      flex-shrink: 0;
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-end;
+    }
 
-      [part="brand"] h1 {
-        color: inherit;
-        margin: 0;
-      }
-    </style>
-    <section part="card">
-      <div part="brand">
-        <slot name="title">
-          <h1 part="title">[[title]]</h1>
-        </slot>
-        <p part="description">[[description]]</p>
-      </div>
-      <div part="form">
-        <slot></slot>
-      </div>
-    </section>
-  </template>
-</dom-module>`;
+    [part='brand'] h1 {
+      color: inherit;
+      margin: 0;
+    }
+  `,
+  { moduleId: 'vaadin-login-overlay-wrapper-styles' },
+);
 
-document.head.appendChild(template.content);
+const template = html`
+  <section part="card">
+    <div part="brand">
+      <slot name="title">
+        <h1 part="title">[[title]]</h1>
+      </slot>
+      <p part="description">[[description]]</p>
+    </div>
+    <div part="form">
+      <slot></slot>
+    </div>
+  </section>
+`;
 
 let memoizedTemplate;
 
@@ -90,15 +90,10 @@ class LoginOverlayWrapper extends Overlay {
       // Clone the superclass template
       memoizedTemplate = super.template.cloneNode(true);
 
-      // Retrieve the elements from component's template
-      const thisTemplate = DomModule.import(`${this.is}-template`, 'template');
-      const card = thisTemplate.content.querySelector('[part=card]');
-      const styles = thisTemplate.content.querySelector('style');
-
-      // Append elements to cloned template
+      // Replace overlay slot with card
+      const card = template.content.querySelector('[part=card]');
       const content = memoizedTemplate.content.querySelector('#content');
       content.replaceChild(card, content.children[0]);
-      content.appendChild(styles);
     }
 
     return memoizedTemplate;

package/src/vaadin-login-overlay.js

@@ -164,6 +164,21 @@ class LoginOverlay extends LoginMixin(ElementMixin(ThemableMixin(PolymerElement)
     e.preventDefault();
   }
 
+  /**
+   * @param {!Event} e
+   * @private
+   */
+  _retargetEvent(e) {
+    e.stopPropagation();
+    const { detail, composed, cancelable, bubbles } = e;
+
+    const firedEvent = this.dispatchEvent(new CustomEvent(e.type, { bubbles, cancelable, composed, detail }));
+    // Check if `eventTarget.preventDefault()` was called to prevent default in the original event
+    if (!firedEvent) {
+      e.preventDefault();
+    }
+  }
+
   /** @private */
   _onOpenedChange() {
     if (!this.opened) {

package/theme/lumo/vaadin-login-form-wrapper-styles.js

@@ -17,7 +17,7 @@ const loginFormWrapper = css`
     margin-top: calc(var(--lumo-font-size-xxxl) - var(--lumo-font-size-xxl));
   }
 
-  #forgotPasswordButton {
+  ::slotted([slot='forgot-password']) {
     margin: var(--lumo-space-s) auto;
   }
 

package/theme/lumo/vaadin-login-form.js

@@ -1,5 +1,6 @@
+import '@vaadin/button/theme/lumo/vaadin-button.js';
 import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
 import '@vaadin/password-field/theme/lumo/vaadin-password-field.js';
-import './vaadin-login-form-wrapper.js';
+import './vaadin-login-form-wrapper-styles.js';
 import './vaadin-login-form-styles.js';
 import '../../src/vaadin-login-form.js';

package/theme/material/vaadin-login-form-wrapper-styles.js

@@ -22,7 +22,7 @@ const loginFormWrapper = css`
     font-size: var(--material-h5-font-size);
   }
 
-  #forgotPasswordButton {
+  ::slotted([slot='forgot-password']) {
     margin: 0.5rem auto;
     padding-bottom: 12px;
     padding-top: 12px;

package/theme/material/vaadin-login-form.js

@@ -1,5 +1,6 @@
+import '@vaadin/button/theme/material/vaadin-button.js';
 import '@vaadin/text-field/theme/material/vaadin-text-field.js';
 import '@vaadin/password-field/theme/material/vaadin-password-field.js';
-import './vaadin-login-form-wrapper.js';
+import './vaadin-login-form-wrapper-styles.js';
 import './vaadin-login-form-styles.js';
 import '../../src/vaadin-login-form.js';

package/theme/material/vaadin-login-overlay-styles.js

@@ -302,7 +302,7 @@ const loginOverlayWrapper = css`
 `;
 
 registerStyles('vaadin-login-overlay-wrapper', [overlay, typography, loginOverlayWrapper], {
-  moduleId: 'vaadin-login-overlay-wrapper-material-styles',
+  moduleId: 'material-login-overlay-wrapper',
 });
 
 const loginFormWrapper = css`

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/login",
-  "version": "24.0.0-alpha2",
+  "version": "24.0.0-alpha4",
   "description-markup": "markdown",
   "contributions": {
     "html": {
@@ -148,7 +148,7 @@
         },
         {
           "name": "vaadin-login-overlay",
-          "description": "`<vaadin-login-overlay>` is a wrapper of the `<vaadin-login-form>` which opens a login form in an overlay and\nhaving an additional `brand` part for application title and description. Using `<vaadin-login-overlay>` allows\npassword managers to work with login form.\n\n```\n<vaadin-login-overlay opened></vaadin-login-overlay>\n```\n\n### Styling\n\nThe component doesn't have a shadowRoot, so the `<form>` and input fields can be styled from a global scope.\nUse `<vaadin-login-overlay-wrapper>` and `<vaadin-login-form-wrapper>` to apply styles.\n\nThe following shadow DOM parts of the `<vaadin-login-overlay-wrapper>` are available for styling:\n\nPart name       | Description\n----------------|---------------------------------------------------------|\n`card`          | Container for the entire component's content\n`brand`         | Container for application title and description\n`form`          | Container for the `<vaadin-login-form>` component\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/custom-theme/styling-components) documentation.\n\nSee [`<vaadin-login-form>`](https://cdn.vaadin.com/vaadin-web-components/24.0.0-alpha2/#/elements/vaadin-login-form)\ndocumentation for  `<vaadin-login-form-wrapper>` stylable parts.",
+          "description": "`<vaadin-login-overlay>` is a wrapper of the `<vaadin-login-form>` which opens a login form in an overlay and\nhaving an additional `brand` part for application title and description. Using `<vaadin-login-overlay>` allows\npassword managers to work with login form.\n\n```\n<vaadin-login-overlay opened></vaadin-login-overlay>\n```\n\n### Styling\n\nThe component doesn't have a shadowRoot, so the `<form>` and input fields can be styled from a global scope.\nUse `<vaadin-login-overlay-wrapper>` and `<vaadin-login-form-wrapper>` to apply styles.\n\nThe following shadow DOM parts of the `<vaadin-login-overlay-wrapper>` are available for styling:\n\nPart name       | Description\n----------------|---------------------------------------------------------|\n`card`          | Container for the entire component's content\n`brand`         | Container for application title and description\n`form`          | Container for the `<vaadin-login-form>` component\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/custom-theme/styling-components) documentation.\n\nSee [`<vaadin-login-form>`](https://cdn.vaadin.com/vaadin-web-components/24.0.0-alpha4/#/elements/vaadin-login-form)\ndocumentation for  `<vaadin-login-form-wrapper>` stylable parts.",
           "attributes": [
             {
               "name": "action",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/login",
-  "version": "24.0.0-alpha2",
+  "version": "24.0.0-alpha4",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -93,7 +93,7 @@
         },
         {
           "name": "vaadin-login-overlay",
-          "description": "`<vaadin-login-overlay>` is a wrapper of the `<vaadin-login-form>` which opens a login form in an overlay and\nhaving an additional `brand` part for application title and description. Using `<vaadin-login-overlay>` allows\npassword managers to work with login form.\n\n```\n<vaadin-login-overlay opened></vaadin-login-overlay>\n```\n\n### Styling\n\nThe component doesn't have a shadowRoot, so the `<form>` and input fields can be styled from a global scope.\nUse `<vaadin-login-overlay-wrapper>` and `<vaadin-login-form-wrapper>` to apply styles.\n\nThe following shadow DOM parts of the `<vaadin-login-overlay-wrapper>` are available for styling:\n\nPart name       | Description\n----------------|---------------------------------------------------------|\n`card`          | Container for the entire component's content\n`brand`         | Container for application title and description\n`form`          | Container for the `<vaadin-login-form>` component\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/custom-theme/styling-components) documentation.\n\nSee [`<vaadin-login-form>`](https://cdn.vaadin.com/vaadin-web-components/24.0.0-alpha2/#/elements/vaadin-login-form)\ndocumentation for  `<vaadin-login-form-wrapper>` stylable parts.",
+          "description": "`<vaadin-login-overlay>` is a wrapper of the `<vaadin-login-form>` which opens a login form in an overlay and\nhaving an additional `brand` part for application title and description. Using `<vaadin-login-overlay>` allows\npassword managers to work with login form.\n\n```\n<vaadin-login-overlay opened></vaadin-login-overlay>\n```\n\n### Styling\n\nThe component doesn't have a shadowRoot, so the `<form>` and input fields can be styled from a global scope.\nUse `<vaadin-login-overlay-wrapper>` and `<vaadin-login-form-wrapper>` to apply styles.\n\nThe following shadow DOM parts of the `<vaadin-login-overlay-wrapper>` are available for styling:\n\nPart name       | Description\n----------------|---------------------------------------------------------|\n`card`          | Container for the entire component's content\n`brand`         | Container for application title and description\n`form`          | Container for the `<vaadin-login-form>` component\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/custom-theme/styling-components) documentation.\n\nSee [`<vaadin-login-form>`](https://cdn.vaadin.com/vaadin-web-components/24.0.0-alpha4/#/elements/vaadin-login-form)\ndocumentation for  `<vaadin-login-form-wrapper>` stylable parts.",
           "extension": true,
           "attributes": [
             {

package/theme/lumo/vaadin-login-form-wrapper.js

@@ -1,3 +0,0 @@
-import '@vaadin/button/theme/lumo/vaadin-button.js';
-import './vaadin-login-form-wrapper-styles.js';
-import '../../src/vaadin-login-form-wrapper.js';

package/theme/material/vaadin-login-form-wrapper.js

@@ -1,3 +0,0 @@
-import '@vaadin/button/theme/material/vaadin-button.js';
-import './vaadin-login-form-wrapper-styles.js';
-import '../../src/vaadin-login-form-wrapper.js';