Fix: Always set content dialog root (#13859)

Author: yaira2

src/Files.App/Actions/Content/Archives/Compress/CompressIntoArchiveAction.cs

@@ -3,6 +3,7 @@
 
 using Files.App.Dialogs;
 using Microsoft.UI.Xaml.Controls;
+using Windows.Foundation.Metadata;
 
 namespace Files.App.Actions
 {
@@ -30,6 +31,9 @@ public override async Task ExecuteAsync()
 				FileName = fileName,
 			};
 
+			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+				dialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 			var result = await dialog.TryShowAsync();
 
 			if (!dialog.CanCreate || result != ContentDialogResult.Primary)

src/Files.App/Services/UpdateService.cs

@@ -6,6 +6,7 @@
 using Microsoft.UI.Xaml.Controls;
 using System.IO;
 using System.Net.Http;
+using Windows.Foundation.Metadata;
 using Windows.Services.Store;
 using Windows.Storage;
 using WinRT.Interop;
@@ -146,6 +147,9 @@ private static async Task<bool> ShowDialogAsync()
 				PrimaryButtonText = "ConsentDialogPrimaryButtonText".GetLocalizedResource()
 			};
 
+			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+				dialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 			ContentDialogResult result = await dialog.TryShowAsync();
 
 			return result == ContentDialogResult.Primary;

src/Files.App/Utils/Archives/DecompressHelper.cs

@@ -8,6 +8,7 @@
 using SevenZip;
 using System.IO;
 using System.Text;
+using Windows.Foundation.Metadata;
 using Windows.Storage;
 
 namespace Files.App.Utils.Archives
@@ -145,6 +146,9 @@ public static async Task DecompressArchiveAsync(IShellPage associatedInstance)
 			};
 			decompressArchiveDialog.ViewModel = decompressArchiveViewModel;
 
+			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+				decompressArchiveDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 			ContentDialogResult option = await decompressArchiveDialog.TryShowAsync();
 			if (option != ContentDialogResult.Primary)
 				return;
@@ -196,6 +200,9 @@ public static async Task DecompressArchiveHereAsync(IShellPage associatedInstanc
 
 					decompressArchiveDialog.ViewModel = decompressArchiveViewModel;
 
+					if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+						decompressArchiveDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 					ContentDialogResult option = await decompressArchiveDialog.TryShowAsync();
 					if (option != ContentDialogResult.Primary)
 						return;
@@ -233,6 +240,9 @@ public static async Task DecompressArchiveToChildFolderAsync(IShellPage associat
 					};
 					decompressArchiveDialog.ViewModel = decompressArchiveViewModel;
 
+					if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+						decompressArchiveDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 					ContentDialogResult option = await decompressArchiveDialog.TryShowAsync();
 					if (option != ContentDialogResult.Primary)
 						return;

src/Files.App/Utils/RecycleBin/RecycleBinHelpers.cs

@@ -4,6 +4,7 @@
 using Microsoft.UI.Xaml.Controls;
 using System.Text.RegularExpressions;
 using Vanara.PInvoke;
+using Windows.Foundation.Metadata;
 using Windows.Storage;
 
 namespace Files.App.Utils.RecycleBin
@@ -25,7 +26,7 @@ public static ulong GetSize()
 		{
 			return (ulong)Win32Shell.QueryRecycleBin().BinSize;
 		}
-		
+
 		public static async Task<bool> IsRecycleBinItem(IStorageItem item)
 		{
 			List<ShellFileItem> recycleBinItems = await EnumerateRecycleBin();
@@ -55,6 +56,9 @@ public static async Task EmptyRecycleBinAsync()
 				DefaultButton = ContentDialogButton.Primary
 			};
 
+			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+				ConfirmEmptyBinDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 			// If the operation is approved by the user
 			if (userSettingsService.FoldersSettingsService.DeleteConfirmationPolicy is DeleteConfirmationPolicies.Never ||
 				await ConfirmEmptyBinDialog.TryShowAsync() == ContentDialogResult.Primary)
@@ -103,6 +107,9 @@ public static async Task RestoreSelectionRecycleBinAsync(IShellPage associatedIn
 				DefaultButton = ContentDialogButton.Primary
 			};
 
+			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+				ConfirmEmptyBinDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 			ContentDialogResult result = await ConfirmEmptyBinDialog.TryShowAsync();
 
 			if (result == ContentDialogResult.Primary)

src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs

@@ -5,6 +5,7 @@
 using Microsoft.UI.Xaml.Controls;
 using System.IO;
 using System.Text;
+using Windows.Foundation.Metadata;
 using Windows.Storage;
 
 namespace Files.App.Utils.Storage
@@ -146,6 +147,9 @@ await DialogDisplayHelper.ShowDialogAsync(
 						CloseButtonText = "Cancel".GetLocalizedResource()
 					};
 
+					if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+						dialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 					ContentDialogResult result = await dialog.TryShowAsync();
 
 					if (result == ContentDialogResult.Primary)
@@ -345,6 +349,9 @@ await DialogDisplayHelper.ShowDialogAsync(
 						CloseButtonText = "Cancel".GetLocalizedResource()
 					};
 
+					if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+						dialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 					ContentDialogResult result = await dialog.TryShowAsync();
 
 					if (result == ContentDialogResult.Primary)

src/Files.App/Views/MainPage.xaml.cs

@@ -14,6 +14,7 @@
 using Microsoft.UI.Xaml.Navigation;
 using System.Runtime.CompilerServices;
 using Windows.ApplicationModel;
+using Windows.Foundation.Metadata;
 using Windows.Services.Store;
 using WinRT.Interop;
 using VirtualKey = Windows.System.VirtualKey;
@@ -78,6 +79,9 @@ private async Task PromptForReviewAsync()
 				SecondaryButtonText = "No".ToLocalized()
 			};
 
+			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+				promptForReviewDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 			var result = await promptForReviewDialog.TryShowAsync();
 
 			if (result == ContentDialogResult.Primary)