From fc3fd04834b2244e6065cb3f383eb4c43c16baab Mon Sep 17 00:00:00 2001
From: Rohid <rohidul209@gmail.com>
Date: Thu, 29 Aug 2024 14:37:20 +0600
Subject: [PATCH] prevent infinite update

---
 src/components/Options.tsx | 87 ++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/components/Options.tsx b/src/components/Options.tsx
index c114ac8..f537e72 100644
--- a/src/components/Options.tsx
+++ b/src/components/Options.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import config, { SuccessOrFailType } from '../config/config';
 import apiKeyInvalid from '../utils/apiKey';
 import { IS_CHROME } from '../utils/operatingSystem';
@@ -31,15 +31,17 @@ export default function Options(): JSX.Element {
     trackSocialMedia: config.trackSocialMedia,
   });
 
+  const isApiKeyValid = useMemo(() => apiKeyInvalid(state.apiKey) === '', [state.apiKey]);
+
   const loggingStyleRef = useRef(null);
 
-  const restoreSettings = useCallback(async (): Promise<void> => {
+  const restoreSettings = useCallback(async () => {
     const settings = await getSettings();
-    setState({
-      ...state,
+    setState((oldState) => ({
+      ...oldState,
       ...settings,
-    });
-  }, [state]);
+    }));
+  }, []);
 
   useEffect(() => {
     void restoreSettings();
@@ -47,7 +49,7 @@ export default function Options(): JSX.Element {
 
   const handleSubmit = async () => {
     if (state.loading) return;
-    setState({ ...state, loading: true });
+    setState((oldState) => ({ ...oldState, loading: true }));
     if (state.apiUrl.endsWith('/')) {
       state.apiUrl = state.apiUrl.slice(0, -1);
     }
@@ -72,50 +74,47 @@ export default function Options(): JSX.Element {
     }
   };
 
-  const updateDenyListState = useCallback(
-    (sites: string) => {
-      setState({
-        ...state,
-        denyList: sites.trim().split('\n'),
-      });
-    },
-    [state],
-  );
+  const updateDenyListState = useCallback((sites: string) => {
+    setState((oldState) => ({
+      ...oldState,
+      denyList: sites.trim().split('\n'),
+    }));
+  }, []);
 
-  const updateAllowListState = useCallback(
-    (sites: string) => {
-      setState({
-        ...state,
-        allowList: sites.trim().split('\n'),
-      });
-    },
-    [state],
-  );
+  const updateAllowListState = useCallback((sites: string) => {
+    setState((oldState) => ({
+      ...oldState,
+      allowList: sites.trim().split('\n'),
+    }));
+  }, []);
 
-  const updateLoggingStyle = (style: string) => {
-    setState({
-      ...state,
+  const updateLoggingStyle = useCallback((style: string) => {
+    setState((oldState) => ({
+      ...oldState,
       loggingStyle: style === 'allow' ? 'allow' : 'deny',
-    });
-  };
+    }));
+  }, []);
 
-  const updateLoggingType = (type: string) => {
-    setState({
-      ...state,
+  const updateLoggingType = useCallback((type: string) => {
+    setState((oldState) => ({
+      ...oldState,
       loggingType: type === 'url' ? 'url' : 'domain',
-    });
-  };
+    }));
+  }, []);
 
-  const updateTheme = (theme: string) => {
-    setState({
-      ...state,
+  const updateTheme = useCallback((theme: string) => {
+    setState((oldState) => ({
+      ...oldState,
       theme: theme === 'light' ? 'light' : 'dark',
-    });
-  };
+    }));
+  }, []);
 
-  const toggleSocialMedia = () => {
-    setState({ ...state, trackSocialMedia: !state.trackSocialMedia });
-  };
+  const toggleSocialMedia = useCallback(() => {
+    setState((oldState) => ({
+      ...oldState,
+      trackSocialMedia: !oldState.trackSocialMedia,
+    }));
+  }, []);
 
   const loggingStyle = useCallback(() => {
     // TODO: rewrite SitesList to be structured inputs instead of textarea
@@ -147,8 +146,6 @@ export default function Options(): JSX.Element {
     updateDenyListState,
   ]);
 
-  const isApiKeyValid = apiKeyInvalid(state.apiKey) === '';
-
   return (
     <div className="container">
       <div className="row">