From d910cfa919eaacf630e1c66f8cfabe9f4c516a9d Mon Sep 17 00:00:00 2001
From: vnetonline <vbelani@amazingsolutions.com.au>
Date: Wed, 24 Apr 2024 09:46:07 +1000
Subject: [PATCH] [ENH] - #4178 modifications after review

---
 Oqtane.Client/Modules/ModuleBase.cs        |  2 +-
 Oqtane.Client/UI/ModuleInstance.razor      | 14 +++++++++++++-
 Oqtane.Shared/Interfaces/IModuleControl.cs |  2 +-
 Oqtane.Shared/Models/Module.cs             |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 2d5410a3..46fd01db 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -52,7 +52,7 @@ namespace Oqtane.Modules
 
         public virtual string RenderMode { get { return RenderModes.Interactive; } } // interactive by default
 
-        public virtual bool Prerender { get { return true; } } // prerender at server by default
+        public virtual bool? Prerender { get { return null; } } // prerender at server by default
 
         // url parameters
         public virtual string UrlParametersTemplate { get; set; }
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index 53258cea..2699153e 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -7,7 +7,19 @@
 }
 else
 {
-    <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, ModuleState.Prerender != false ? PageState.Site.Prerender : ModuleState.Prerender )" />
+    if (ModuleState.Prerender != false)
+    {
+        <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, false)" />
+
+    } 
+    else if (ModuleState.Prerender == true)
+    {
+        <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, true)" />
+    }
+    else
+    {
+        <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, PageState.Site.Prerender)" />
+    }
 }
 
 @code {
diff --git a/Oqtane.Shared/Interfaces/IModuleControl.cs b/Oqtane.Shared/Interfaces/IModuleControl.cs
index b425a311..df607f8f 100644
--- a/Oqtane.Shared/Interfaces/IModuleControl.cs
+++ b/Oqtane.Shared/Interfaces/IModuleControl.cs
@@ -39,6 +39,6 @@ namespace Oqtane.Modules
         /// <summary>
         /// Specifies the prerender mode for the moudle control ie: true or false
         /// </summary>
-        bool Prerender { get;  }
+        bool? Prerender { get;  }
     }
 }
diff --git a/Oqtane.Shared/Models/Module.cs b/Oqtane.Shared/Models/Module.cs
index a875e31b..b90e685c 100644
--- a/Oqtane.Shared/Models/Module.cs
+++ b/Oqtane.Shared/Models/Module.cs
@@ -118,7 +118,7 @@ namespace Oqtane.Models
         [NotMapped]
         public string RenderMode{ get; set; }
         [NotMapped]
-        public bool Prerender { get; set; }
+        public bool? Prerender { get; set; }
 
         #endregion