Merge pull request #1300 from aryan262/main

Performance Improvement
responsively-org · Sep 9, 2024 · 3bd8737 · 3bd8737
2 parents 61fc537 + 3785190
commit 3bd8737
Showing 1 changed file with 27 additions and 35 deletions.
diff --git a/browser-extension/src/popup.js b/browser-extension/src/popup.js
@@ -1,5 +1,5 @@
 import openCustomProtocolURI from "custom-protocol-check";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useCallback } from "react";
 import ReactDOM from "react-dom";
 import spinner from "./spinner.svg";
 
@@ -27,28 +27,23 @@ const isChrome = () => {
 
 const URLOpenerNonChrome = () => {
   const [status, setStatus] = useState("loading");
-  useEffect(() => {
-    (async () => {
-      const [tab] = await window.browser.tabs.query({
-        currentWindow: true,
-        active: true,
-      });
-      if (!tab || !tab.url) {
-        setStatus("false");
-        return;
-      }
-      openCustomProtocolURI(
-        `responsively://${tab.url}`,
-        () => {
-          setStatus("false");
-        },
-        () => {
-          setStatus("true");
-        }
-      );
-    })();
+  const checkProtocolAndUpdateStatus = useCallback(async () => {
+    const [tab] = await window.browser.tabs.query({ currentWindow: true, active: true });
+    if (!tab || !tab.url) {
+      setStatus("false");
+      return;
+    }
+    openCustomProtocolURI(
+      `responsively://${tab.url}`,
+      () => setStatus("false"),
+      () => setStatus("true")
+    );
   }, []);
 
+  useEffect(() => {
+    checkProtocolAndUpdateStatus();
+  }, [checkProtocolAndUpdateStatus]);
+
   if (status === "loading") {
     return (
       <div className="popup">
@@ -87,23 +82,20 @@ const URLOpenerNonChrome = () => {
 };
 
 const URLOpenerChrome = () => {
+  const updateTabURL = useCallback(async () => {
+    const [tab] = await window.browser.tabs.query({ currentWindow: true, active: true });
+    if (!tab || !tab.url) {
+      return;
+    }
+    window.browser.tabs.update({ url: `responsively://${tab.url}` });
+  }, []);
+
   useEffect(() => {
-    (async () => {
-      const [tab] = await window.browser.tabs.query({
-        currentWindow: true,
-        active: true,
-      });
-      if (!tab || !tab.url) {
-        return;
-      }
-      window.browser.tabs.update({
-        url: `responsively://${tab.url}`,
-      });
-    })();
-    return setTimeout(() => {
+    updateTabURL();
+    setTimeout(() => {
       window.close();
     }, 5000);
-  }, []);
+  }, [updateTabURL]);
 
   return (
     <div className="popup">