Workaround issue #1293 by avoiding setting textbox focus on Mac (#1314)

mjcheetham · web-flow · commit a9ddfdf33c2c · 2023-07-03T15:25:45.000-07:00
There appears to be an issue with setting focus with empty textboxes on macOS. Let's put in a quick workaround for now to avoid the crash that happens otherwise. On Mac, do not attempt to set the focus to a text box. Workaround #1293
diff --git a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs
@@ -1,6 +1,7 @@
 using Atlassian.Bitbucket.UI.ViewModels;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitCredentialManager.UI.Controls;
 
 namespace Atlassian.Bitbucket.UI.Views
@@ -44,11 +45,15 @@ public void SetFocus()
                 _tabControl.SelectedIndex = 1;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
-                    _userNameTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _userNameTextBox.Focus();
                 }
                 else
                 {
-                    _passwordTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _passwordTextBox.Focus();
                 }
             }
         }
diff --git a/src/shared/Core/UI/Views/CredentialsView.axaml.cs b/src/shared/Core/UI/Views/CredentialsView.axaml.cs
@@ -32,11 +32,15 @@ public void SetFocus()
 
             if (string.IsNullOrWhiteSpace(vm.UserName))
             {
-                _userNameTextBox.Focus();
+                // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                if (!PlatformUtils.IsMacOS())
+                    _userNameTextBox.Focus();
             }
             else
             {
-                _passwordTextBox.Focus();
+                // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                if (!PlatformUtils.IsMacOS())
+                    _passwordTextBox.Focus();
             }
         }
     }
diff --git a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
@@ -8,6 +8,7 @@
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitCredentialManager.UI.Controls;
 
 namespace GitHub.UI.Controls
@@ -86,7 +87,9 @@ private void SetTextBoxes(string text)
 
         public void SetFocus()
         {
-            KeyboardDevice.Instance.SetFocusedElement(_textBoxes[0], NavigationMethod.Tab, KeyModifiers.None);
+            // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+            if (!PlatformUtils.IsMacOS())
+                KeyboardDevice.Instance.SetFocusedElement(_textBoxes[0], NavigationMethod.Tab, KeyModifiers.None);
         }
 
         private void SetUpTextBox(TextBox textBox)
diff --git a/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs b/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitHub.UI.ViewModels;
 using GitCredentialManager.UI.Controls;
 
@@ -53,19 +54,25 @@ public void SetFocus()
             else if (vm.ShowTokenLogin)
             {
                 _tabControl.SelectedIndex = 1;
-                _tokenTextBox.Focus();
+                // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                if (!PlatformUtils.IsMacOS())
+                    _tokenTextBox.Focus();
 
             }
             else if (vm.ShowBasicLogin)
             {
                 _tabControl.SelectedIndex = 2;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
-                    _userNameTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _userNameTextBox.Focus();
                 }
                 else
                 {
-                    _passwordTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _passwordTextBox.Focus();
                 }
             }
         }
diff --git a/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs b/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitHub.UI.Controls;
 using GitCredentialManager.UI.Controls;
 
@@ -23,7 +24,9 @@ private void InitializeComponent()
 
         public void SetFocus()
         {
-            _codeInput.SetFocus();
+            // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+            if (!PlatformUtils.IsMacOS())
+                _codeInput.SetFocus();
         }
     }
 }
diff --git a/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs b/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitLab.UI.ViewModels;
 using GitCredentialManager.UI.Controls;
 
@@ -48,18 +49,24 @@ public void SetFocus()
             else if (vm.ShowTokenLogin)
             {
                 _tabControl.SelectedIndex = 1;
-                _tokenTextBox.Focus();
+                // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                if (!PlatformUtils.IsMacOS())
+                    _tokenTextBox.Focus();
             }
             else if (vm.ShowBasicLogin)
             {
                 _tabControl.SelectedIndex = 2;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
-                    _userNameTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _userNameTextBox.Focus();
                 }
                 else
                 {
-                    _passwordTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _passwordTextBox.Focus();
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using Atlassian.Bitbucket.UI.ViewModels;`
`2`	`2`	`using Avalonia.Controls;`
`3`	`3`	`using Avalonia.Markup.Xaml;`
	`4`	`+using GitCredentialManager;`
`4`	`5`	`using GitCredentialManager.UI.Controls;`
`5`	`6`
`6`	`7`	`namespace Atlassian.Bitbucket.UI.Views`
`@@ -44,11 +45,15 @@ public void SetFocus()`
`44`	`45`	`_tabControl.SelectedIndex = 1;`
`45`	`46`	`if (string.IsNullOrWhiteSpace(vm.UserName))`
`46`	`47`	`{`
`47`		`- _userNameTextBox.Focus();`
	`48`	`+ // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293`
	`49`	`+ if (!PlatformUtils.IsMacOS())`
	`50`	`+ _userNameTextBox.Focus();`
`48`	`51`	`}`
`49`	`52`	`else`
`50`	`53`	`{`
`51`		`- _passwordTextBox.Focus();`
	`54`	`+ // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293`
	`55`	`+ if (!PlatformUtils.IsMacOS())`
	`56`	`+ _passwordTextBox.Focus();`
`52`	`57`	`}`
`53`	`58`	`}`
`54`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,15 @@ public void SetFocus()`
`32`	`32`
`33`	`33`	`if (string.IsNullOrWhiteSpace(vm.UserName))`
`34`	`34`	`{`
`35`		`- _userNameTextBox.Focus();`
	`35`	`+ // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293`
	`36`	`+ if (!PlatformUtils.IsMacOS())`
	`37`	`+ _userNameTextBox.Focus();`
`36`	`38`	`}`
`37`	`39`	`else`
`38`	`40`	`{`
`39`		`- _passwordTextBox.Focus();`
	`41`	`+ // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293`
	`42`	`+ if (!PlatformUtils.IsMacOS())`
	`43`	`+ _passwordTextBox.Focus();`
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Avalonia.Controls;`
`2`	`2`	`using Avalonia.Markup.Xaml;`
	`3`	`+using GitCredentialManager;`
`3`	`4`	`using GitHub.UI.ViewModels;`
`4`	`5`	`using GitCredentialManager.UI.Controls;`
`5`	`6`
`@@ -53,19 +54,25 @@ public void SetFocus()`
`53`	`54`	`else if (vm.ShowTokenLogin)`
`54`	`55`	`{`
`55`	`56`	`_tabControl.SelectedIndex = 1;`
`56`		`- _tokenTextBox.Focus();`
	`57`	`+ // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293`
	`58`	`+ if (!PlatformUtils.IsMacOS())`
	`59`	`+ _tokenTextBox.Focus();`
`57`	`60`
`58`	`61`	`}`
`59`	`62`	`else if (vm.ShowBasicLogin)`
`60`	`63`	`{`
`61`	`64`	`_tabControl.SelectedIndex = 2;`
`62`	`65`	`if (string.IsNullOrWhiteSpace(vm.UserName))`
`63`	`66`	`{`
`64`		`- _userNameTextBox.Focus();`
	`67`	`+ // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293`
	`68`	`+ if (!PlatformUtils.IsMacOS())`
	`69`	`+ _userNameTextBox.Focus();`
`65`	`70`	`}`
`66`	`71`	`else`
`67`	`72`	`{`
`68`		`- _passwordTextBox.Focus();`
	`73`	`+ // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293`
	`74`	`+ if (!PlatformUtils.IsMacOS())`
	`75`	`+ _passwordTextBox.Focus();`
`69`	`76`	`}`
`70`	`77`	`}`
`71`	`78`	`}`