From c63af48f03a451ef90b513d7fe3299240258e7a7 Mon Sep 17 00:00:00 2001 From: Corvin <43533385+corvinsz@users.noreply.github.com> Date: Sun, 8 Nov 2026 13:38:08 +0100 Subject: [PATCH 1/3] fix(DialogHost): restore focus inside dialog after window is minimized and restored --- src/MaterialDesignThemes.Wpf/DialogHost.cs | 48 ++++++++++ .../DialogHost/WithMultipleTextBoxes.xaml | 27 ++++++ .../DialogHost/WithMultipleTextBoxes.xaml.cs | 16 ++++ .../WPF/DialogHosts/DialogHostTests.cs | 89 +++++++++++++++++++ 4 files changed, 180 insertions(+) create mode 100644 tests/MaterialDesignThemes.UITests/Samples/DialogHost/WithMultipleTextBoxes.xaml create mode 100644 tests/MaterialDesignThemes.UITests/Samples/DialogHost/WithMultipleTextBoxes.xaml.cs diff --git a/src/MaterialDesignThemes.Wpf/DialogHost.cs b/src/MaterialDesignThemes.Wpf/DialogHost.cs index a077b2f3ca..b80c4a782c 100644 --- a/src/MaterialDesignThemes.Wpf/DialogHost.cs +++ b/src/MaterialDesignThemes.Wpf/DialogHost.cs @@ -75,6 +75,8 @@ public class DialogHost : ContentControl private DialogClosingEventHandler? _attachedDialogClosingEventHandler; private DialogClosedEventHandler? _attachedDialogClosedEventHandler; private IInputElement? _restoreFocusDialogClose; + private Window? _window; + private UIElement? _lastFocusedPopupElement; private Action? _currentSnackbarMessageQueueUnPauseAction; static DialogHost() @@ -1010,8 +1012,50 @@ private void CloseDialogHandler(object sender, ExecutedRoutedEventArgs executedR private string GetStateName() => IsOpen ? OpenStateName : ClosedStateName; + protected override void OnGotKeyboardFocus(KeyboardFocusChangedEventArgs e) + { + if (e.NewFocus is UIElement element && + _popup?.Child is { } child && + child.IsAncestorOf(element)) + { + _lastFocusedPopupElement = element; + } + base.OnGotKeyboardFocus(e); + } + + protected override void OnLostKeyboardFocus(KeyboardFocusChangedEventArgs e) + { + // Minimizing moves focus to null; only forget the element when the user focuses something else in this window + if (e.NewFocus is DependencyObject newFocus && + _popup?.Child is { } child && + !child.IsAncestorOf(newFocus) && + Window.GetWindow(newFocus) == _window) + { + _lastFocusedPopupElement = null; + } + base.OnLostKeyboardFocus(e); + } + + private void WindowOnActivated(object? sender, EventArgs e) + { + // The popup has its own window handle, so WPF does not restore focus into it when the window is re-activated (issue #3434) + Dispatcher.BeginInvoke(() => + { + if (IsOpen && + _popup is { IsOpen: true, Child: { IsKeyboardFocusWithin: false } child } && + _lastFocusedPopupElement is { IsVisible: true } element && + child.IsAncestorOf(element)) + { + element.Focus(); + } + }, DispatcherPriority.Input); + } + private void OnUnloaded(object sender, RoutedEventArgs routedEventArgs) { + _window?.Activated -= WindowOnActivated; + _window = null; + foreach (var weakRef in LoadedInstances.ToList()) { if (!weakRef.TryGetTarget(out DialogHost? dialogHost) || ReferenceEquals(dialogHost, this)) @@ -1024,6 +1068,10 @@ private void OnUnloaded(object sender, RoutedEventArgs routedEventArgs) private void Register() { + _window?.Activated -= WindowOnActivated; + _window = Window.GetWindow(this); + _window?.Activated += WindowOnActivated; + foreach (var weakRef in LoadedInstances.ToList()) { if (weakRef.TryGetTarget(out DialogHost? dialogHost) && ReferenceEquals(dialogHost, this)) diff --git a/tests/MaterialDesignThemes.UITests/Samples/DialogHost/WithMultipleTextBoxes.xaml b/tests/MaterialDesignThemes.UITests/Samples/DialogHost/WithMultipleTextBoxes.xaml new file mode 100644 index 0000000000..6206c001ea --- /dev/null +++ b/tests/MaterialDesignThemes.UITests/Samples/DialogHost/WithMultipleTextBoxes.xaml @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/tests/MaterialDesignThemes.UITests/Samples/DialogHost/WithMultipleTextBoxes.xaml.cs b/tests/MaterialDesignThemes.UITests/Samples/DialogHost/WithMultipleTextBoxes.xaml.cs new file mode 100644 index 0000000000..0911fa7f73 --- /dev/null +++ b/tests/MaterialDesignThemes.UITests/Samples/DialogHost/WithMultipleTextBoxes.xaml.cs @@ -0,0 +1,16 @@ +namespace MaterialDesignThemes.UITests.Samples.DialogHost; + +/// +/// Interaction logic for WithMultipleTextBoxes.xaml +/// +public partial class WithMultipleTextBoxes : UserControl +{ + public WithMultipleTextBoxes() + { + InitializeComponent(); + } + private void DialogHost_Loaded(object sender, RoutedEventArgs e) + { + SampleDialogHost.IsOpen = true; + } +} diff --git a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs index 7fd4e36f3d..4d999274d2 100644 --- a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs +++ b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs @@ -677,6 +677,95 @@ public async Task DialogHost_CanOpenDialog_FromWindowConstructor() await Assert.That(await dialogHost.GetIsOpen()).IsTrue(); } + [Test] + [Description("Issue 3434")] + [Arguments(WindowState.Minimized, WindowState.Maximized, null)] + [Arguments(WindowState.Minimized, WindowState.Normal, null)] + [Arguments(WindowState.Minimized, WindowState.Maximized, "MaterialDesignEmbeddedDialogHost")] + [Arguments(WindowState.Minimized, WindowState.Normal, "MaterialDesignEmbeddedDialogHost")] + public async Task DialogHost_WhenWindowStateChanges_FocusedElementStaysFocused(WindowState firstWindowState, + WindowState secondWindowState, + string? styleName) + { + await using var recorder = new TestRecorder(App); + + var dialogHost = (await LoadUserControl()).As(); + if (styleName is not null) + { + await dialogHost.RemoteExecute(SetDialogHostStyle, styleName); + } + await Task.Delay(400); + + // Select the second TextBox + var tbTwo = await dialogHost.GetElement("TextBoxTwo"); + await tbTwo.MoveKeyboardFocus(); + await Assert.That(await tbTwo.GetIsFocused()).IsTrue(); + + // First state + await dialogHost.RemoteExecute(SetStateOfParentWindow, firstWindowState); + await Task.Delay(400); + // Second state + await dialogHost.RemoteExecute(SetStateOfParentWindow, secondWindowState); + await Task.Delay(400); + + // After changing state of the window the previously focused element should be focused again + await Assert.That(await tbTwo.GetIsFocused()).IsTrue(); + recorder.Success(); + } + + [Test] + [Description("Issue 3434")] + //[Arguments(null)] + [Arguments("MaterialDesignEmbeddedDialogHost")] + public async Task DialogHost_WhenWindowStateChanges_FocusOutsideDialogStaysOutside(string? styleName) + { + await using var recorder = new TestRecorder(App); + + var grid = await LoadXaml(""" + + + + + + + + + + + + + """); + var dialogHost = await grid.GetElement("DialogHost"); + if (styleName is not null) + { + await dialogHost.RemoteExecute(SetDialogHostStyle, styleName); + } + await Task.Delay(400); + + var insideTextBox = await dialogHost.GetElement("InsideTextBox"); + var outsideTextBox = await grid.GetElement("OutsideTextBox"); + await insideTextBox.MoveKeyboardFocus(); + await Assert.That(await insideTextBox.GetIsFocused()).IsTrue(); + await outsideTextBox.MoveKeyboardFocus(); + await Assert.That(await outsideTextBox.GetIsFocused()).IsTrue(); + + await dialogHost.RemoteExecute(SetStateOfParentWindow, WindowState.Minimized); + await Task.Delay(400); + await dialogHost.RemoteExecute(SetStateOfParentWindow, WindowState.Normal); + await Task.Delay(400); + + // Focus was outside the dialog before minimizing, so it must not be moved into the dialog + await Assert.That(await outsideTextBox.GetIsFocused()).IsTrue(); + recorder.Success(); + } + + private static object SetStateOfParentWindow(DialogHost dialogHost, WindowState state) + { + var window = Window.GetWindow(dialogHost); + window.WindowState = state; + return null!; + } + private static object SetDialogHostStyle(DialogHost dialogHost, string styleName) { var style = (Style)dialogHost.FindResource(styleName); From a7f76a2903600b25c32d39615d3c3b625ad419ae Mon Sep 17 00:00:00 2001 From: Corvin <43533385+corvinsz@users.noreply.github.com> Date: Sun, 8 Nov 2026 13:49:04 +0100 Subject: [PATCH 2/3] comment in test case --- .../WPF/DialogHosts/DialogHostTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs index 4d999274d2..301e079ec7 100644 --- a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs +++ b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs @@ -715,7 +715,7 @@ public async Task DialogHost_WhenWindowStateChanges_FocusedElementStaysFocused(W [Test] [Description("Issue 3434")] - //[Arguments(null)] + [Arguments(null)] [Arguments("MaterialDesignEmbeddedDialogHost")] public async Task DialogHost_WhenWindowStateChanges_FocusOutsideDialogStaysOutside(string? styleName) { From f9618229ce7e1c2d6862bd5ccfab509a243f0a2c Mon Sep 17 00:00:00 2001 From: Corvin <43533385+corvinsz@users.noreply.github.com> Date: Fri, 20 Nov 2026 17:22:39 +0100 Subject: [PATCH 3/3] test(DialogHost): share dialog host style test data via MethodDataSource --- .../WPF/DialogHosts/DialogHostTests.cs | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs index 301e079ec7..3231f1befe 100644 --- a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs +++ b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs @@ -9,6 +9,12 @@ namespace MaterialDesignThemes.UITests.WPF.DialogHosts; public class DialogHostTests : TestBase { + public static IEnumerable DialogHostStyles() + { + yield return null; // this acts like the default style + yield return "MaterialDesignEmbeddedDialogHost"; + } + public DialogHostTests() { AttachedDebuggerToRemoteProcess = false; @@ -580,9 +586,8 @@ public async Task DialogHost_TrapsFocusInsidePopup_WhenTabbing(string dialogHost [Test] [Description("Issue 4097")] - [Arguments("")] - [Arguments("MaterialDesignEmbeddedDialogHost")] - public async Task DialogHost_WithTransitionsDisabled_FocusesDialogWithoutWaitingForTransition(string dialogHostStyle) + [MethodDataSource(nameof(DialogHostStyles))] + public async Task DialogHost_WithTransitionsDisabled_FocusesDialogWithoutWaitingForTransition(string? dialogHostStyle) { await using var recorder = new TestRecorder(App); @@ -622,9 +627,8 @@ public async Task DialogHost_WithTransitionsDisabled_FocusesDialogWithoutWaiting [Test] [Description("Issue 4097")] - [Arguments("")] - [Arguments("MaterialDesignEmbeddedDialogHost")] - public async Task DialogHost_FocusMovedInsideDialogWhileOpening_IsKept(string dialogHostStyle) + [MethodDataSource(nameof(DialogHostStyles))] + public async Task DialogHost_FocusMovedInsideDialogWhileOpening_IsKept(string? dialogHostStyle) { await using var recorder = new TestRecorder(App); @@ -679,13 +683,8 @@ public async Task DialogHost_CanOpenDialog_FromWindowConstructor() [Test] [Description("Issue 3434")] - [Arguments(WindowState.Minimized, WindowState.Maximized, null)] - [Arguments(WindowState.Minimized, WindowState.Normal, null)] - [Arguments(WindowState.Minimized, WindowState.Maximized, "MaterialDesignEmbeddedDialogHost")] - [Arguments(WindowState.Minimized, WindowState.Normal, "MaterialDesignEmbeddedDialogHost")] - public async Task DialogHost_WhenWindowStateChanges_FocusedElementStaysFocused(WindowState firstWindowState, - WindowState secondWindowState, - string? styleName) + [MethodDataSource(nameof(DialogHostStyles))] + public async Task DialogHost_WhenWindowStateChanges_FocusedElementStaysFocused(string? styleName) { await using var recorder = new TestRecorder(App); @@ -701,11 +700,9 @@ public async Task DialogHost_WhenWindowStateChanges_FocusedElementStaysFocused(W await tbTwo.MoveKeyboardFocus(); await Assert.That(await tbTwo.GetIsFocused()).IsTrue(); - // First state - await dialogHost.RemoteExecute(SetStateOfParentWindow, firstWindowState); + await dialogHost.RemoteExecute(SetStateOfParentWindow, WindowState.Minimized); await Task.Delay(400); - // Second state - await dialogHost.RemoteExecute(SetStateOfParentWindow, secondWindowState); + await dialogHost.RemoteExecute(SetStateOfParentWindow, WindowState.Normal); await Task.Delay(400); // After changing state of the window the previously focused element should be focused again @@ -715,8 +712,7 @@ public async Task DialogHost_WhenWindowStateChanges_FocusedElementStaysFocused(W [Test] [Description("Issue 3434")] - [Arguments(null)] - [Arguments("MaterialDesignEmbeddedDialogHost")] + [MethodDataSource(nameof(DialogHostStyles))] public async Task DialogHost_WhenWindowStateChanges_FocusOutsideDialogStaysOutside(string? styleName) { await using var recorder = new TestRecorder(App);