From 76f67faada3d17ec48528affbf8ac1eb1e7e1ed2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 4 Mar 2021 14:45:05 +0100
Subject: [PATCH] MOBILE-3664 ios: Fix some inputs not focusable in iOS

---
 src/addons/calendar/pages/edit-event/edit-event.html   |  3 ++-
 .../features/login/pages/credentials/credentials.html  | 10 +++++-----
 .../pages/forgotten-password/forgotten-password.html   |  9 ++++-----
 .../search/components/search-box/core-search-box.html  | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 27a1912bf..193a65b58 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -15,7 +15,8 @@
         <form [formGroup]="form" *ngIf="!error" #editEventForm>
             <!-- Event name. -->
             <ion-item class="ion-text-wrap">
-                    <ion-label position="stacked"><h2 [core-mark-required]="true">
+                <ion-label position="stacked">
+                    <h2 [core-mark-required]="true">
                         {{ 'addon.calendar.eventname' | translate }}
                     </h2>
                 </ion-label>
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 3b393f0b0..db3f5ce46 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -31,11 +31,11 @@
 
         <form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm>
             <ion-item *ngIf="siteChecked && !isBrowserSSO">
-                <ion-label>
-                    <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
-                        formControlName="username" autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next"
-                        required="true"></ion-input>
-                </ion-label>
+                <ion-label></ion-label>
+                <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
+                    formControlName="username" autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next"
+                    required="true">
+                </ion-input>
             </ion-item>
             <ion-item *ngIf="siteChecked && !isBrowserSSO" class="ion-margin-bottom">
                 <ion-label></ion-label>
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 ed7c39de0..56a3aef48 100644
--- a/src/core/features/login/pages/forgotten-password/forgotten-password.html
+++ b/src/core/features/login/pages/forgotten-password/forgotten-password.html
@@ -29,11 +29,10 @@
                 </ion-item>
             </ion-radio-group>
             <ion-item>
-                <ion-label>
-                    <ion-input type="text" name="value" placeholder="{{ 'core.login.usernameoremail' | translate }}"
-                        formControlName="value" autocapitalize="none" autocorrect="off" [core-auto-focus]="autoFocus">
-                    </ion-input>
-                </ion-label>
+                <ion-label></ion-label>
+                <ion-input type="text" name="value" placeholder="{{ 'core.login.usernameoremail' | translate }}"
+                    formControlName="value" autocapitalize="none" autocorrect="off" [core-auto-focus]="autoFocus">
+                </ion-input>
             </ion-item>
             <ion-button type="submit" class="ion-margin" expand="block" [disabled]="!myForm.valid">
                 {{ 'core.courses.search' | translate }}
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 70b6e55da..7f400ffa9 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
@@ -1,11 +1,11 @@
 <ion-card>
     <form (ngSubmit)="submitForm($event)" role="search" #searchForm>
         <ion-item>
-            <ion-label>
-                <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder"
-                    [autocorrect]="autocorrect" [spellcheck]="spellcheck" [core-auto-focus]="autoFocus"
-                    [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)"></ion-input>
-            </ion-label>
+            <ion-label></ion-label>
+            <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder"
+                [autocorrect]="autocorrect" [spellcheck]="spellcheck" [core-auto-focus]="autoFocus"
+                [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)">
+            </ion-input>
             <ion-button slot="end" fill="clear" type="submit" size="small" [attr.aria-label]="searchLabel"
                 [disabled]="disabled || !searchText || (searchText.length < lengthCheck)">
                 <ion-icon name="fas-search" slot="icon-only"></ion-icon>