when password visibility is toggled the cursor keeps the current sele…

src/angular/components/add-edit.component.ts

@@ -427,7 +427,12 @@ export class AddEditComponent implements OnInit {
 
     togglePassword() {
         this.showPassword = !this.showPassword;
-        document.getElementById('loginPassword').focus();
+        const inputField: any = document.getElementById('loginPassword');
+        const cursorPosition = [inputField.selectionStart, inputField.selectionEnd];
+        inputField.focus();
+        if (cursorPosition) {
+            setTimeout(() => inputField.setSelectionRange(cursorPosition[0], cursorPosition[1]), 10);
+        }
         if (this.editMode && this.showPassword) {
             this.eventService.collect(EventType.Cipher_ClientToggledPasswordVisible, this.cipherId);
         }

src/angular/components/export.component.ts

@@ -74,7 +74,12 @@ export class ExportComponent {
 
     togglePassword() {
         this.showPassword = !this.showPassword;
-        document.getElementById('masterPassword').focus();
+        const inputField: any = document.getElementById('masterPassword');
+        const cursorPosition = [inputField.selectionStart, inputField.selectionEnd];
+        inputField.focus();
+        if (cursorPosition) {
+            setTimeout(() => inputField.setSelectionRange(cursorPosition[0], cursorPosition[1]), 10);
+        }
     }
 
     protected saved() {

src/angular/components/lock.component.ts

@@ -166,7 +166,12 @@ export class LockComponent implements OnInit {
 
     togglePassword() {
         this.showPassword = !this.showPassword;
-        document.getElementById(this.pinLock ? 'pin' : 'masterPassword').focus();
+        const inputField: any = document.getElementById(this.pinLock ? 'pin' : 'masterPassword');
+        const cursorPosition = [inputField.selectionStart, inputField.selectionEnd];
+        inputField.focus();
+        if (cursorPosition) {
+            setTimeout(() => inputField.setSelectionRange(cursorPosition[0], cursorPosition[1]), 10);
+        }
     }
 
     private async setKeyAndContinue(key: SymmetricCryptoKey) {

src/angular/components/login.component.ts

@@ -112,7 +112,12 @@ export class LoginComponent implements OnInit {
 
     togglePassword() {
         this.showPassword = !this.showPassword;
-        document.getElementById('masterPassword').focus();
+        const inputField: any = document.getElementById('masterPassword');
+        const cursorPosition = [inputField.selectionStart, inputField.selectionEnd];
+        inputField.focus();
+        if (cursorPosition) {
+            setTimeout(() => inputField.setSelectionRange(cursorPosition[0], cursorPosition[1]), 10);
+        }
     }
 
     async launchSsoBrowser(clientId: string, ssoRedirectUri: string) {

src/angular/components/register.component.ts

@@ -145,7 +145,15 @@ export class RegisterComponent {
 
     togglePassword(confirmField: boolean) {
         this.showPassword = !this.showPassword;
-        document.getElementById(confirmField ? 'masterPasswordRetype' : 'masterPassword').focus();
+        const inputField: any = document.getElementById(confirmField ? 'masterPasswordRetype' : 'masterPassword');
+        const cursorPosition = [inputField.selectionStart, inputField.selectionEnd];
+        inputField.focus();
+
+
+
+        if (cursorPosition) {
+            setTimeout(() => inputField.setSelectionRange(cursorPosition[0], cursorPosition[1]), 10);
+        }
     }
 
     updatePasswordStrength() {

src/angular/components/set-password.component.ts

@@ -102,6 +102,11 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
 
     togglePassword(confirmField: boolean) {
         this.showPassword = !this.showPassword;
-        document.getElementById(confirmField ? 'masterPasswordRetype' : 'masterPassword').focus();
+        const inputField: any = document.getElementById(confirmField ? 'masterPasswordRetype' : 'masterPassword');
+        const cursorPosition = [inputField.selectionStart, inputField.selectionEnd];
+        inputField.focus();
+        if (cursorPosition) {
+            setTimeout(() => inputField.setSelectionRange(cursorPosition[0], cursorPosition[1]), 10);
+        }
     }
 }