Skip to content
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

Jump to bottom

remove the visible parameter in module message component. #3910

Merged
merged 1 commit into from
Feb 27, 2024
Merged

remove the visible parameter in module message component. #3910

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
8 changes: 2 additions & 6 deletions Oqtane.Client/Modules/Controls/ModuleMessage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@inherits ModuleControlBase
@inject NavigationManager NavigationManager

@if (Visible && !string.IsNullOrEmpty(Message))
@if (!string.IsNullOrEmpty(Message))
{
<div class="@_classname alert-dismissible fade show mb-3" role="alert">
@((MarkupString)Message)
Expand Down Expand Up @@ -30,14 +30,10 @@
[Parameter]
public MessageType Type { get; set; }

[Parameter]
public bool Visible { get; set; } = true;

public void RefreshMessage(string message, MessageType type, bool visible)
public void RefreshMessage(string message, MessageType type)
{
Message = message;
Type = type;
Visible = visible;

UpdateClassName();

Expand Down
16 changes: 8 additions & 8 deletions Oqtane.Client/UI/RenderModeBoundary.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
@if (ModuleType != null)
{
@((MarkupString)$"<!-- rendermode: {ModuleState.RenderMode} -->")
<ModuleMessage @ref="moduleMessageTop" Message="@_messageContent" Type="@_messageType" Visible="@(!string.IsNullOrEmpty(_messageContent) && _messagePosition == "top")" />
<ModuleMessage @ref="moduleMessageTop" Message="@_messageContent" Type="@_messageType" />
@DynamicComponent
@if (_progressIndicator)
{
<div class="app-progress-indicator"></div>
}
<ModuleMessage @ref="moduleMessageBottom" Message="@_messageContent" Type="@_messageType" Visible="@(!string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom")" />
<ModuleMessage @ref="moduleMessageBottom" Message="@_messageContent" Type="@_messageType" />
}
}
else
Expand Down Expand Up @@ -131,17 +131,17 @@

private void Refresh()
{
var messageTopVisible = !string.IsNullOrEmpty(_messageContent) && _messagePosition == "top";
var messageBottomVisible = !string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom";
var updateTop = string.IsNullOrEmpty(_messageContent) || _messagePosition == "top";
var updateBottom = string.IsNullOrEmpty(_messageContent) || _messagePosition == "bottom";

if (moduleMessageTop != null)
if (updateTop && moduleMessageTop != null)
{
moduleMessageTop.RefreshMessage(_messageContent, _messageType, messageTopVisible);
moduleMessageTop.RefreshMessage(_messageContent, _messageType);
}

if (moduleMessageBottom != null)
if (updateBottom && moduleMessageBottom != null)
{
moduleMessageBottom.RefreshMessage(_messageContent, _messageType, messageBottomVisible);
moduleMessageBottom.RefreshMessage(_messageContent, _messageType);
}
}

Expand Down