From 8177dfab2a996c30db68ee2f2616df2c8f4a3793 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 31 Oct 2022 14:34:31 -0700
Subject: [PATCH] FIX: Post height issues with table wrapper buttons

---
 .../discourse/app/initializers/post-decorations.js    | 11 ++++++++---
 app/assets/stylesheets/common/base/topic-post.scss    | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/post-decorations.js b/app/assets/javascripts/discourse/app/initializers/post-decorations.js
index 735ee49241..598d283310 100644
--- a/app/assets/javascripts/discourse/app/initializers/post-decorations.js
+++ b/app/assets/javascripts/discourse/app/initializers/post-decorations.js
@@ -141,7 +141,8 @@ export default {
           "open-popup-link",
           "btn-default",
           "btn",
-          "btn-icon-text"
+          "btn-icon-text",
+          "btn-expand-table"
         );
         const expandIcon = create(
           iconNode("discourse-expand", { class: "expand-table-icon" })
@@ -158,7 +159,7 @@ export default {
       }
 
       function generateModal(event) {
-        const table = event.target.nextElementSibling;
+        const table = event.target.parentElement.nextElementSibling;
         const tempTable = table.cloneNode(true);
 
         showModal("fullscreen-table").set("tableHtml", tempTable);
@@ -176,8 +177,12 @@ export default {
 
           const popupBtn = _createButton();
           table.parentNode.classList.add("fullscreen-table-wrapper");
-          table.parentNode.insertBefore(popupBtn, table);
+          // Create a button wrapper for case of multiple buttons (i.e. table builder extension)
+          const buttonWrapper = document.createElement("div");
+          buttonWrapper.classList.add("fullscreen-table-wrapper-buttons");
+          buttonWrapper.append(popupBtn);
           popupBtn.addEventListener("click", generateModal, false);
+          table.parentNode.insertBefore(buttonWrapper, table);
         });
       }
 
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index d80440f25e..6a7a2c5202 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1652,16 +1652,21 @@ a.mention-group {
 
 .open-popup-link {
   position: sticky;
-  left: 0.5rem;
-  top: 0.5rem;
+  left: 1rem;
   opacity: 0%;
   white-space: nowrap;
-  display: block;
 }
 
 .fullscreen-table-wrapper {
   transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
   display: block;
+  position: relative;
+
+  &-buttons {
+    position: absolute;
+    top: 0.5rem;
+    left: 0.5rem;
+  }
 }
 
 .expand-table-icon {