fix: bug when there are iframes

tolgee · Apr 17, 2024 · 7ec5dfc · 7ec5dfc
1 parent 587c41d
commit 7ec5dfc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/content/contentScript.ts b/src/content/contentScript.ts
@@ -56,8 +56,6 @@ messages.startRuntimeListening();
 messages.listenRuntime('DETECT_TOLGEE', async () => {
   if (configuration) {
     messages.sendToPlugin('TOLGEE_CONFIG_LOADED', configuration);
-  } else {
-    messages.sendToPlugin('TOLGEE_CONFIG_NOT_LOADED');
   }
 });
 

diff --git a/src/popup/useDetectorForm.tsx b/src/popup/useDetectorForm.tsx
@@ -167,6 +167,22 @@ export const useDetectorForm = () => {
     });
   }, []);
 
+  // timeout when Tolgee is not detected
+  useEffect(() => {
+    if (!state.libConfig) {
+      const timer = setTimeout(
+        () =>
+          dispatch({
+            type: 'CHANGE_LIB_CONFIG',
+            payload: { frameId: null, libData: null },
+          }),
+        300
+      );
+      return () => clearTimeout(timer);
+    }
+    return undefined;
+  }, [state.libConfig]);
+
   // after tolgee config is loaded
   // get applied values and stored values
   const onLibConfigChange = async () => {
@@ -199,11 +215,6 @@ export const useDetectorForm = () => {
           type: 'CHANGE_LIB_CONFIG',
           payload: { libData: data, frameId: frameId || null },
         });
-      } else if (type === 'TOLGEE_CONFIG_NOT_LOADED') {
-        dispatch({
-          type: 'CHANGE_LIB_CONFIG',
-          payload: { libData: null, frameId: null },
-        });
       }
     };
     chrome.runtime.onMessage.addListener(listener);