fix: Add ContentDialog support for WinUI 3 and XamlRoot

xumouzheng · Apr 23, 2021 · b0a07ab · b0a07ab
1 parent 1977544
commit b0a07ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/e2e/Uno/HelloUnoWorld.Shared/App.xaml.cs b/e2e/Uno/HelloUnoWorld.Shared/App.xaml.cs
@@ -38,6 +38,10 @@ namespace HelloUnoWorld
     /// </summary>
     sealed partial class App : PrismApplication
     {
+        private static Window _window;
+
+        public static XamlRoot MainXamlRoot { get; private set; }
+
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
         /// executed, and as such is the logical equivalent of main() or WinMain().
@@ -136,11 +140,13 @@ protected override UIElement CreateShell()
             var shell = Container.Resolve<Shell>();
 
 #if NET5_0 && WINDOWS
-            var window = new Window();
-            window.Activate();
-            window.Content = shell;
+            _window = new Window();
+            _window.Activate();
+            _window.Content = shell;
 #endif
 
+            MainXamlRoot = shell.XamlRoot;
+
             return shell;
         }
 

diff --git a/e2e/Uno/HelloUnoWorld.Shared/Dialogs/CustomContentDialog.xaml.cs b/e2e/Uno/HelloUnoWorld.Shared/Dialogs/CustomContentDialog.xaml.cs
@@ -20,6 +20,10 @@ public partial class CustomContentDialog : ContentDialog, IDialogWindow
         public CustomContentDialog()
         {
             InitializeComponent();
+
+            // This is needed to enable dialog to be created properly.
+            // See: https://github.com/microsoft/microsoft-ui-xaml/issues/4251
+            XamlRoot = App.MainXamlRoot;
         }
 
         public IDialogResult Result { get ; set; }