cherry-pick code to handle 'enter' click from v14

umbraco · Oct 17, 2024 · 402672b · 402672b
1 parent 74a57b0
commit 402672b
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts b/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts
@@ -36,6 +36,13 @@ export default class UmbLoginPageElement extends LitElement {
 
     if (!this.#formElement) return;
 
+    // We need to listen for the enter key to submit the form, because the uui-button does not support the native input fields submit event
+    this.#formElement.addEventListener('keypress', (e) => {
+      if (e.key === 'Enter') {
+        this.#onSubmitClick();
+      }
+    });
+
     this.#formElement.onsubmit = this.#handleSubmit;
   }
 
@@ -53,6 +60,12 @@ export default class UmbLoginPageElement extends LitElement {
     const password = formData.get('password') as string;
     const persist = formData.has('persist');
 
+    if (!username || !password) {
+      this._loginError = await umbLocalizationContext.localize('auth_userFailedLogin');
+      this._loginState = 'failed';
+      return;
+    }
+
     this._loginState = 'waiting';
 
     const response = await umbAuthContext.login({