fix show/hide examples, difficulty, rating not toggling instantly

zubyj · zubyj · commit cb4051ce1f8c · 2025-04-12T18:00:26.000-07:00
diff --git a/src/background/background.ts b/src/background/background.ts
@@ -51,6 +51,22 @@ chrome.runtime.onInstalled.addListener(() => {
 });
 
 chrome.runtime.onMessage.addListener((request) => {
+    // Direct path for settings updates
+    if (request.action === 'settingsUpdate') {
+        chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
+            const tab = tabs[0];
+            if (tab?.id && tab.url?.includes('leetcode.com/problems/')) {
+                chrome.tabs.sendMessage(tab.id, { 
+                    action: 'updateDescription', 
+                    title: tab.title || 'title',
+                    isSettingsUpdate: true
+                });
+            }
+        });
+        return;
+    }
+
+    // Existing message handlers
     if (request.action === 'openCompanyPage') {
         chrome.storage.local.set({ clickedCompany: request.company });
         chrome.tabs.create({
diff --git a/src/content-script/update-description-tab.ts b/src/content-script/update-description-tab.ts
@@ -371,9 +371,16 @@ function setupDescriptionThemeListener() {
 
 chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
     if (request.action === 'updateDescription') {
+        // For settings updates, bypass the state checks
+        if (request.isSettingsUpdate) {
+            console.log('Updating description tab due to settings change...');
+            updatePageContent();
+            return true;
+        }
+
         // Only detect theme on first load, problem change, or refresh
         if (!request.isProblemChange && !request.isRefresh) {
-            return;
+            return true;
         }
 
         console.log('Updating description tab...');
diff --git a/src/popup/settings.ts b/src/popup/settings.ts
@@ -115,6 +115,45 @@ document.addEventListener('DOMContentLoaded', () => {
         if (showRatingIcon) showRatingIcon.textContent = result.showRating ? '✅' : '❌';
     });
 
+    // Helper function to send messages safely to content script
+    function safelySendMessage(message: any) {
+        chrome.tabs.query({active: true, currentWindow: true}, (tabs) => {
+            const tabId = tabs[0]?.id;
+            if (!tabs || !tabs[0] || typeof tabId === 'undefined') {
+                return;
+            }
+            
+            try {
+                // Send message to background script for settings updates
+                if (message.action === 'updateDescription') {
+                    chrome.runtime.sendMessage({ action: 'settingsUpdate' });
+                    return;
+                }
+
+                // For other messages, send directly to content script
+                chrome.tabs.sendMessage(tabId, message, response => {
+                    if (chrome.runtime.lastError) {
+                        console.error('Error sending message:', chrome.runtime.lastError.message);
+                        // Attempt to inject the content script if it's not already injected
+                        chrome.scripting.executeScript({
+                            target: { tabId },
+                            files: ['dist/content-script/update-description-tab.js']
+                        }).then(() => {
+                            // Try sending the message again after injecting the script
+                            setTimeout(() => {
+                                chrome.tabs.sendMessage(tabId, message);
+                            }, 100);
+                        }).catch(err => {
+                            console.error('Error injecting content script:', err);
+                        });
+                    }
+                });
+            } catch (error) {
+                console.error('Error sending message:', error);
+            }
+        });
+    }
+
     // Set up toggle event handlers
     const showCompanyTagsBtn = document.getElementById('show-company-tags-btn');
     showCompanyTagsBtn && showCompanyTagsBtn.addEventListener('click', function () {
@@ -123,9 +162,7 @@ document.addEventListener('DOMContentLoaded', () => {
             chrome.storage.local.set({ showCompanyTags: showCompanyTags }, () => {
                 const showCompanyTagsIcon = document.getElementById('show-company-tags-icon');
                 showCompanyTagsIcon && (showCompanyTagsIcon.textContent = showCompanyTags ? '✅' : '❌');
-                chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-                    chrome.tabs.sendMessage(tabs[0].id || 0, { action: 'updateDescription', title: tabs[0].title || 'title' });
-                });
+                safelySendMessage({ action: 'updateDescription', title: document.title || 'title' });
             });
         });
     });
@@ -137,10 +174,7 @@ document.addEventListener('DOMContentLoaded', () => {
             chrome.storage.local.set({ showExamples: showExamples }, () => {
                 const showExamplesIcon = document.getElementById('show-examples-icon');
                 showExamplesIcon && (showExamplesIcon.textContent = showExamples ? '✅' : '❌');
-            });
-            // Manually trigger the update description after toggling
-            chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-                chrome.tabs.sendMessage(tabs[0].id || 0, { action: 'updateDescription', title: tabs[0].title || 'title' });
+                safelySendMessage({ action: 'updateDescription', title: document.title || 'title' });
             });
         });
     });
@@ -152,10 +186,7 @@ document.addEventListener('DOMContentLoaded', () => {
             chrome.storage.local.set({ showDifficulty: showDifficulty }, () => {
                 const showDifficultyIcon = document.getElementById('show-difficulty-icon');
                 if (showDifficultyIcon) showDifficultyIcon.textContent = showDifficulty ? '✅' : '❌';
-            });
-            // Manually trigger the update description after toggling
-            chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-                chrome.tabs.sendMessage(tabs[0].id || 0, { action: 'updateDescription', title: tabs[0].title || 'title' });
+                safelySendMessage({ action: 'updateDescription', title: document.title || 'title' });
             });
         });
     });
@@ -167,10 +198,7 @@ document.addEventListener('DOMContentLoaded', () => {
             chrome.storage.local.set({ showRating: showRating }, () => {
                 const showRatingIcon = document.getElementById('show-rating-icon');
                 if (showRatingIcon) showRatingIcon.textContent = showRating ? '✅' : '❌';
-            });
-            // Manually trigger the update description after toggling
-            chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-                chrome.tabs.sendMessage(tabs[0].id || 0, { action: 'updateDescription', title: tabs[0].title || 'title' });
+                safelySendMessage({ action: 'updateDescription', title: document.title || 'title' });
             });
         });
     });
