From 20e90c0de4df892f8ee2c9a9b594c5230aaa5c83 Mon Sep 17 00:00:00 2001
From: Leigh <Leigh.Pointer@outlook.com>
Date: Thu, 16 Dec 2021 20:07:40 +0100
Subject: [PATCH 1/2] Rework to #1848 RawHTML not being saved

Restructured the execution of code.
RawHTML now works as it did in previous versions as well as the new functionality.
---
 .../Modules/Controls/RichTextEditor.razor     | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 82afff0c..6a0eee56 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -120,19 +120,25 @@
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
     };
 
-    protected override void OnParametersSet()
+    protected override void OnInitialized()
     {
         _content = Content; // raw HTML
     }
 
+    protected override async Task OnParametersSetAsync()
+    {
+        _content = Content; // raw HTML
+        await RefreshRichText();
+    }
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-       var interop = new RichTextEditorInterop(JSRuntime);
-       
-       if (firstRender)
+        var interop = new RichTextEditorInterop(JSRuntime);
+        if (firstRender)
         {
             await base.OnAfterRenderAsync(firstRender);
 
+
             await interop.CreateEditor(
                 _editorElement,
                 _toolBar,
@@ -140,15 +146,14 @@
                 Placeholder,
                 Theme,
                 DebugLevel);
+
+            await interop.LoadEditorContent(_editorElement, Content);
+
+            _content = Content; // raw HTML
+
         }
-
-        await interop.LoadEditorContent(_editorElement, Content);
-
-        _content = Content; // raw HTML
-
-        // preserve a copy of the rich text content ( Quill sanitizes content so we need to retrieve it from the editor )
-        _original = await interop.GetHtml(_editorElement);
-
+            // preserve a copy of the rich text content ( Quill sanitizes content so we need to retrieve it from the editor )
+            _original = await interop.GetHtml(_editorElement);
     }
 
     public void CloseFileManager()

From 6567b55ea341a74319bc7d2f2c0440e6c9b65085 Mon Sep 17 00:00:00 2001
From: Leigh <Leigh.Pointer@outlook.com>
Date: Thu, 16 Dec 2021 20:11:07 +0100
Subject: [PATCH 2/2] Removed RichTextEditor OnInitialized

Redundant procedure call.
---
 Oqtane.Client/Modules/Controls/RichTextEditor.razor | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 6a0eee56..d926bbe0 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -120,11 +120,6 @@
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
     };
 
-    protected override void OnInitialized()
-    {
-        _content = Content; // raw HTML
-    }
-
     protected override async Task OnParametersSetAsync()
     {
         _content = Content; // raw HTML