Fix #2367 by passing through parameters.Modal to `ShowSplashScreen...…

…` methods (#2398) Also adjust the samples to show these behaviors
microsoft · Jul 18, 2024 · 3099581 · 3099581
1 parent 5ebaa3d
commit 3099581
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml b/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
@@ -7020,17 +7020,17 @@
             Gets or sets the content to display. All first HTML elements are included in the items flow.
             </summary>
         </member>
-        <member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentOverflowItem.Overflow">
-            <summary>
-            Gets True if this component is out of panel.
-            </summary>
-        </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentOverflowItem.Fixed">
             <summary>
             Gets or sets if this item dos not participates in overflow logic.
             Defaults to false
             </summary>
         </member>
+        <member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentOverflowItem.Overflow">
+            <summary>
+            Gets True if this component is out of panel.
+            </summary>
+        </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentOverflowItem.Text">
             <summary>
             Gets the InnerText of <see cref="P:Microsoft.FluentUI.AspNetCore.Components.FluentOverflowItem.ChildContent"/>.

diff --git a/examples/Demo/Shared/Pages/SplashScreen/Examples/CustomSplashScreen.razor b/examples/Demo/Shared/Pages/SplashScreen/Examples/CustomSplashScreen.razor
@@ -36,11 +36,12 @@
     {
         if (firstRender)
         {
+
             // Simulation of loading process
-            await Task.Delay(7000);
+            await Task.Delay(Content.DisplayTime);
 
             // Close the dialog
             await Dialog.CloseAsync();
         }
     }
-}
+}
diff --git a/examples/Demo/Shared/Pages/SplashScreen/Examples/DialogSplashScreenCustom.razor.cs b/examples/Demo/Shared/Pages/SplashScreen/Examples/DialogSplashScreenCustom.razor.cs
@@ -17,6 +17,7 @@ private async Task OpenSplashCustomAsync()
                 LoadingText = "Filling the re-useable bottles...",
                 Message = (MarkupString)"Don't drink <strong>too</strong> much water!",
                 Logo = "_content/FluentUI.Demo.Shared/images/Splash_Corporation_logo.png",
+                DisplayTime = 7000
             },
             Width = "500px",
             Height = "300px",
@@ -35,7 +36,7 @@ private async Task OpenSplashCustomAsync()
     }
     private void OpenSplashCustom()
     {
-        DemoLogger.WriteLine($"Open custom splashscreen for 7 seconds");
+        DemoLogger.WriteLine($"Open custom splashscreen for 4 seconds");
         DialogParameters<SplashScreenContent> parameters = new()
         {
             Content = new()

diff --git a/examples/Demo/Shared/Pages/SplashScreen/Examples/DialogSplashScreenDefault.razor.cs b/examples/Demo/Shared/Pages/SplashScreen/Examples/DialogSplashScreenDefault.razor.cs
@@ -22,6 +22,7 @@ private async Task OpenSplashDefaultAsync()
                 Logo = FluentSplashScreen.LOGO,
             },
             PreventDismissOnOverlayClick = true,
+            Modal = false,
             Width = "640px",
             Height = "480px",
         };
@@ -57,6 +58,7 @@ private void OpenSplashDefault()
             },
             Width = "640px",
             Height = "480px",
+            Modal = true,
         };
         DialogService.ShowSplashScreen(this, HandleDefaultSplashAsync, parameters);
     }

diff --git a/src/Core/Components/Dialog/Services/DialogService-SplashScreen.cs b/src/Core/Components/Dialog/Services/DialogService-SplashScreen.cs
@@ -36,7 +36,7 @@ public void ShowSplashScreen(Type component, object receiver, Func<DialogResult,
         {
             DialogType = DialogType.SplashScreen,
             Alignment = HorizontalAlignment.Center,
-            Modal = true,
+            Modal = parameters.Modal,
             PreventDismissOnOverlayClick = parameters.PreventDismissOnOverlayClick,
             ShowDismiss = false,
             ShowTitle = false,
@@ -101,7 +101,7 @@ public async Task<IDialogReference> ShowSplashScreenAsync(Type component, object
         {
             DialogType = DialogType.SplashScreen,
             Alignment = HorizontalAlignment.Center,
-            Modal = false,
+            Modal = parameters.Modal,
             PreventDismissOnOverlayClick = parameters.PreventDismissOnOverlayClick,
             ShowDismiss = false,
             ShowTitle = false,