Merge pull request #1453 from AlecRust/fix-width-when-embedded

Fix popup width when embedded in page

2 files changed, 13 insertions, 7 deletions

diff --git a/public/popup.css b/public/popup.css
index 783300ab..f314ae03 100644
--- a/public/popup.css
+++ b/public/popup.css
@@ -100,6 +100,10 @@
   margin-bottom: 16px;
 }
 
+#sponsorBlockPopupContainer iframe {
+  width: 100%;
+}
+
 /*
  * Disable popup max height when displayed in-page (content.ts)
  */
@@ -110,7 +114,7 @@
 /*
  * Disable fixed popup width when displayed in-page (content.ts)
  */
-#sponsorBlockPopupContainer #sponsorBlockPopupBody {
+#sponsorBlockPopupBody.is-embedded {
   width: auto;
 }
 
@@ -207,7 +211,7 @@
   border-radius: 50%;
   display: inline-block;
 }
-/* 
+/*
  * Category name in segment
  */
 .summaryLabel {
@@ -511,7 +515,7 @@
   background: var(--sb-grey-bg-color);
 }
 
-/* 
+/*
  * Submissions
 */
 #sponsorTimesContributionsContainer {
diff --git a/src/popup.ts b/src/popup.ts
index 6be1f330..73d33f18 100644
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -75,6 +75,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     const PageElements: PageElements = {};
 
     [
+        "sponsorBlockPopupBody",
         "sponsorblockPopup",
         "sponsorStart",
         // Top toggles
@@ -132,7 +133,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
 
     getSegmentsFromContentScript(false);
     await utils.wait(() => Config.config !== null && allowPopup, 5000, 5);
-    document.querySelector("body").style.removeProperty("visibility");
+    PageElements.sponsorBlockPopupBody.style.removeProperty("visibility");
     if (!Config.configSyncListeners.includes(contentConfigUpdateListener)) {
         Config.configSyncListeners.push(contentConfigUpdateListener);
     }
@@ -145,6 +146,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
 
     if (window !== window.top) {
         PageElements.sbCloseButton.classList.remove("hidden");
+        PageElements.sponsorBlockPopupBody.classList.add("is-embedded");
     }
 
     // Hide donate button if wanted (Safari, or user choice)
@@ -187,7 +189,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     if (window !== window.top) {
         document.addEventListener("keydown", (e) => {
             const target = e.target as HTMLElement;
-            if (target.tagName === "INPUT" 
+            if (target.tagName === "INPUT"
                 || target.tagName === "TEXTAREA"
                 || e.key === "ArrowUp"
                 || e.key === "ArrowDown") {
@@ -255,7 +257,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                 }
                 PageElements.sponsorTimesOthersTimeSavedDisplay.innerText = getFormattedHours(minutesSaved);
             }
-            
+
             Config.config.isVip = userInfo.vip;
         }
     });
@@ -489,7 +491,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                 }
 
                 segmentTimeFromToNode.style.margin = "5px";
-                
+
                 // for inline-styling purposes
                 const labelContainer = document.createElement("div");
                 labelContainer.appendChild(categoryColorCircle);