From 5c70f4f6a7530718ec115b2858e85ad635da5828 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Fri, 9 Jan 2026 08:44:13 +0800
Subject: [PATCH] Fix #5948: re-render the module message when it's been
 changed.

---
 .../Modules/Controls/ModuleMessage.razor       |  2 +-
 Oqtane.Client/UI/RenderModeBoundary.razor      | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index f904b5a6..c365a321 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -21,7 +21,7 @@
 
     @if (_style == MessageStyle.Toast)
     {
-        <div class="app-modulemessage-toast bottom-0 end-0" @key="DateTime.UtcNow">
+        <div class="app-modulemessage-toast bottom-0 end-0">
             <div class="@_classname alert-dismissible fade show mb-3 rounded-end-0" role="alert">
                 @((MarkupString)Message)
                 @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
diff --git a/Oqtane.Client/UI/RenderModeBoundary.razor b/Oqtane.Client/UI/RenderModeBoundary.razor
index b6b5e0af..ad9cb295 100644
--- a/Oqtane.Client/UI/RenderModeBoundary.razor
+++ b/Oqtane.Client/UI/RenderModeBoundary.razor
@@ -16,7 +16,7 @@
             {
                 @if (!string.IsNullOrEmpty(_messageContent) && _messagePosition == "top")
                 {
-                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" Style="@_messageStyle" />
+                    <ModuleMessage @key="_messageVersionTop" Message="@_messageContent" Type="@_messageType" Parent="@this" Style="@_messageStyle" />
                 }
                 @DynamicComponent
                 @if (_progressIndicator)
@@ -25,7 +25,7 @@
                 }
                 @if (!string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom")
                 {
-                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" Style="@_messageStyle" />
+                    <ModuleMessage @key="_messageVersionBottom" Message="@_messageContent" Type="@_messageType" Parent="@this" Style="@_messageStyle" />
                 }
             }
         }
@@ -52,6 +52,8 @@
     private MessageStyle _messageStyle;
     private bool _progressIndicator = false;
     private string _error;
+    private string _messageVersionTop = Guid.NewGuid().ToString();
+    private string _messageVersionBottom = Guid.NewGuid().ToString();
 
     [Parameter]
     public SiteState SiteState { get; set; }
@@ -143,6 +145,18 @@
             _messageStyle = style;
             _progressIndicator = false;
 
+            if (style == MessageStyle.Toast && !string.IsNullOrEmpty(_messageContent))
+            {
+                if (_messagePosition == "top")
+                {
+                    _messageVersionTop = Guid.NewGuid().ToString();
+                }
+                else if (_messagePosition == "bottom")
+                {
+                    _messageVersionBottom = Guid.NewGuid().ToString();
+                }
+            }
+
             StateHasChanged();
         }
     }