Skip to content

[SplashScreen] Pass parameters.Modal to ShowSplashScreen... methods #2398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dvoituron merged 1 commit into from
Jul 18, 2024
Merged

[SplashScreen] Pass parameters.Modal to ShowSplashScreen... methods #2398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>.
Expand Down
5 changes: 3 additions & 2 deletions examples/Demo/Shared/Pages/SplashScreen/Examples/CustomSplashScreen.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
}
3 changes: 2 additions & 1 deletion examples/Demo/Shared/Pages/SplashScreen/Examples/DialogSplashScreenCustom.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions examples/Demo/Shared/Pages/SplashScreen/Examples/DialogSplashScreenDefault.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ private async Task OpenSplashDefaultAsync()
Logo = FluentSplashScreen.LOGO,
},
PreventDismissOnOverlayClick = true,
Modal = false,
Width = "640px",
Height = "480px",
};
Expand Down Expand Up @@ -57,6 +58,7 @@ private void OpenSplashDefault()
},
Width = "640px",
Height = "480px",
Modal = true,
};
DialogService.ShowSplashScreen(this, HandleDefaultSplashAsync, parameters);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Components/Dialog/Services/DialogService-SplashScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down