From b3108ab0fc8be816dd5d234a27e61bb57cd99bf3 Mon Sep 17 00:00:00 2001
From: Michel Michels <michel@miche.ls>
Date: Thu, 20 Jun 2024 07:17:18 +0200
Subject: [PATCH] Fix #3503 - DialogHost overloads added (#3596)

---
 src/MaterialDesignThemes.Wpf/DialogHostEx.cs | 46 ++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/MaterialDesignThemes.Wpf/DialogHostEx.cs b/src/MaterialDesignThemes.Wpf/DialogHostEx.cs
index 27004378da..8efa5d2641 100644
--- a/src/MaterialDesignThemes.Wpf/DialogHostEx.cs
+++ b/src/MaterialDesignThemes.Wpf/DialogHostEx.cs
@@ -36,6 +36,16 @@ public static class DialogHostEx
     public static Task<object?> ShowDialog(this Window window, object content, DialogOpenedEventHandler openedEventHandler)
         => GetFirstDialogHost(window).ShowInternal(content, openedEventHandler, null, null);
 
+    /// <summary>
+    /// Shows a dialog using the first found <see cref="DialogHost"/> with the supplied dialog identifier in a given <see cref="Window"/>.
+    /// </summary>
+    /// <param name="window">Window on which the modal dialog should be displayed. Must contain a <see cref="DialogHost"/>.</param>
+    /// <param name="content">Content to show (can be a control or view model).</param>
+    /// <param name="dialogIdentifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifier set in XAML. <c>null</c> is allowed.</param>
+    /// <returns>Task result is the parameter used to close the dialog, typically what is passed to the <see cref="CloseDialogCommand"/> command.</returns>
+    public static Task<object?> ShowDialog(this Window window, object content, object? dialogIdentifier)
+        => GetFirstDialogHost(window, dialogIdentifier).ShowInternal(content, null, null, null);
+
     /// <summary>
     /// Shows a dialog using the first found <see cref="DialogHost"/> in a given <see cref="Window"/>.
     /// </summary>
@@ -99,6 +109,19 @@ public static class DialogHostEx
     public static Task<object?> ShowDialog(this DependencyObject childDependencyObject, object content)
         => GetOwningDialogHost(childDependencyObject).ShowInternal(content, null, null, null);
 
+    /// <summary>
+    /// Shows a dialog using the parent/ancestor <see cref="DialogHost"/> of the a given <see cref="DependencyObject"/>.
+    /// </summary>
+    /// <param name="childDependencyObject">Dependency object which should be a visual child of a <see cref="DialogHost"/>, where the dialog will be shown.</param>        
+    /// <param name="content">Content to show (can be a control or view model).</param>
+    /// <param name="dialogIdentifier"><see cref="Identifier"/> of the instance where the dialog should be shown. Typically this will match an identifier set in XAML. <c>null</c> is allowed.</param>
+    /// <exception cref="InvalidOperationException">
+    /// Thrown is a <see cref="DialogHost"/> is not found when conducting a depth first traversal of visual tree.  
+    /// </exception>
+    /// <returns></returns>
+    public static Task<object?> ShowDialog(this DependencyObject childDependencyObject, object content, object dialogIdentifier)
+        => GetOwningDialogHost(childDependencyObject, dialogIdentifier).ShowInternal(content, null, null, null);
+
     /// <summary>
     /// Shows a dialog using the parent/ancestor <see cref="DialogHost"/> of the a given <see cref="DependencyObject"/>.
     /// </summary>
@@ -166,6 +189,18 @@ private static DialogHost GetFirstDialogHost(Window window)
         return dialogHost;
     }
 
+    private static DialogHost GetFirstDialogHost(Window window, object? dialogIdentifier)
+    {
+        if (window is null) throw new ArgumentNullException(nameof(window));
+
+        DialogHost? dialogHost = window.VisualDepthFirstTraversal().OfType<DialogHost>().FirstOrDefault(x => x.Identifier is not null && x.Identifier.Equals(dialogIdentifier));
+
+        if (dialogHost is null)
+            throw new InvalidOperationException($"Unable to find a DialogHost with identifier '{dialogIdentifier}' in visual tree");
+
+        return dialogHost;
+    }
+
     private static DialogHost GetOwningDialogHost(DependencyObject childDependencyObject)
     {
         if (childDependencyObject is null) throw new ArgumentNullException(nameof(childDependencyObject));
@@ -177,4 +212,15 @@ private static DialogHost GetOwningDialogHost(DependencyObject childDependencyOb
 
         return dialogHost;
     }
+    private static DialogHost GetOwningDialogHost(DependencyObject childDependencyObject, object dialogIdentifier)
+    {
+        if (childDependencyObject is null) throw new ArgumentNullException(nameof(childDependencyObject));
+
+        DialogHost? dialogHost = childDependencyObject.GetVisualAncestry().OfType<DialogHost>().FirstOrDefault(x => x.Identifier is not null && x.Identifier.Equals(dialogIdentifier));
+
+        if (dialogHost is null)
+            throw new InvalidOperationException($"Unable to find a DialogHost in visual tree ancestry with identifier {dialogIdentifier}");
+
+        return dialogHost;
+    }
 }