fix: updating robust timeout refetch fn

WatWowMap · Jan 12, 2024 · ff84870 · ff84870
1 parent 8895edd
commit ff84870
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/QueryData.jsx b/src/components/QueryData.jsx
@@ -141,11 +141,13 @@ function QueryData({ category, timeout }) {
     if (active) {
       timeout.current.setupTimeout(refetch)
       return () => {
-        useMemory.setState({ excludeList: [] })
+        useMemory.setState((prev) => ({
+          excludeList: prev.excludeList.length ? [] : prev.excludeList,
+        }))
         timeout.current.off()
       }
     }
-  }, [active, refetch, timeout])
+  }, [active, refetch, timeout.current])
 
   React.useEffect(() => {
     const refetchData = () => {
@@ -161,7 +163,7 @@ function QueryData({ category, timeout }) {
     return () => {
       map.off('fetchdata', refetchData)
     }
-  }, [filters, userSettings, onlyAreas])
+  }, [filters, userSettings, onlyAreas, timeout.current.refetch])
 
   if (error) {
     // @ts-ignore

diff --git a/src/services/apollo/RobustTimeout.js b/src/services/apollo/RobustTimeout.js
@@ -51,5 +51,7 @@ export default class RobustTimeout extends AbortableContext {
 
   off() {
     clearTimeout(this.timeout)
+    this.refetch = null
+    delete this._pendingVariables
   }
 }