✨ Popup can enable for a disabled tab

FrostCo · Mar 20, 2024 · 57911cf · 57911cf
1 parent bef5955
commit 57911cf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/script/background.ts b/src/script/background.ts
@@ -291,6 +291,9 @@ export default class Background {
         } else if (request.backgroundData) {
           this.handleBackgroundDataRequest(request, sender, sendResponse);
           return true; // return true when waiting on an async call
+        } else if (request.enableTab) {
+          this.toggleTabDisable(request.tabId, false, sendResponse);
+          return true; // return true when waiting on an async call
         } else {
           this.LOGGER.error('Received unhandled message.', JSON.stringify(request));
         }
@@ -393,12 +396,13 @@ export default class Background {
     }
   }
 
-  static async toggleTabDisable(tabId: number) {
+  static async toggleTabDisable(tabId: number, reload = true, sendResponse = null) {
     const storage = await this.loadBackgroundStorage();
     const tabOptions = this.getTabOptions(storage, tabId);
     tabOptions.disabled = !tabOptions.disabled;
     await this.saveBackgroundStorage(storage);
-    chrome.tabs.reload(tabId);
+    if (reload) chrome.tabs.reload(tabId);
+    if (sendResponse) sendResponse(tabOptions.disabled);
   }
 
   static async updatePopupStatus(tabId: number, status?: number, sendResponse?) {

diff --git a/src/script/lib/globals.d.ts b/src/script/lib/globals.d.ts
@@ -32,6 +32,7 @@ interface Message {
   deep?: boolean;
   destination: string;
   disabled?: boolean;
+  enableTab?: boolean;
   forceUpdate?: boolean;
   getStatus?: boolean;
   globalVariable?: string;

diff --git a/src/script/popup.ts b/src/script/popup.ts
@@ -187,7 +187,6 @@ export default class Popup {
 
   handleDisabled() {
     this.setDomainSwitch(false);
-    if (this.disabledTab) this.disableDomainSwitch();
     this.disableOptions();
   }
 
@@ -382,9 +381,19 @@ export default class Popup {
 
   async toggle(prop: string) {
     if (!this.protected) {
-      this.domain[prop] = !this.domain[prop];
       try {
-        await this.domain.save(this.cfg);
+        if (this.disabledTab) {
+          const message = {
+            source: this.Class.Constants.MESSAGING.POPUP,
+            destination: this.Class.Constants.MESSAGING.BACKGROUND,
+            enableTab: true,
+            tabId: this.tab.id,
+          };
+          this.disabledTab = await chrome.runtime.sendMessage(message);
+        } else {
+          this.domain[prop] = !this.domain[prop];
+          await this.domain.save(this.cfg);
+        }
         chrome.tabs.reload();
         this.populateOptions();
       } catch (err) {