MessageService: fix sizing when showing modal (#6530)

Author: stsrki

Source/Blazorise/Components/MessageProvider/MessageProvider.razor

@@ -1,6 +1,6 @@
 @namespace Blazorise
 @inherits BaseComponent
-<Modal @ref="@ModalRef" Closing="@OnModalClosing" Centered="@CenterMessage" Scrollable="@ScrollableMessage" Size="@Size">
+<Modal @ref="@ModalRef" @bind-Visible="@ModalVisible" Closing="@OnModalClosing" Centered="@CenterMessage" Scrollable="@ScrollableMessage" Size="@Size">
     <ModalContent>
         <ModalHeader>
             <ModalTitle Class="@TitleClass">

Source/Blazorise/Components/MessageProvider/MessageProvider.razor.cs

@@ -40,13 +40,17 @@ protected override void Dispose( bool disposing )
 
     private async void OnMessageReceived( object sender, MessageEventArgs e )
     {
-        MessageType = e.MessageType;
-        Message = e.Message;
-        Title = e.Title;
-        Options = e.Options;
-        Callback = e.Callback;
-
-        await InvokeAsync( ModalRef.Show );
+        await InvokeAsync( () =>
+        {
+            MessageType = e.MessageType;
+            Message = e.Message;
+            Title = e.Title;
+            Options = e.Options;
+            Callback = e.Callback;
+            ModalVisible = true;
+
+            StateHasChanged();
+        } );
     }
 
     /// <summary>
@@ -142,6 +146,11 @@ protected virtual Task OnModalClosing( ModalClosingEventArgs eventArgs )
     /// </summary>
     protected Modal ModalRef { get; set; }
 
+    /// <summary>
+    /// Gets or sets whether the message modal is visible.
+    /// </summary>
+    protected bool ModalVisible { get; set; }
+
     /// <summary>
     /// If true, modal will act as a prompt dialog.
     /// </summary>

Tests/Blazorise.Tests/Components/MessageProviderComponentTest.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Threading.Tasks;
+using Bunit;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Blazorise.Tests.Components;
+
+public class MessageProviderComponentTest : TestContext
+{
+    public MessageProviderComponentTest()
+    {
+        Services.AddBlazoriseTests().AddBootstrapProviders().AddEmptyIconProvider();
+        JSInterop
+            .AddBlazoriseButton()
+            .AddBlazoriseModal()
+            .AddBlazoriseClosable();
+    }
+
+    [Fact]
+    public async Task InfoAppliesRequestedSizeBeforeOpening()
+    {
+        var component = RenderComponent<MessageProvider>();
+
+        await ShowInfoMessage( component, options => options.Size = ModalSize.Large );
+
+        component.WaitForAssertion( () => Assert.Contains( "modal-lg", component.Find( ".modal-dialog" ).ClassName ) );
+    }
+
+    [Fact]
+    public async Task InfoDoesNotReusePreviousSize()
+    {
+        var component = RenderComponent<MessageProvider>();
+
+        await ShowInfoMessage( component, options => options.Size = ModalSize.Large );
+        component.WaitForAssertion( () => Assert.Contains( "modal-lg", component.Find( ".modal-dialog" ).ClassName ) );
+
+        await component.Find( "button" ).ClickAsync();
+
+        await ShowInfoMessage( component );
+
+        component.WaitForAssertion( () => Assert.DoesNotContain( "modal-lg", component.Find( ".modal-dialog" ).ClassName ) );
+    }
+
+    private Task ShowInfoMessage( IRenderedComponent<MessageProvider> component, Action<MessageOptions> options = null )
+    {
+        var messageService = Services.GetRequiredService<IMessageService>();
+
+        return component.InvokeAsync( () => messageService.Info( "Message", "Title", options ) );
+    }
+}