[Dialog] Fix regression, see details in microsoft#2542 (microsoft#2568)

* Fix microsoft#2542 by not including Instance.ontent in hash code method. * Fix issue by adding Visible to DialogParameters. Dialog Hide/Show methods will now set Visible value. Provider will only render dialog if Visible is true.
matt9ucci · Aug 22, 2024 · 3c886ce · 3c886ce
1 parent 621aa4e
commit 3c886ce
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml b/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
@@ -3333,6  3333,11 @@
             outside the dialog. Defaults to false.
             </summary>
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.DialogParameters.Visible">
             <summary>
             Gets or sets if a dialog is visible or nt (Hidden)
             </summary>
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.DialogParameters.PreventScroll">
             <summary>
             Prevents scrolling outside of the dialog while it is shown.

diff --git a/src/Core/Components/Dialog/FluentDialog.razor.cs b/src/Core/Components/Dialog/FluentDialog.razor.cs
@@ -165,6  165,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     public void Show()
     {
         Hidden = false;
         Instance.Parameters.Visible = true;
         RefreshHeaderFooter();
     }
 
@@ -174,7  175,8 @@ public void Show()
     public void Hide()
     {
         Hidden = true;
-        RefreshHeaderFooter();
         Instance.Parameters.Visible = false;
         //RefreshHeaderFooter();
     }
 
     /// <summary>

diff --git a/src/Core/Components/Dialog/FluentDialogProvider.razor b/src/Core/Components/Dialog/FluentDialogProvider.razor
@@ -14,7  14,10 @@
     {
         @foreach (DialogReference dialog in _internalDialogContext.References)
         {
-            <FluentDialog @key="@dialog.GetKey()" Id="@dialog.Id" Instance="@dialog.Instance" Data="@dialog.Instance.Content" @ondialogdismiss=OnDismissAsync />
             if (dialog.Instance.Parameters.Visible)
             {
                 <FluentDialog @key="@dialog.GetKey()" Id="@dialog.Id" Instance="@dialog.Instance" Data="@dialog.Instance.Content" @ondialogdismiss=OnDismissAsync />
             }
         }
     }
 }
diff --git a/src/Core/Components/Dialog/Parameters/DialogParameters.cs b/src/Core/Components/Dialog/Parameters/DialogParameters.cs
@@ -30,6  30,11 @@ public class DialogParameters : ComponentParameters, IDialogParameters
     /// </summary>
     public bool PreventDismissOnOverlayClick { get; set; } = false;
 
     /// <summary>
     /// Gets or sets if a dialog is visible or not (Hidden)
     /// </summary>
     public bool Visible { get; set; } = true;
 
     /// <summary>
     /// Prevents scrolling outside of the dialog while it is shown.
     /// </summary>to use
@@ -87,7  92,7 @@ public class DialogParameters : ComponentParameters, IDialogParameters
     /// <summary>
     /// Gets or sets the height of the dialog. Must be a valid CSS height value like "600px" or "3em"
     /// Only used if Alignment is set to "HorizontalAlignment.Center"
-    /// </summary>  
     /// </summary>
     public string? Height { get; set; }
 
     /// <summary>
@@ -121,7  126,7 @@ public class DialogParameters : ComponentParameters, IDialogParameters
     internal bool ShowPrimaryAction => !string.IsNullOrEmpty(PrimaryAction);
 
     /// <summary>
-    /// Gets whether the secondary button is displayed or not. Depends on SecondaryAction having a value. 
     /// Gets whether the secondary button is displayed or not. Depends on SecondaryAction having a value.
     /// </summary>
     internal bool ShowSecondaryAction => !string.IsNullOrEmpty(SecondaryAction);
 

diff --git a/src/Core/Components/Dialog/Parameters/IDialogParameters.cs b/src/Core/Components/Dialog/Parameters/IDialogParameters.cs
@@ -25,6  25,7 @@ public interface IDialogParameters
     DialogType DialogType { get; set; }
     bool PreventScroll { get; set; }
     bool PreventDismissOnOverlayClick { get; set; }
     bool Visible { get; set; }
     EventCallback<DialogResult> OnDialogResult { get; set; }
     EventCallback<DialogInstance> OnDialogClosing { get; set; }
     EventCallback<DialogInstance> OnDialogOpened { get; set; }