Fix preview changes not working for new inline rename (#64264)

dotnet · Sep 26, 2022 · abb9948 · abb9948
1 parent 2a9812e
commit abb9948
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
@@ -94,14 +94,36 @@ private async Task DismissToolTipsAsync()
 
         private void RenameFlyout_IsKeyboardFocusWithinChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            if (!IsKeyboardFocusWithin)
+            // When previewing changes, focus will be lost and put 
+            // into a preview changes window. If we're returning back
+            // to this UI, reset the flag to false. Otherwise, just ignore
+            // this focus change. No need to cancel in that case 
+            if (_viewModel.PreviewChangesFlag)
+            {
+                if (IsKeyboardFocused)
+                {
+                    _viewModel.PreviewChangesFlag = false;
+                }
+
+                return;
+            }
+
+            if (!IsKeyboardFocused)
             {
                 _viewModel.Cancel();
             }
         }
 
         private void TextView_LostFocus(object sender, EventArgs e)
-            => _viewModel.Cancel();
+        {
+            // Preview changes is happening, no need to act on focus changes.
+            if (_viewModel.PreviewChangesFlag)
+            {
+                return;
+            }
+
+            _viewModel.Cancel();
+        }
 
         private void TextView_ViewPortChanged(object sender, EventArgs e)
             => PositionAdornment();