From c80a75e10acbe8ce322b5ed1eff4e9e807d6408e Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sat, 25 Feb 2023 10:31:19 +0100
Subject: [PATCH 01/11] Add sample project reproducing the issue

---
 Directory.packages.props            |  4 +-
 MDIX-Testing/App.xaml               | 13 +++++
 MDIX-Testing/App.xaml.cs            | 42 ++++++++++++++++
 MDIX-Testing/AssemblyInfo.cs        | 10 ++++
 MDIX-Testing/Dialog.xaml            | 22 +++++++++
 MDIX-Testing/Dialog.xaml.cs         | 11 +++++
 MDIX-Testing/InfoView.xaml          | 13 +++++
 MDIX-Testing/InfoView.xaml.cs       | 26 ++++++++++
 MDIX-Testing/MDIX-Testing.csproj    | 22 +++++++++
 MDIX-Testing/MainWindow.xaml        | 74 +++++++++++++++++++++++++++++
 MDIX-Testing/MainWindow.xaml.cs     |  9 ++++
 MDIX-Testing/MainWindowViewModel.cs | 36 ++++++++++++++
 MaterialDesignToolkit.Full.sln      | 19 ++++++++
 13 files changed, 300 insertions(+), 1 deletion(-)
 create mode 100644 MDIX-Testing/App.xaml
 create mode 100644 MDIX-Testing/App.xaml.cs
 create mode 100644 MDIX-Testing/AssemblyInfo.cs
 create mode 100644 MDIX-Testing/Dialog.xaml
 create mode 100644 MDIX-Testing/Dialog.xaml.cs
 create mode 100644 MDIX-Testing/InfoView.xaml
 create mode 100644 MDIX-Testing/InfoView.xaml.cs
 create mode 100644 MDIX-Testing/MDIX-Testing.csproj
 create mode 100644 MDIX-Testing/MainWindow.xaml
 create mode 100644 MDIX-Testing/MainWindow.xaml.cs
 create mode 100644 MDIX-Testing/MainWindowViewModel.cs

diff --git a/Directory.packages.props b/Directory.packages.props
index 3aacd77f87..3056e29f12 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -26,5 +26,7 @@
     <PackageVersion Include="xunit" Version="2.4.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MDIX-Testing/App.xaml b/MDIX-Testing/App.xaml
new file mode 100644
index 0000000000..87d596520d
--- /dev/null
+++ b/MDIX-Testing/App.xaml
@@ -0,0 +1,13 @@
+<Application x:Class="MDIX_Testing.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/MDIX-Testing/App.xaml.cs b/MDIX-Testing/App.xaml.cs
new file mode 100644
index 0000000000..de95bc9617
--- /dev/null
+++ b/MDIX-Testing/App.xaml.cs
@@ -0,0 +1,42 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using System.Windows;
+
+namespace MDIX_Testing;
+
+public partial class App : Application
+{
+    public static IHost? AppHost { get; private set; }
+
+	public App()
+	{
+		AppHost = Host.CreateDefaultBuilder()
+			.ConfigureServices((hostContext, services) =>
+			{
+				services.AddSingleton(services => new MainWindow()
+				{
+					DataContext = services.GetRequiredService<MainWindowViewModel>()
+				});
+
+				services.AddSingleton<MainWindowViewModel>();
+			})
+			.Build();
+	}
+
+    protected override async void OnStartup(StartupEventArgs e)
+    {
+		await AppHost!.StartAsync();
+
+		var startupForm = AppHost.Services.GetRequiredService<MainWindow>();
+		startupForm.Show();
+
+        base.OnStartup(e);
+    }
+
+    protected override async void OnExit(ExitEventArgs e)
+    {
+		await AppHost!.StopAsync();
+
+        base.OnExit(e);
+    }
+}
diff --git a/MDIX-Testing/AssemblyInfo.cs b/MDIX-Testing/AssemblyInfo.cs
new file mode 100644
index 0000000000..8b5504ecfb
--- /dev/null
+++ b/MDIX-Testing/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/MDIX-Testing/Dialog.xaml b/MDIX-Testing/Dialog.xaml
new file mode 100644
index 0000000000..cc23b9e1b7
--- /dev/null
+++ b/MDIX-Testing/Dialog.xaml
@@ -0,0 +1,22 @@
+<UserControl x:Class="MDIX_Testing.Dialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:MDIX_Testing"
+             mc:Ignorable="d" d:Background="White"
+             Background="{DynamicResource MaterialDesignPaper}"
+             TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+             Height="100" Width="200">
+    <Grid Margin="10">
+        <StackPanel VerticalAlignment="Center">
+            <StackPanel Orientation="Horizontal" Margin="0,0,0,20">
+                <TextBlock Text="Current Tab Index: " />
+                <TextBlock Text="{Binding SelectedIndex}" />
+            </StackPanel>
+
+            <Button Content="Navigate Home" Command="{Binding NavigateHomeCommand}" />
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/MDIX-Testing/Dialog.xaml.cs b/MDIX-Testing/Dialog.xaml.cs
new file mode 100644
index 0000000000..d8d06875c2
--- /dev/null
+++ b/MDIX-Testing/Dialog.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace MDIX_Testing;
+
+public partial class Dialog : UserControl
+{
+    public Dialog()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/MDIX-Testing/InfoView.xaml b/MDIX-Testing/InfoView.xaml
new file mode 100644
index 0000000000..d45ed916e3
--- /dev/null
+++ b/MDIX-Testing/InfoView.xaml
@@ -0,0 +1,13 @@
+<UserControl x:Class="MDIX_Testing.InfoView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:MDIX_Testing"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid Margin="20">
+        <Button Content="DialogHost" HorizontalAlignment="Center"
+                                Command="{Binding OpenDialogCommand}"/>
+    </Grid>
+</UserControl>
diff --git a/MDIX-Testing/InfoView.xaml.cs b/MDIX-Testing/InfoView.xaml.cs
new file mode 100644
index 0000000000..72f4c56763
--- /dev/null
+++ b/MDIX-Testing/InfoView.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace MDIX_Testing;
+/// <summary>
+/// Interaction logic for InfoView.xaml
+/// </summary>
+public partial class InfoView : UserControl
+{
+    public InfoView()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/MDIX-Testing/MDIX-Testing.csproj b/MDIX-Testing/MDIX-Testing.csproj
new file mode 100644
index 0000000000..a7d0ba2c38
--- /dev/null
+++ b/MDIX-Testing/MDIX-Testing.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <RootNamespace>MDIX_Testing</RootNamespace>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/MDIX-Testing/MainWindow.xaml b/MDIX-Testing/MainWindow.xaml
new file mode 100644
index 0000000000..df5a105f12
--- /dev/null
+++ b/MDIX-Testing/MainWindow.xaml
@@ -0,0 +1,74 @@
+<Window x:Class="MDIX_Testing.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        xmlns:local="clr-namespace:MDIX_Testing"
+        mc:Ignorable="d"
+        d:DataContext="{d:DesignInstance Type=local:MainWindowViewModel}"
+        Background="{DynamicResource MaterialDesignPaper}"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        Title="MDIX - DialogHost and TabControl SelectedIndex" FontSize="16"
+        Height="450" Width="800" WindowStartupLocation="CenterScreen">
+  <Border>
+    <materialDesign:DialogHost>
+      <Grid>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="50" />
+          <RowDefinition Height="*" />
+          <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="0">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
+
+          <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
+            <TextBlock Text="Current Tab Index: " />
+            <TextBlock Text="{Binding SelectedIndex}" d:Text="2" />
+          </StackPanel>
+
+          <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
+            <materialDesign:PopupBox>
+              <Button Content="Settings" Command="{Binding OpenDialogCommand}" />
+            </materialDesign:PopupBox>
+            <TextBlock Text="PopupBox" VerticalAlignment="Center" />
+          </StackPanel>
+
+          <Menu x:Name="Menu" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center">
+            <MenuItem>
+              <MenuItem.Header>
+                <StackPanel Orientation="Horizontal">
+                  <materialDesign:PackIcon Kind="User" Height="20" Width="20" Margin="0,0,5,0" />
+                  <TextBlock Text="Menu" VerticalAlignment="Center" FontSize="16" />
+                </StackPanel>
+              </MenuItem.Header>
+              <MenuItem Header="Settings" Icon="{materialDesign:PackIcon Kind=Settings}" 
+                                      Command="{Binding OpenDialogCommand}" />
+            </MenuItem>
+          </Menu>
+        </Grid>
+
+        <!--#region Transitioner-->
+        <materialDesign:Transitioner Grid.Row="1" 
+                                             SelectedIndex="{Binding ElementName=NavigationTabControl, Path=SelectedIndex}">
+
+          <TextBlock Text="Home Screen" HorizontalAlignment="Center" VerticalAlignment="Center" />
+          <local:InfoView DataContext="{Binding}" />
+        </materialDesign:Transitioner>
+        <!--#endregion-->
+
+        <!--#region TabControl-->
+        <TabControl Grid.Row="2" x:Name="NavigationTabControl" SelectedIndex="{Binding SelectedIndex}">
+          <TabItem Header="Home" />
+          <TabItem Header="Info" />
+        </TabControl>
+        <!--#endregion-->
+      </Grid>
+    </materialDesign:DialogHost>
+  </Border>
+</Window>
diff --git a/MDIX-Testing/MainWindow.xaml.cs b/MDIX-Testing/MainWindow.xaml.cs
new file mode 100644
index 0000000000..43b5f4a686
--- /dev/null
+++ b/MDIX-Testing/MainWindow.xaml.cs
@@ -0,0 +1,9 @@
+namespace MDIX_Testing;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/MDIX-Testing/MainWindowViewModel.cs b/MDIX-Testing/MainWindowViewModel.cs
new file mode 100644
index 0000000000..54b42ef296
--- /dev/null
+++ b/MDIX-Testing/MainWindowViewModel.cs
@@ -0,0 +1,36 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using MaterialDesignThemes.Wpf;
+using System.Threading.Tasks;
+
+namespace MDIX_Testing;
+
+public partial class MainWindowViewModel : ObservableObject
+{
+    [ObservableProperty]
+    private int _selectedIndex;
+
+    [RelayCommand]
+    private async Task OpenDialogAsync()
+    {
+        var view = new Dialog()
+        {
+            DataContext = this
+        };
+
+        await DialogHost.Show(view);
+    }
+
+    [RelayCommand]
+    private async Task NavigateHomeAsync()
+    {
+        DialogHost.CloseDialogCommand.Execute(null, null);
+
+        /// If the dialog has been opened through the menu (System.Windows.Controls),
+        /// adding a delay  of at least 200-300 makes the tabitem switch via code possible
+        //await Task.Delay(500);
+
+        SelectedIndex = 0;
+        await Task.CompletedTask;
+    }
+}
diff --git a/MaterialDesignToolkit.Full.sln b/MaterialDesignToolkit.Full.sln
index 17330fedba..df32883c72 100644
--- a/MaterialDesignToolkit.Full.sln
+++ b/MaterialDesignToolkit.Full.sln
@@ -63,6 +63,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{18401177
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesign3Demo", "MaterialDesign3.Demo.Wpf\MaterialDesign3Demo.csproj", "{98627CBE-F009-482E-97E9-C69C7135E91F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MDIX-Testing", "MDIX-Testing\MDIX-Testing.csproj", "{00EE118A-86D5-434B-AE42-7DEEE720CF8C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -235,6 +237,22 @@ Global
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x64.Build.0 = Release|Any CPU
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.ActiveCfg = Release|Any CPU
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.Build.0 = Release|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|x64.Build.0 = Debug|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|x86.Build.0 = Debug|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|ARM.Build.0 = Release|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|x64.ActiveCfg = Release|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|x64.Build.0 = Release|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|x86.ActiveCfg = Release|Any CPU
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -245,6 +263,7 @@ Global
 		{59CE50AC-D176-4CC0-B465-26F66054A15E} = {9E303A4A-3712-44B9-91EE-830FDC087795}
 		{18401177-A30E-4330-8F6B-101DF876CE99} = {55087897-5F09-45CA-8E12-12B36B45F262}
 		{98627CBE-F009-482E-97E9-C69C7135E91F} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
+		{00EE118A-86D5-434B-AE42-7DEEE720CF8C} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {730B2F9E-74AE-46CE-9E61-89AA5C6D5DD3}

From b5031fb4c8b6df14ec3b0fc95a03416587f9356f Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sat, 25 Feb 2023 10:35:43 +0100
Subject: [PATCH 02/11] "Hacky fix" to showcase what the root cause is

---
 MaterialDesignThemes.Wpf/DialogHost.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/MaterialDesignThemes.Wpf/DialogHost.cs b/MaterialDesignThemes.Wpf/DialogHost.cs
index d333f12826..282826b363 100644
--- a/MaterialDesignThemes.Wpf/DialogHost.cs
+++ b/MaterialDesignThemes.Wpf/DialogHost.cs
@@ -369,6 +369,19 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
             var window = Window.GetWindow(dialogHost);
             dialogHost._restoreFocusDialogClose = window != null ? FocusManager.GetFocusedElement(window) : null;
 
+            /* The root cause of the issue is that dialogHost._restoreFocusDialogClose at this point is a TabItem.
+             * So when trying to restore focus when the dialog closes, it will call .Focus() on the TabItem which
+             * effectively does a tab switch if that TabItem is not currently the selected TabItem.
+             *
+             * This IS NOT the right fix, but showcases the issue. How can we go about creating a generic fix for this?
+             * I don't believe TabControl is the only control which is facing this issue. Any control with state similar
+             * to the TabControl would arguably suffer from the same issue.
+             */
+            if (dialogHost._restoreFocusDialogClose is TabItem { Parent: TabControl tabControl })
+            {
+                dialogHost._restoreFocusDialogClose = tabControl;
+            }
+
             //multiple ways of calling back that the dialog has opened:
             // * routed event
             // * the attached property (which should be applied to the button which opened the dialog

From 0182649c8534a747385a6341fb251d9bf894005b Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 27 Feb 2023 20:47:59 +0100
Subject: [PATCH 03/11] Remove hacky fix

---
 MaterialDesignThemes.Wpf/DialogHost.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/MaterialDesignThemes.Wpf/DialogHost.cs b/MaterialDesignThemes.Wpf/DialogHost.cs
index 282826b363..d333f12826 100644
--- a/MaterialDesignThemes.Wpf/DialogHost.cs
+++ b/MaterialDesignThemes.Wpf/DialogHost.cs
@@ -369,19 +369,6 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
             var window = Window.GetWindow(dialogHost);
             dialogHost._restoreFocusDialogClose = window != null ? FocusManager.GetFocusedElement(window) : null;
 
-            /* The root cause of the issue is that dialogHost._restoreFocusDialogClose at this point is a TabItem.
-             * So when trying to restore focus when the dialog closes, it will call .Focus() on the TabItem which
-             * effectively does a tab switch if that TabItem is not currently the selected TabItem.
-             *
-             * This IS NOT the right fix, but showcases the issue. How can we go about creating a generic fix for this?
-             * I don't believe TabControl is the only control which is facing this issue. Any control with state similar
-             * to the TabControl would arguably suffer from the same issue.
-             */
-            if (dialogHost._restoreFocusDialogClose is TabItem { Parent: TabControl tabControl })
-            {
-                dialogHost._restoreFocusDialogClose = tabControl;
-            }
-
             //multiple ways of calling back that the dialog has opened:
             // * routed event
             // * the attached property (which should be applied to the button which opened the dialog

From 6cb4c8b964b761ce1cad7b5cd44bd09cef02c19b Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 27 Feb 2023 20:48:20 +0100
Subject: [PATCH 04/11] Add failing UI test

---
 .../Samples/DialogHost/RestoreFocus.xaml      | 48 +++++++++++++++++++
 .../Samples/DialogHost/RestoreFocus.xaml.cs   | 15 ++++++
 .../WPF/DialogHosts/DialogHostTests.cs        | 35 ++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml
 create mode 100644 MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml.cs

diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml
new file mode 100644
index 0000000000..51792fb19c
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml
@@ -0,0 +1,48 @@
+<UserControl x:Class="MaterialDesignThemes.UITests.Samples.DialogHost.RestoreFocus"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.DialogHost"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance Type=local:RestoreFocus}"
+             d:DesignHeight="450" d:DesignWidth="800">
+  <Grid>
+    <materialDesign:DialogHost x:Name="DialogHost">
+      <Grid>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Menu x:Name="Menu" Grid.Row="0" HorizontalAlignment="Right">
+          <MenuItem x:Name="MenuItem1">
+            <MenuItem.Header>
+              <StackPanel Orientation="Horizontal">
+                <materialDesign:PackIcon Kind="User" Height="20" Width="20" Margin="0,0,5,0" />
+                <TextBlock Text="Menu" VerticalAlignment="Center" FontSize="16" />
+              </StackPanel>
+            </MenuItem.Header>
+            <MenuItem x:Name="MenuItem2" Header="Settings" Icon="{materialDesign:PackIcon Kind=Settings}" Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}" />
+          </MenuItem>
+        </Menu>
+
+        <TabControl x:Name="TabControl" Grid.Row="1">
+          <TabItem x:Name="TabItem1" Header="Tab 1">
+            <TextBlock Text="Page 1" />
+          </TabItem>
+          <TabItem x:Name="TabItem2" Header="Tab 2">
+            <TextBlock Text="Page 2" />
+          </TabItem>
+        </TabControl>
+      </Grid>
+
+      <materialDesign:DialogHost.DialogContent>
+        <Grid Margin="50">
+          <Button x:Name="NavigateHomeButton" Content="Navigate to Tab 1" Click="NavigateHomeButton_OnClick" />
+        </Grid>
+      </materialDesign:DialogHost.DialogContent>
+    </materialDesign:DialogHost>
+  </Grid>
+</UserControl>
diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml.cs b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml.cs
new file mode 100644
index 0000000000..ef60f08892
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml.cs
@@ -0,0 +1,15 @@
+namespace MaterialDesignThemes.UITests.Samples.DialogHost;
+
+public partial class RestoreFocus : UserControl
+{
+    public RestoreFocus()
+    {
+        InitializeComponent();
+    }
+
+    private void NavigateHomeButton_OnClick(object sender, RoutedEventArgs e)
+    {
+        Wpf.DialogHost.CloseDialogCommand.Execute(null, null);
+        TabControl.SelectedItem = TabItem1;
+    }
+}
diff --git a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
index 8ecbacac3d..ba1cdc21c9 100644
--- a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
@@ -349,5 +349,40 @@ await Wait.For(async () =>
             await closeButton.LeftClick();
             Assert.False(await dialogHost.GetIsOpen());
         });
+
+        recorder.Success();
+    }
+
+    [Fact]
+    [Description("Issue 3094")]
+    public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenRestoringFocus()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocus>()).As<Grid>();
+        IVisualElement<TabItem> tabItem1 = await rootGrid.GetElement<TabItem>("TabItem1");
+        IVisualElement<TabItem> tabItem2 = await rootGrid.GetElement<TabItem>("TabItem2");
+        IVisualElement<Button> navigateHomeButton = await rootGrid.GetElement<Button>("NavigateHomeButton");
+
+        // Select TabItem2
+        await tabItem2.LeftClick();
+
+        // Open menu
+        IVisualElement<MenuItem> menuItem1 = await rootGrid.GetElement<MenuItem>("MenuItem1");
+        await menuItem1.LeftClick();
+        await Task.Delay(1000); // Wait for menu to open
+        IVisualElement<MenuItem> menuItem2 = await rootGrid.GetElement<MenuItem>("MenuItem2");
+        await menuItem2.LeftClick();
+        await Task.Delay(1000); // Wait for dialog content to show
+
+        // Click navigate button
+        await navigateHomeButton.LeftClick();
+        await Task.Delay(1000); // Wait for dialog content to close
+
+        Assert.True(await tabItem1.GetIsSelected());
+        Assert.False(await tabItem2.GetIsSelected());
+
+        recorder.Success();
+
     }
 }

From 648ca20317e2ede22e9a485f67c817591f14ba22 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 27 Feb 2023 20:50:22 +0100
Subject: [PATCH 05/11] Revert sample project commit; now replaced by UI test

---
 Directory.packages.props            |  4 +-
 MDIX-Testing/App.xaml               | 13 -----
 MDIX-Testing/App.xaml.cs            | 42 ----------------
 MDIX-Testing/AssemblyInfo.cs        | 10 ----
 MDIX-Testing/Dialog.xaml            | 22 ---------
 MDIX-Testing/Dialog.xaml.cs         | 11 -----
 MDIX-Testing/InfoView.xaml          | 13 -----
 MDIX-Testing/InfoView.xaml.cs       | 26 ----------
 MDIX-Testing/MDIX-Testing.csproj    | 22 ---------
 MDIX-Testing/MainWindow.xaml        | 74 -----------------------------
 MDIX-Testing/MainWindow.xaml.cs     |  9 ----
 MDIX-Testing/MainWindowViewModel.cs | 36 --------------
 MaterialDesignToolkit.Full.sln      | 19 --------
 13 files changed, 1 insertion(+), 300 deletions(-)
 delete mode 100644 MDIX-Testing/App.xaml
 delete mode 100644 MDIX-Testing/App.xaml.cs
 delete mode 100644 MDIX-Testing/AssemblyInfo.cs
 delete mode 100644 MDIX-Testing/Dialog.xaml
 delete mode 100644 MDIX-Testing/Dialog.xaml.cs
 delete mode 100644 MDIX-Testing/InfoView.xaml
 delete mode 100644 MDIX-Testing/InfoView.xaml.cs
 delete mode 100644 MDIX-Testing/MDIX-Testing.csproj
 delete mode 100644 MDIX-Testing/MainWindow.xaml
 delete mode 100644 MDIX-Testing/MainWindow.xaml.cs
 delete mode 100644 MDIX-Testing/MainWindowViewModel.cs

diff --git a/Directory.packages.props b/Directory.packages.props
index 3056e29f12..3aacd77f87 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -26,7 +26,5 @@
     <PackageVersion Include="xunit" Version="2.4.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MDIX-Testing/App.xaml b/MDIX-Testing/App.xaml
deleted file mode 100644
index 87d596520d..0000000000
--- a/MDIX-Testing/App.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Application x:Class="MDIX_Testing.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/MDIX-Testing/App.xaml.cs b/MDIX-Testing/App.xaml.cs
deleted file mode 100644
index de95bc9617..0000000000
--- a/MDIX-Testing/App.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System.Windows;
-
-namespace MDIX_Testing;
-
-public partial class App : Application
-{
-    public static IHost? AppHost { get; private set; }
-
-	public App()
-	{
-		AppHost = Host.CreateDefaultBuilder()
-			.ConfigureServices((hostContext, services) =>
-			{
-				services.AddSingleton(services => new MainWindow()
-				{
-					DataContext = services.GetRequiredService<MainWindowViewModel>()
-				});
-
-				services.AddSingleton<MainWindowViewModel>();
-			})
-			.Build();
-	}
-
-    protected override async void OnStartup(StartupEventArgs e)
-    {
-		await AppHost!.StartAsync();
-
-		var startupForm = AppHost.Services.GetRequiredService<MainWindow>();
-		startupForm.Show();
-
-        base.OnStartup(e);
-    }
-
-    protected override async void OnExit(ExitEventArgs e)
-    {
-		await AppHost!.StopAsync();
-
-        base.OnExit(e);
-    }
-}
diff --git a/MDIX-Testing/AssemblyInfo.cs b/MDIX-Testing/AssemblyInfo.cs
deleted file mode 100644
index 8b5504ecfb..0000000000
--- a/MDIX-Testing/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Windows;
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
diff --git a/MDIX-Testing/Dialog.xaml b/MDIX-Testing/Dialog.xaml
deleted file mode 100644
index cc23b9e1b7..0000000000
--- a/MDIX-Testing/Dialog.xaml
+++ /dev/null
@@ -1,22 +0,0 @@
-<UserControl x:Class="MDIX_Testing.Dialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:MDIX_Testing"
-             mc:Ignorable="d" d:Background="White"
-             Background="{DynamicResource MaterialDesignPaper}"
-             TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-             Height="100" Width="200">
-    <Grid Margin="10">
-        <StackPanel VerticalAlignment="Center">
-            <StackPanel Orientation="Horizontal" Margin="0,0,0,20">
-                <TextBlock Text="Current Tab Index: " />
-                <TextBlock Text="{Binding SelectedIndex}" />
-            </StackPanel>
-
-            <Button Content="Navigate Home" Command="{Binding NavigateHomeCommand}" />
-        </StackPanel>
-    </Grid>
-</UserControl>
diff --git a/MDIX-Testing/Dialog.xaml.cs b/MDIX-Testing/Dialog.xaml.cs
deleted file mode 100644
index d8d06875c2..0000000000
--- a/MDIX-Testing/Dialog.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Windows.Controls;
-
-namespace MDIX_Testing;
-
-public partial class Dialog : UserControl
-{
-    public Dialog()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/MDIX-Testing/InfoView.xaml b/MDIX-Testing/InfoView.xaml
deleted file mode 100644
index d45ed916e3..0000000000
--- a/MDIX-Testing/InfoView.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<UserControl x:Class="MDIX_Testing.InfoView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:MDIX_Testing"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid Margin="20">
-        <Button Content="DialogHost" HorizontalAlignment="Center"
-                                Command="{Binding OpenDialogCommand}"/>
-    </Grid>
-</UserControl>
diff --git a/MDIX-Testing/InfoView.xaml.cs b/MDIX-Testing/InfoView.xaml.cs
deleted file mode 100644
index 72f4c56763..0000000000
--- a/MDIX-Testing/InfoView.xaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace MDIX_Testing;
-/// <summary>
-/// Interaction logic for InfoView.xaml
-/// </summary>
-public partial class InfoView : UserControl
-{
-    public InfoView()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/MDIX-Testing/MDIX-Testing.csproj b/MDIX-Testing/MDIX-Testing.csproj
deleted file mode 100644
index a7d0ba2c38..0000000000
--- a/MDIX-Testing/MDIX-Testing.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <RootNamespace>MDIX_Testing</RootNamespace>
-    <Nullable>enable</Nullable>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/MDIX-Testing/MainWindow.xaml b/MDIX-Testing/MainWindow.xaml
deleted file mode 100644
index df5a105f12..0000000000
--- a/MDIX-Testing/MainWindow.xaml
+++ /dev/null
@@ -1,74 +0,0 @@
-<Window x:Class="MDIX_Testing.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        xmlns:local="clr-namespace:MDIX_Testing"
-        mc:Ignorable="d"
-        d:DataContext="{d:DesignInstance Type=local:MainWindowViewModel}"
-        Background="{DynamicResource MaterialDesignPaper}"
-        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-        Title="MDIX - DialogHost and TabControl SelectedIndex" FontSize="16"
-        Height="450" Width="800" WindowStartupLocation="CenterScreen">
-  <Border>
-    <materialDesign:DialogHost>
-      <Grid>
-        <Grid.RowDefinitions>
-          <RowDefinition Height="50" />
-          <RowDefinition Height="*" />
-          <RowDefinition Height="auto" />
-        </Grid.RowDefinitions>
-
-        <Grid Grid.Row="0">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="*" />
-          </Grid.ColumnDefinitions>
-
-          <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
-            <TextBlock Text="Current Tab Index: " />
-            <TextBlock Text="{Binding SelectedIndex}" d:Text="2" />
-          </StackPanel>
-
-          <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
-            <materialDesign:PopupBox>
-              <Button Content="Settings" Command="{Binding OpenDialogCommand}" />
-            </materialDesign:PopupBox>
-            <TextBlock Text="PopupBox" VerticalAlignment="Center" />
-          </StackPanel>
-
-          <Menu x:Name="Menu" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center">
-            <MenuItem>
-              <MenuItem.Header>
-                <StackPanel Orientation="Horizontal">
-                  <materialDesign:PackIcon Kind="User" Height="20" Width="20" Margin="0,0,5,0" />
-                  <TextBlock Text="Menu" VerticalAlignment="Center" FontSize="16" />
-                </StackPanel>
-              </MenuItem.Header>
-              <MenuItem Header="Settings" Icon="{materialDesign:PackIcon Kind=Settings}" 
-                                      Command="{Binding OpenDialogCommand}" />
-            </MenuItem>
-          </Menu>
-        </Grid>
-
-        <!--#region Transitioner-->
-        <materialDesign:Transitioner Grid.Row="1" 
-                                             SelectedIndex="{Binding ElementName=NavigationTabControl, Path=SelectedIndex}">
-
-          <TextBlock Text="Home Screen" HorizontalAlignment="Center" VerticalAlignment="Center" />
-          <local:InfoView DataContext="{Binding}" />
-        </materialDesign:Transitioner>
-        <!--#endregion-->
-
-        <!--#region TabControl-->
-        <TabControl Grid.Row="2" x:Name="NavigationTabControl" SelectedIndex="{Binding SelectedIndex}">
-          <TabItem Header="Home" />
-          <TabItem Header="Info" />
-        </TabControl>
-        <!--#endregion-->
-      </Grid>
-    </materialDesign:DialogHost>
-  </Border>
-</Window>
diff --git a/MDIX-Testing/MainWindow.xaml.cs b/MDIX-Testing/MainWindow.xaml.cs
deleted file mode 100644
index 43b5f4a686..0000000000
--- a/MDIX-Testing/MainWindow.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace MDIX_Testing;
-
-public partial class MainWindow : Window
-{
-    public MainWindow()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/MDIX-Testing/MainWindowViewModel.cs b/MDIX-Testing/MainWindowViewModel.cs
deleted file mode 100644
index 54b42ef296..0000000000
--- a/MDIX-Testing/MainWindowViewModel.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using MaterialDesignThemes.Wpf;
-using System.Threading.Tasks;
-
-namespace MDIX_Testing;
-
-public partial class MainWindowViewModel : ObservableObject
-{
-    [ObservableProperty]
-    private int _selectedIndex;
-
-    [RelayCommand]
-    private async Task OpenDialogAsync()
-    {
-        var view = new Dialog()
-        {
-            DataContext = this
-        };
-
-        await DialogHost.Show(view);
-    }
-
-    [RelayCommand]
-    private async Task NavigateHomeAsync()
-    {
-        DialogHost.CloseDialogCommand.Execute(null, null);
-
-        /// If the dialog has been opened through the menu (System.Windows.Controls),
-        /// adding a delay  of at least 200-300 makes the tabitem switch via code possible
-        //await Task.Delay(500);
-
-        SelectedIndex = 0;
-        await Task.CompletedTask;
-    }
-}
diff --git a/MaterialDesignToolkit.Full.sln b/MaterialDesignToolkit.Full.sln
index df32883c72..17330fedba 100644
--- a/MaterialDesignToolkit.Full.sln
+++ b/MaterialDesignToolkit.Full.sln
@@ -63,8 +63,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{18401177
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesign3Demo", "MaterialDesign3.Demo.Wpf\MaterialDesign3Demo.csproj", "{98627CBE-F009-482E-97E9-C69C7135E91F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MDIX-Testing", "MDIX-Testing\MDIX-Testing.csproj", "{00EE118A-86D5-434B-AE42-7DEEE720CF8C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -237,22 +235,6 @@ Global
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x64.Build.0 = Release|Any CPU
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.ActiveCfg = Release|Any CPU
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.Build.0 = Release|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|x64.Build.0 = Debug|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Debug|x86.Build.0 = Debug|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|ARM.Build.0 = Release|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|x64.ActiveCfg = Release|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|x64.Build.0 = Release|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|x86.ActiveCfg = Release|Any CPU
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -263,7 +245,6 @@ Global
 		{59CE50AC-D176-4CC0-B465-26F66054A15E} = {9E303A4A-3712-44B9-91EE-830FDC087795}
 		{18401177-A30E-4330-8F6B-101DF876CE99} = {55087897-5F09-45CA-8E12-12B36B45F262}
 		{98627CBE-F009-482E-97E9-C69C7135E91F} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
-		{00EE118A-86D5-434B-AE42-7DEEE720CF8C} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {730B2F9E-74AE-46CE-9E61-89AA5C6D5DD3}

From b39b73a56b44917a27b7eb7e5adf0988b2e5f7c9 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 27 Feb 2023 21:19:47 +0100
Subject: [PATCH 06/11] Add RestoreFocusElement DP to make test run green

---
 .../WPF/DialogHosts/DialogHostTests.cs           |  1 -
 MaterialDesignThemes.Wpf/DialogHost.cs           | 16 ++++++++++++++++
 .../Themes/MaterialDesignTheme.TabControl.xaml   |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
index ba1cdc21c9..7a6c7b93dc 100644
--- a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
@@ -383,6 +383,5 @@ public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenR
         Assert.False(await tabItem2.GetIsSelected());
 
         recorder.Success();
-
     }
 }
diff --git a/MaterialDesignThemes.Wpf/DialogHost.cs b/MaterialDesignThemes.Wpf/DialogHost.cs
index d333f12826..2ff9542636 100644
--- a/MaterialDesignThemes.Wpf/DialogHost.cs
+++ b/MaterialDesignThemes.Wpf/DialogHost.cs
@@ -369,6 +369,13 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
             var window = Window.GetWindow(dialogHost);
             dialogHost._restoreFocusDialogClose = window != null ? FocusManager.GetFocusedElement(window) : null;
 
+            // Check restore focus overrides and optional disabling
+            if (dialogHost._restoreFocusDialogClose is DependencyObject dependencyObj &&
+                GetRestoreFocusElement(dependencyObj) is { } focusOverride)
+            {
+                dialogHost._restoreFocusDialogClose = focusOverride;
+            }
+
             //multiple ways of calling back that the dialog has opened:
             // * routed event
             // * the attached property (which should be applied to the button which opened the dialog
@@ -602,6 +609,15 @@ public override void OnApplyTemplate()
             base.OnApplyTemplate();
         }
 
+        public static readonly DependencyProperty RestoreFocusElementProperty = DependencyProperty.RegisterAttached(
+            "RestoreFocusElement", typeof(IInputElement), typeof(DialogHost), new PropertyMetadata(default(IInputElement)));
+
+        public static void SetRestoreFocusElement(DependencyObject element, IInputElement value)
+            => element.SetValue(RestoreFocusElementProperty, value);
+
+        public static IInputElement GetRestoreFocusElement(DependencyObject element)
+            => (IInputElement) element.GetValue(RestoreFocusElementProperty);
+
         #region open dialog events/callbacks
 
         public static readonly RoutedEvent DialogOpenedEvent =
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
index 0d59e7b440..abaa700f0c 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
@@ -249,6 +249,7 @@
     <Setter Property="Height" Value="48" />
     <Setter Property="MinWidth" Value="90" />
     <Setter Property="Padding" Value="16,12" />
+    <Setter Property="wpf:DialogHost.RestoreFocusElement" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=TabControl}}" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type TabItem}">

From 3d5e3eb57b68b2a0f62709d097fe165e4ff5d5e0 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 27 Feb 2023 21:27:00 +0100
Subject: [PATCH 07/11] Add failing UI test for "disable" scenario

---
 .../DialogHost/RestoreFocusNoOverride.xaml    | 54 +++++++++++++++++++
 .../DialogHost/RestoreFocusNoOverride.xaml.cs | 15 ++++++
 .../WPF/DialogHosts/DialogHostTests.cs        | 32 +++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
 create mode 100644 MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml.cs

diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
new file mode 100644
index 0000000000..1e31b16950
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
@@ -0,0 +1,54 @@
+<UserControl x:Class="MaterialDesignThemes.UITests.Samples.DialogHost.RestoreFocusNoOverride"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.DialogHost"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance Type=local:RestoreFocus}"
+             d:DesignHeight="450" d:DesignWidth="800">
+  <UserControl.Resources>
+    <Style TargetType="TabItem" BasedOn="{StaticResource {x:Type TabItem}}">
+      <Setter Property="materialDesign:DialogHost.RestoreFocusElement" Value="{x:Null}" />
+    </Style>
+  </UserControl.Resources>
+
+  <Grid>
+    <materialDesign:DialogHost x:Name="DialogHost">
+      <Grid>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Menu x:Name="Menu" Grid.Row="0" HorizontalAlignment="Right">
+          <MenuItem x:Name="MenuItem1">
+            <MenuItem.Header>
+              <StackPanel Orientation="Horizontal">
+                <materialDesign:PackIcon Kind="User" Height="20" Width="20" Margin="0,0,5,0" />
+                <TextBlock Text="Menu" VerticalAlignment="Center" FontSize="16" />
+              </StackPanel>
+            </MenuItem.Header>
+            <MenuItem x:Name="MenuItem2" Header="Settings" Icon="{materialDesign:PackIcon Kind=Settings}" Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}" />
+          </MenuItem>
+        </Menu>
+
+        <TabControl x:Name="TabControl" Grid.Row="1">
+          <TabItem x:Name="TabItem1" Header="Tab 1">
+            <TextBlock Text="Page 1" />
+          </TabItem>
+          <TabItem x:Name="TabItem2" Header="Tab 2">
+            <TextBlock Text="Page 2" />
+          </TabItem>
+        </TabControl>
+      </Grid>
+
+      <materialDesign:DialogHost.DialogContent>
+        <Grid Margin="50">
+          <Button x:Name="NavigateHomeButton" Content="Navigate to Tab 1" Click="NavigateHomeButton_OnClick" />
+        </Grid>
+      </materialDesign:DialogHost.DialogContent>
+    </materialDesign:DialogHost>
+  </Grid>
+</UserControl>
diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml.cs b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml.cs
new file mode 100644
index 0000000000..24af278db8
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml.cs
@@ -0,0 +1,15 @@
+namespace MaterialDesignThemes.UITests.Samples.DialogHost;
+
+public partial class RestoreFocusNoOverride : UserControl
+{
+    public RestoreFocusNoOverride()
+    {
+        InitializeComponent();
+    }
+
+    private void NavigateHomeButton_OnClick(object sender, RoutedEventArgs e)
+    {
+        Wpf.DialogHost.CloseDialogCommand.Execute(null, null);
+        TabControl.SelectedItem = TabItem1;
+    }
+}
diff --git a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
index 7a6c7b93dc..e9dac496d7 100644
--- a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
@@ -384,4 +384,36 @@ public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenR
 
         recorder.Success();
     }
+
+    [Fact]
+    [Description("Issue 3094")]
+    public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenRestoreFocusIsDisabled()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocusNoOverride>()).As<Grid>();
+        IVisualElement<TabItem> tabItem1 = await rootGrid.GetElement<TabItem>("TabItem1");
+        IVisualElement<TabItem> tabItem2 = await rootGrid.GetElement<TabItem>("TabItem2");
+        IVisualElement<Button> navigateHomeButton = await rootGrid.GetElement<Button>("NavigateHomeButton");
+
+        // Select TabItem2
+        await tabItem2.LeftClick();
+
+        // Open menu
+        IVisualElement<MenuItem> menuItem1 = await rootGrid.GetElement<MenuItem>("MenuItem1");
+        await menuItem1.LeftClick();
+        await Task.Delay(1000); // Wait for menu to open
+        IVisualElement<MenuItem> menuItem2 = await rootGrid.GetElement<MenuItem>("MenuItem2");
+        await menuItem2.LeftClick();
+        await Task.Delay(1000); // Wait for dialog content to show
+
+        // Click navigate button
+        await navigateHomeButton.LeftClick();
+        await Task.Delay(1000); // Wait for dialog content to close
+
+        Assert.True(await tabItem1.GetIsSelected());
+        Assert.False(await tabItem2.GetIsSelected());
+
+        recorder.Success();
+    }
 }

From 64764d87fb263274dbf118645ef5017f11e1f31d Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 27 Feb 2023 21:32:25 +0100
Subject: [PATCH 08/11] Add DialogHost.IsFocusRestoreDisabled DP to opt.
 disable focus restore

---
 .../DialogHost/RestoreFocusNoOverride.xaml    |  2 +-
 MaterialDesignThemes.Wpf/DialogHost.cs        | 28 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
index 1e31b16950..60d0f2e6fe 100644
--- a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
@@ -15,7 +15,7 @@
   </UserControl.Resources>
 
   <Grid>
-    <materialDesign:DialogHost x:Name="DialogHost">
+    <materialDesign:DialogHost x:Name="DialogHost" IsFocusRestoreDisabled="True">
       <Grid>
         <Grid.RowDefinitions>
           <RowDefinition Height="Auto" />
diff --git a/MaterialDesignThemes.Wpf/DialogHost.cs b/MaterialDesignThemes.Wpf/DialogHost.cs
index 2ff9542636..5e6881d732 100644
--- a/MaterialDesignThemes.Wpf/DialogHost.cs
+++ b/MaterialDesignThemes.Wpf/DialogHost.cs
@@ -367,13 +367,16 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
 
             dialogHost.CurrentSession = new DialogSession(dialogHost);
             var window = Window.GetWindow(dialogHost);
-            dialogHost._restoreFocusDialogClose = window != null ? FocusManager.GetFocusedElement(window) : null;
-
-            // Check restore focus overrides and optional disabling
-            if (dialogHost._restoreFocusDialogClose is DependencyObject dependencyObj &&
-                GetRestoreFocusElement(dependencyObj) is { } focusOverride)
+            if (!dialogHost.IsFocusRestoreDisabled)
             {
-                dialogHost._restoreFocusDialogClose = focusOverride;
+                dialogHost._restoreFocusDialogClose = window != null ? FocusManager.GetFocusedElement(window) : null;
+
+                // Check restore focus overrides
+                if (dialogHost._restoreFocusDialogClose is DependencyObject dependencyObj &&
+                    GetRestoreFocusElement(dependencyObj) is { } focusOverride)
+                {
+                    dialogHost._restoreFocusDialogClose = focusOverride;
+                }
             }
 
             //multiple ways of calling back that the dialog has opened:
@@ -609,6 +612,8 @@ public override void OnApplyTemplate()
             base.OnApplyTemplate();
         }
 
+        #region focus restore properties
+
         public static readonly DependencyProperty RestoreFocusElementProperty = DependencyProperty.RegisterAttached(
             "RestoreFocusElement", typeof(IInputElement), typeof(DialogHost), new PropertyMetadata(default(IInputElement)));
 
@@ -618,6 +623,17 @@ public static void SetRestoreFocusElement(DependencyObject element, IInputElemen
         public static IInputElement GetRestoreFocusElement(DependencyObject element)
             => (IInputElement) element.GetValue(RestoreFocusElementProperty);
 
+        public static readonly DependencyProperty IsFocusRestoreDisabledProperty = DependencyProperty.Register(
+            nameof(IsFocusRestoreDisabled), typeof(bool), typeof(DialogHost), new PropertyMetadata(false));
+
+        public bool IsFocusRestoreDisabled
+        {
+            get => (bool) GetValue(IsFocusRestoreDisabledProperty);
+            set => SetValue(IsFocusRestoreDisabledProperty, value);
+        }
+
+        #endregion
+
         #region open dialog events/callbacks
 
         public static readonly RoutedEvent DialogOpenedEvent =

From adf82e2756c6730e5536553f7c020358c19423c3 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Tue, 28 Feb 2023 08:14:44 +0100
Subject: [PATCH 09/11] Rename DP to DialogHost.IsRestoreFocusDisabled

---
 .../Samples/DialogHost/RestoreFocusNoOverride.xaml |  2 +-
 MaterialDesignThemes.Wpf/DialogHost.cs             | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
index 60d0f2e6fe..57ad76c334 100644
--- a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
@@ -15,7 +15,7 @@
   </UserControl.Resources>
 
   <Grid>
-    <materialDesign:DialogHost x:Name="DialogHost" IsFocusRestoreDisabled="True">
+    <materialDesign:DialogHost x:Name="DialogHost" IsRestoreFocusDisabled="True">
       <Grid>
         <Grid.RowDefinitions>
           <RowDefinition Height="Auto" />
diff --git a/MaterialDesignThemes.Wpf/DialogHost.cs b/MaterialDesignThemes.Wpf/DialogHost.cs
index 5e6881d732..19f5a7fe67 100644
--- a/MaterialDesignThemes.Wpf/DialogHost.cs
+++ b/MaterialDesignThemes.Wpf/DialogHost.cs
@@ -367,11 +367,11 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
 
             dialogHost.CurrentSession = new DialogSession(dialogHost);
             var window = Window.GetWindow(dialogHost);
-            if (!dialogHost.IsFocusRestoreDisabled)
+            if (!dialogHost.IsRestoreFocusDisabled)
             {
                 dialogHost._restoreFocusDialogClose = window != null ? FocusManager.GetFocusedElement(window) : null;
 
-                // Check restore focus overrides
+                // Check restore focus override
                 if (dialogHost._restoreFocusDialogClose is DependencyObject dependencyObj &&
                     GetRestoreFocusElement(dependencyObj) is { } focusOverride)
                 {
@@ -623,13 +623,13 @@ public static void SetRestoreFocusElement(DependencyObject element, IInputElemen
         public static IInputElement GetRestoreFocusElement(DependencyObject element)
             => (IInputElement) element.GetValue(RestoreFocusElementProperty);
 
-        public static readonly DependencyProperty IsFocusRestoreDisabledProperty = DependencyProperty.Register(
-            nameof(IsFocusRestoreDisabled), typeof(bool), typeof(DialogHost), new PropertyMetadata(false));
+        public static readonly DependencyProperty IsRestoreFocusDisabledProperty = DependencyProperty.Register(
+            nameof(IsRestoreFocusDisabled), typeof(bool), typeof(DialogHost), new PropertyMetadata(false));
 
-        public bool IsFocusRestoreDisabled
+        public bool IsRestoreFocusDisabled
         {
-            get => (bool) GetValue(IsFocusRestoreDisabledProperty);
-            set => SetValue(IsFocusRestoreDisabledProperty, value);
+            get => (bool) GetValue(IsRestoreFocusDisabledProperty);
+            set => SetValue(IsRestoreFocusDisabledProperty, value);
         }
 
         #endregion

From bb51d4061bc936e294702356bbcd89224ce858aa Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Tue, 28 Feb 2023 08:36:35 +0100
Subject: [PATCH 10/11] Add UI tests for navigation rail

---
 .../Samples/DialogHost/RestoreFocus.xaml      | 10 +++
 .../Samples/DialogHost/RestoreFocus.xaml.cs   |  1 +
 ...verride.xaml => RestoreFocusDisabled.xaml} | 16 ++++-
 ...e.xaml.cs => RestoreFocusDisabled.xaml.cs} |  5 +-
 .../WPF/DialogHosts/DialogHostTests.cs        | 66 ++++++++++++++++++-
 .../MaterialDesignTheme.TabControl.xaml       |  1 +
 6 files changed, 95 insertions(+), 4 deletions(-)
 rename MaterialDesignThemes.UITests/Samples/DialogHost/{RestoreFocusNoOverride.xaml => RestoreFocusDisabled.xaml} (71%)
 rename MaterialDesignThemes.UITests/Samples/DialogHost/{RestoreFocusNoOverride.xaml.cs => RestoreFocusDisabled.xaml.cs} (68%)

diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml
index 51792fb19c..670074daec 100644
--- a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml
@@ -14,6 +14,7 @@
         <Grid.RowDefinitions>
           <RowDefinition Height="Auto" />
           <RowDefinition Height="*" />
+          <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <Menu x:Name="Menu" Grid.Row="0" HorizontalAlignment="Right">
@@ -36,6 +37,15 @@
             <TextBlock Text="Page 2" />
           </TabItem>
         </TabControl>
+
+        <TabControl x:Name="NavigationRail" Grid.Row="2" Style="{StaticResource MaterialDesignNavigationRailTabControl}">
+          <TabItem x:Name="RailItem1" Header="Rail 1">
+            <TextBlock Text="Rail 1 content" />
+          </TabItem>
+          <TabItem x:Name="RailItem2" Header="Rail 2">
+            <TextBlock Text="Rail 2 content" />
+          </TabItem>
+        </TabControl>
       </Grid>
 
       <materialDesign:DialogHost.DialogContent>
diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml.cs b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml.cs
index ef60f08892..36a2c6c9f3 100644
--- a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml.cs
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocus.xaml.cs
@@ -10,6 +10,7 @@ public RestoreFocus()
     private void NavigateHomeButton_OnClick(object sender, RoutedEventArgs e)
     {
         Wpf.DialogHost.CloseDialogCommand.Execute(null, null);
+        NavigationRail.SelectedItem = RailItem1;
         TabControl.SelectedItem = TabItem1;
     }
 }
diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusDisabled.xaml
similarity index 71%
rename from MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
rename to MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusDisabled.xaml
index 57ad76c334..2d4d1f37e2 100644
--- a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusDisabled.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="MaterialDesignThemes.UITests.Samples.DialogHost.RestoreFocusNoOverride"
+<UserControl x:Class="MaterialDesignThemes.UITests.Samples.DialogHost.RestoreFocusDisabled"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -9,9 +9,13 @@
              d:DataContext="{d:DesignInstance Type=local:RestoreFocus}"
              d:DesignHeight="450" d:DesignWidth="800">
   <UserControl.Resources>
+    <!-- NOTE: Disable the DialogHost.RestoreFocusElement setters in the TabItem styles to avoid false positives -->
     <Style TargetType="TabItem" BasedOn="{StaticResource {x:Type TabItem}}">
       <Setter Property="materialDesign:DialogHost.RestoreFocusElement" Value="{x:Null}" />
     </Style>
+    <Style x:Key="MaterialDesignNavigationRailTabItemWithRestoreFocusOverrideDisabled" TargetType="TabItem" BasedOn="{StaticResource MaterialDesignNavigationRailTabItem}">
+      <Setter Property="materialDesign:DialogHost.RestoreFocusElement" Value="{x:Null}" />
+    </Style>
   </UserControl.Resources>
 
   <Grid>
@@ -20,6 +24,7 @@
         <Grid.RowDefinitions>
           <RowDefinition Height="Auto" />
           <RowDefinition Height="*" />
+          <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <Menu x:Name="Menu" Grid.Row="0" HorizontalAlignment="Right">
@@ -42,6 +47,15 @@
             <TextBlock Text="Page 2" />
           </TabItem>
         </TabControl>
+
+        <TabControl x:Name="NavigationRail" Grid.Row="2" Style="{StaticResource MaterialDesignNavigationRailTabControl}" ItemContainerStyle="{StaticResource MaterialDesignNavigationRailTabItemWithRestoreFocusOverrideDisabled}">
+          <TabItem x:Name="RailItem1" Header="Rail 1">
+            <TextBlock Text="Rail 1 content" />
+          </TabItem>
+          <TabItem x:Name="RailItem2" Header="Rail 2">
+            <TextBlock Text="Rail 2 content" />
+          </TabItem>
+        </TabControl>
       </Grid>
 
       <materialDesign:DialogHost.DialogContent>
diff --git a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml.cs b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusDisabled.xaml.cs
similarity index 68%
rename from MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml.cs
rename to MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusDisabled.xaml.cs
index 24af278db8..5ac3bf7dc6 100644
--- a/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusNoOverride.xaml.cs
+++ b/MaterialDesignThemes.UITests/Samples/DialogHost/RestoreFocusDisabled.xaml.cs
@@ -1,8 +1,8 @@
 namespace MaterialDesignThemes.UITests.Samples.DialogHost;
 
-public partial class RestoreFocusNoOverride : UserControl
+public partial class RestoreFocusDisabled : UserControl
 {
-    public RestoreFocusNoOverride()
+    public RestoreFocusDisabled()
     {
         InitializeComponent();
     }
@@ -10,6 +10,7 @@ public RestoreFocusNoOverride()
     private void NavigateHomeButton_OnClick(object sender, RoutedEventArgs e)
     {
         Wpf.DialogHost.CloseDialogCommand.Execute(null, null);
+        NavigationRail.SelectedItem = RailItem1;
         TabControl.SelectedItem = TabItem1;
     }
 }
diff --git a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
index e9dac496d7..e5f4ab8b48 100644
--- a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
@@ -385,13 +385,45 @@ public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenR
         recorder.Success();
     }
 
+    [Fact]
+    [Description("Issue 3094")]
+    public async Task DialogHost_ChangesSelectedRailItem_DoesNotPerformRailChangeWhenRestoringFocus()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocus>()).As<Grid>();
+        IVisualElement<TabItem> railItem1 = await rootGrid.GetElement<TabItem>("RailItem1");
+        IVisualElement<TabItem> railItem2 = await rootGrid.GetElement<TabItem>("RailItem2");
+        IVisualElement<Button> navigateHomeButton = await rootGrid.GetElement<Button>("NavigateHomeButton");
+
+        // Select TabItem2
+        await railItem2.LeftClick();
+
+        // Open menu
+        IVisualElement<MenuItem> menuItem1 = await rootGrid.GetElement<MenuItem>("MenuItem1");
+        await menuItem1.LeftClick();
+        await Task.Delay(1000); // Wait for menu to open
+        IVisualElement<MenuItem> menuItem2 = await rootGrid.GetElement<MenuItem>("MenuItem2");
+        await menuItem2.LeftClick();
+        await Task.Delay(1000); // Wait for dialog content to show
+
+        // Click navigate button
+        await navigateHomeButton.LeftClick();
+        await Task.Delay(1000); // Wait for dialog content to close
+
+        Assert.True(await railItem1.GetIsSelected());
+        Assert.False(await railItem2.GetIsSelected());
+
+        recorder.Success();
+    }
+
     [Fact]
     [Description("Issue 3094")]
     public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenRestoreFocusIsDisabled()
     {
         await using var recorder = new TestRecorder(App);
 
-        IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocusNoOverride>()).As<Grid>();
+        IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocusDisabled>()).As<Grid>();
         IVisualElement<TabItem> tabItem1 = await rootGrid.GetElement<TabItem>("TabItem1");
         IVisualElement<TabItem> tabItem2 = await rootGrid.GetElement<TabItem>("TabItem2");
         IVisualElement<Button> navigateHomeButton = await rootGrid.GetElement<Button>("NavigateHomeButton");
@@ -416,4 +448,36 @@ public async Task DialogHost_ChangesSelectedTabItem_DoesNotPerformTabChangeWhenR
 
         recorder.Success();
     }
+
+    [Fact]
+    [Description("Issue 3094")]
+    public async Task DialogHost_ChangesSelectedRailItem_DoesNotPerformRailChangeWhenRestoreFocusIsDisabled()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        IVisualElement<Grid> rootGrid = (await LoadUserControl<RestoreFocusDisabled>()).As<Grid>();
+        IVisualElement<TabItem> railItem1 = await rootGrid.GetElement<TabItem>("RailItem1");
+        IVisualElement<TabItem> railItem2 = await rootGrid.GetElement<TabItem>("RailItem2");
+        IVisualElement<Button> navigateHomeButton = await rootGrid.GetElement<Button>("NavigateHomeButton");
+
+        // Select TabItem2
+        await railItem2.LeftClick();
+
+        // Open menu
+        IVisualElement<MenuItem> menuItem1 = await rootGrid.GetElement<MenuItem>("MenuItem1");
+        await menuItem1.LeftClick();
+        await Task.Delay(1000); // Wait for menu to open
+        IVisualElement<MenuItem> menuItem2 = await rootGrid.GetElement<MenuItem>("MenuItem2");
+        await menuItem2.LeftClick();
+        await Task.Delay(1000); // Wait for dialog content to show
+
+        // Click navigate button
+        await navigateHomeButton.LeftClick();
+        await Task.Delay(1000); // Wait for dialog content to close
+
+        Assert.True(await railItem1.GetIsSelected());
+        Assert.False(await railItem2.GetIsSelected());
+
+        recorder.Success();
+    }
 }
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
index abaa700f0c..1e4a9bfa39 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
@@ -484,6 +484,7 @@
     <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
     <Setter Property="Height" Value="72" />
     <Setter Property="Padding" Value="0" />
+    <Setter Property="wpf:DialogHost.RestoreFocusElement" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=TabControl}}" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type TabItem}">

From deeb97a8380c6ffaa74ae583267332633df6cbc2 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Tue, 28 Feb 2023 08:42:19 +0100
Subject: [PATCH 11/11] Region rephrase

---
 MaterialDesignThemes.Wpf/DialogHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.Wpf/DialogHost.cs b/MaterialDesignThemes.Wpf/DialogHost.cs
index 19f5a7fe67..ab6fd9e6a4 100644
--- a/MaterialDesignThemes.Wpf/DialogHost.cs
+++ b/MaterialDesignThemes.Wpf/DialogHost.cs
@@ -612,7 +612,7 @@ public override void OnApplyTemplate()
             base.OnApplyTemplate();
         }
 
-        #region focus restore properties
+        #region restore focus properties
 
         public static readonly DependencyProperty RestoreFocusElementProperty = DependencyProperty.RegisterAttached(
             "RestoreFocusElement", typeof(IInputElement), typeof(DialogHost), new PropertyMetadata(default(IInputElement)));