Merge pull request #3304 from PrismLibrary/wpf-dialog-fix

added window name to ShowDialog extension

Author: brianlagunas

e2e/Wpf/HelloWorld.Core/DialogServiceExtensions.cs

@@ -1,4 +1,4 @@
-using Prism.Dialogs;
+using Prism.Dialogs;
 using System;
 
 namespace HelloWorld.Core
@@ -7,17 +7,22 @@ public static class DialogServiceExtensions
     {
         public static void ShowNotification(this IDialogService dialogService, string message, Action<IDialogResult> callBack)
         {
-            dialogService.ShowDialog("NotificationDialog", new DialogParameters($"message={message}"), callBack);
+            dialogService.Show("NotificationDialog", new DialogParameters($"message={message}"), callBack);
+        }
+
+        public static void ShowNotificationInAnotherWindow(this IDialogService dialogService, string message, Action<IDialogResult> callBack)
+        {
+            dialogService.Show("NotificationDialog", new DialogParameters($"message={message}"), callBack, "AnotherDialogWindow");
         }
 
         public static void ShowConfirmation(this IDialogService dialogService, string message, Action<IDialogResult> callBack)
         {
             dialogService.ShowDialog("ConfirmationDialog", new DialogParameters($"message={message}"), callBack);
         }
 
-        public static void ShowNotificationInAnotherWindow(this IDialogService dialogService, string message, Action<IDialogResult> callBack)
+        public static void ShowConfirmationInAnotherWindow(this IDialogService dialogService, string message, Action<IDialogResult> callBack)
         {
-            dialogService.ShowDialog("NotificationDialog", new DialogParameters($"message={message}"), callBack, "AnotherDialogWindow");
+            dialogService.ShowDialog("ConfirmationDialog", new DialogParameters($"message={message}"), callBack, "AnotherDialogWindow");
         }
     }
 }

src/Wpf/Prism.Wpf/Dialogs/IDialogServiceCompatExtensions.cs

@@ -11,12 +11,20 @@ public static class IDialogServiceCompatExtensions
         /// </summary>
         /// <param name="dialogService">The DialogService</param>
         /// <param name="name">The name of the dialog to show.</param>
-        /// <param name="parameters">The parameters to pass to the dialog.</param>
+        public static void Show(this IDialogService dialogService, string name)
+        {
+            Show(dialogService, name, null, null, null);
+        }
+
+        /// <summary>
+        /// Shows a non-modal dialog.
+        /// </summary>
+        /// <param name="dialogService">The DialogService</param>
+        /// <param name="name">The name of the dialog to show.</param>
         /// <param name="callback">The action to perform when the dialog is closed.</param>
-        public static void Show(this IDialogService dialogService, string name, IDialogParameters parameters, Action<IDialogResult> callback)
+        public static void Show(this IDialogService dialogService, string name, Action<IDialogResult> callback)
         {
-            parameters = EnsureShowNonModalParameter(parameters);
-            dialogService.ShowDialog(name, parameters, new DialogCallback().OnClose(callback));
+            Show(dialogService, name, null, callback, null);
         }
 
         /// <summary>
@@ -26,48 +34,48 @@ public static void Show(this IDialogService dialogService, string name, IDialogP
         /// <param name="name">The name of the dialog to show.</param>
         /// <param name="parameters">The parameters to pass to the dialog.</param>
         /// <param name="callback">The action to perform when the dialog is closed.</param>
-        /// <param name="windowName">The name of the hosting window registered with the IContainerRegistry.</param>
-        public static void Show(this IDialogService dialogService, string name, IDialogParameters parameters, Action<IDialogResult> callback, string windowName)
+        public static void Show(this IDialogService dialogService, string name, IDialogParameters parameters, Action<IDialogResult> callback)
         {
-            parameters = EnsureShowNonModalParameter(parameters);
-
-            if(!string.IsNullOrEmpty(windowName))
-                parameters.Add(KnownDialogParameters.WindowName, windowName);
-
-            dialogService.ShowDialog(name, parameters, new DialogCallback().OnClose(callback));
+            Show(dialogService, name, parameters, callback, null);
         }
 
         /// <summary>
         /// Shows a non-modal dialog.
         /// </summary>
         /// <param name="dialogService">The DialogService</param>
         /// <param name="name">The name of the dialog to show.</param>
-        public static void Show(this IDialogService dialogService, string name)
+        /// <param name="parameters">The parameters to pass to the dialog.</param>
+        /// <param name="callback">The action to perform when the dialog is closed.</param>
+        /// <param name="windowName">The name of the hosting window registered with the IContainerRegistry.</param>
+        public static void Show(this IDialogService dialogService, string name, IDialogParameters parameters, Action<IDialogResult> callback, string windowName)
         {
-            var parameters = EnsureShowNonModalParameter(null);
-            dialogService.Show(name, parameters, null);
+            ShowDialogInternal(dialogService, name, parameters, callback, windowName, true);
         }
 
         /// <summary>
-        /// Shows a non-modal dialog.
+        /// Shows a modal dialog.
         /// </summary>
         /// <param name="dialogService">The DialogService</param>
         /// <param name="name">The name of the dialog to show.</param>
+        /// <param name="parameters">The parameters to pass to the dialog.</param>
         /// <param name="callback">The action to perform when the dialog is closed.</param>
-        public static void Show(this IDialogService dialogService, string name, Action<IDialogResult> callback)
+        /// <param name="windowName">The name of the hosting window registered with the IContainerRegistry.</param>
+        public static void ShowDialog(this IDialogService dialogService, string name, IDialogParameters parameters, Action<IDialogResult> callback, string windowName)
         {
-            var parameters = EnsureShowNonModalParameter(null);
-            dialogService.Show(name, parameters, callback);
+            ShowDialogInternal(dialogService, name, parameters, callback, windowName, false);
         }
 
-        private static IDialogParameters EnsureShowNonModalParameter(IDialogParameters parameters)
+        private static void ShowDialogInternal(IDialogService dialogService, string name, IDialogParameters parameters, Action<IDialogResult> callback, string windowName, bool isNonModal)
         {
             parameters ??= new DialogParameters();
 
-            if (!parameters.ContainsKey(KnownDialogParameters.ShowNonModal))
+            if (!string.IsNullOrEmpty(windowName))
+                parameters.Add(KnownDialogParameters.WindowName, windowName);
+
+            if (isNonModal)
                 parameters.Add(KnownDialogParameters.ShowNonModal, true);
 
-            return parameters;
+            dialogService.ShowDialog(name, parameters, new DialogCallback().OnClose(callback));
         }
 #endif
     }