From dff2261994984dc37f5693ebe83fb2cfae3189e9 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Thu, 5 Feb 2026 15:33:08 -0500
Subject: [PATCH] improve support for BodyContent

---
 Oqtane.Server/Components/App.razor | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor
index c717172d..093782c6 100644
--- a/Oqtane.Server/Components/App.razor
+++ b/Oqtane.Server/Components/App.razor
@@ -79,6 +79,7 @@
 
             @((MarkupString)_scripts)
             @((MarkupString)_bodyResources)
+            @((MarkupString)_bodyContent)
             @if (_renderMode == RenderModes.Static)
             {
                 <page-script src="./js/reload.js?v=@_fingerprint"></page-script>
@@ -107,6 +108,7 @@
     private string _language = "en";
     private string _headResources = "";
     private string _bodyResources = "";
+    private string _bodyContent = "";
     private string _styleSheets = "";
     private string _scripts = "";
     private string _message = "";
@@ -190,6 +192,8 @@
                     var resources = await GetPageResources(alias, site, page, modules, int.Parse(route.ModuleId, CultureInfo.InvariantCulture), route.Action);
                     ManageStyleSheets(resources);
                     ManageScripts(resources, alias);
+                    AddBodyContent(site.BodyContent);
+                    AddBodyContent(page.BodyContent);
 
                     // generate scripts
                     if (site.PwaIsEnabled && site.PwaAppIconFileId != null && site.PwaSplashIconFileId != null)
@@ -806,4 +810,23 @@
             }
         }
     }
+
+    private void AddBodyContent(string content)
+    {
+        if (!string.IsNullOrEmpty(content))
+        {
+            var elements = content.Split('<', StringSplitOptions.RemoveEmptyEntries);
+            foreach (var element in elements)
+            {
+                if (_renderMode == RenderModes.Static || (!element.ToLower().StartsWith("script") && !element.ToLower().StartsWith("/script")))
+                {
+                    if (!_bodyContent.Contains("<" + element) || element.StartsWith("/"))
+                    {
+                        _bodyContent += "<" + element;
+                    }
+                }
+            }
+            _bodyContent += "\n";
+        }
+    }
 }