diff --git a/src/core/directives/auto-focus.ts b/src/core/directives/auto-focus.ts
index 4d4857a82..190f90d19 100644
--- a/src/core/directives/auto-focus.ts
+++ b/src/core/directives/auto-focus.ts
@@ -30,7 +30,7 @@ import { CoreUtils } from '@services/utils/utils';
})
export class CoreAutoFocusDirective implements AfterViewInit {
- @Input('core-auto-focus') showKeyboard: boolean | string = true;
+ @Input('core-auto-focus') autoFocus: boolean | string = true;
protected element: HTMLElement;
@@ -42,7 +42,7 @@ export class CoreAutoFocusDirective implements AfterViewInit {
* @inheritdoc
*/
ngAfterViewInit(): void {
- if (this.showKeyboard === 'nofocus') {
+ if (CoreUtils.isFalseOrZero(this.autoFocus)) {
return;
}
@@ -78,8 +78,7 @@ export class CoreAutoFocusDirective implements AfterViewInit {
return;
}
- const showKeyboard = this.showKeyboard === '' || CoreUtils.isTrueOrOne(this.showKeyboard);
- CoreDomUtils.focusElement(element, showKeyboard);
+ CoreDomUtils.focusElement(element);
if (element != document.activeElement) {
this.setFocus(retries - 1);
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index b801b643c..e124b7293 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -33,7 +33,7 @@
{{ 'core.login.username' | translate }}
+ required="true">
diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.html b/src/core/features/login/pages/forgotten-password/forgotten-password.html
index b7ddc1d03..c25d7e423 100644
--- a/src/core/features/login/pages/forgotten-password/forgotten-password.html
+++ b/src/core/features/login/pages/forgotten-password/forgotten-password.html
@@ -31,7 +31,7 @@
+ formControlName="value" autocapitalize="none" autocorrect="off" [core-auto-focus]="autoFocus">
diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.ts b/src/core/features/login/pages/forgotten-password/forgotten-password.ts
index 5e54a3ce6..e6aa8a6b0 100644
--- a/src/core/features/login/pages/forgotten-password/forgotten-password.ts
+++ b/src/core/features/login/pages/forgotten-password/forgotten-password.ts
@@ -35,7 +35,7 @@ export class CoreLoginForgottenPasswordPage implements OnInit {
myForm!: FormGroup;
siteUrl!: string;
- showKeyboard!: boolean;
+ autoFocus!: boolean;
constructor(
protected formBuilder: FormBuilder,
@@ -55,7 +55,7 @@ export class CoreLoginForgottenPasswordPage implements OnInit {
}
this.siteUrl = siteUrl;
- this.showKeyboard = Platform.is('tablet');
+ this.autoFocus = Platform.is('tablet');
this.myForm = this.formBuilder.group({
field: ['username', Validators.required],
value: [CoreNavigator.getRouteParam('username') || '', Validators.required],
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 631aa99f4..a0b93d75f 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -42,7 +42,7 @@
+ autocomplete="current-password" enterkeyhint="go" required="true">
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index 7b509ee74..58e5818a7 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -26,7 +26,7 @@
{{ 'core.login.siteaddress' | translate }}
+ formControlName="siteUrl" [core-auto-focus]="showKeyboard && !showScanQR">
@@ -36,7 +36,7 @@
{{ 'core.login.siteaddress' | translate }}
+ [core-auto-focus]="showKeyboard && !showScanQR" (ionChange)="searchSite($event, siteForm.value.siteUrl)">
diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html
index 8438c6237..9d71300f2 100644
--- a/src/core/features/search/components/search-box/core-search-box.html
+++ b/src/core/features/search/components/search-box/core-search-box.html
@@ -3,7 +3,7 @@