From 186e8be026e46d86930d7ce4b686505f0b0da004 Mon Sep 17 00:00:00 2001
From: Clark Winkelmann <clark.winkelmann@gmail.com>
Date: Mon, 21 Feb 2022 19:38:23 +0100
Subject: [PATCH] Fix pinned pane broken after discussion creation The pane
 would appear but the page content would not shift to the right because the
 hasPane className would be missing

---
 framework/core/js/src/forum/components/DiscussionComposer.js | 2 +-
 framework/core/js/src/forum/components/DiscussionPage.tsx    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/core/js/src/forum/components/DiscussionComposer.js b/framework/core/js/src/forum/components/DiscussionComposer.js
index d517be92a..42eb77aeb 100644
--- a/framework/core/js/src/forum/components/DiscussionComposer.js
+++ b/framework/core/js/src/forum/components/DiscussionComposer.js
@@ -101,7 +101,7 @@ export default class DiscussionComposer extends ComposerBody {
       .save(data)
       .then((discussion) => {
         this.composer.hide();
-        app.discussions.refresh({ deferClear: true });
+        app.discussions.refresh();
         m.route.set(app.route.discussion(discussion));
       }, this.loaded.bind(this));
   }
diff --git a/framework/core/js/src/forum/components/DiscussionPage.tsx b/framework/core/js/src/forum/components/DiscussionPage.tsx
index 0a8d39a1c..aaf07a477 100644
--- a/framework/core/js/src/forum/components/DiscussionPage.tsx
+++ b/framework/core/js/src/forum/components/DiscussionPage.tsx
@@ -53,7 +53,9 @@ export default class DiscussionPage<CustomAttrs extends IDiscussionPageAttrs = I
     // page, then we don't want Mithril to redraw the whole page – if it did,
     // then the pane would redraw which would be slow and would cause problems with
     // event handlers.
-    if (app.discussions.hasItems()) {
+    // We will also enable the pane if the discussion list is empty but loading,
+    // because the DiscussionComposer refreshes the list and redirects to the new discussion at the same time.
+    if (app.discussions.hasItems() || app.discussions.isLoading()) {
       app.pane?.enable();
       app.pane?.hide();
     }