@cubejs-client/react 0.30.4 → 0.30.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/react",
-  "version": "0.30.4",
+  "version": "0.30.40",
   "author": "Cube Dev, Inc.",
   "license": "MIT",
   "engines": {},
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@cubejs-client/core": "^0.30.4",
+    "@cubejs-client/core": "^0.30.29",
     "anser": "^2.0.1",
     "core-js": "^3.6.5",
     "html-entities": "^2.3.2",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "react": ">=16.10.2"
   },
-  "gitHead": "b7df8f6a3cfe104e639e0f7607868afa193ed0a3"
+  "gitHead": "001a804bafb808cb7bd027c81387998e7c8a45e4"
 }

package/src/hooks/cube-query.js

@@ -3,10 +3,11 @@ import { isQueryPresent, areQueriesEqual } from '@cubejs-client/core';
 
 import CubeContext from '../CubeContext';
 import useDeepCompareMemoize from './deep-compare-memoize';
+import { useIsMounted } from './is-mounted';
 
 export function useCubeQuery(query, options = {}) {
   const mutexRef = useRef({});
-  const isMounted = useRef(true);
+  const isMounted = useIsMounted();
   const [currentQuery, setCurrentQuery] = useState(null);
   const [isLoading, setLoading] = useState(false);
   const [resultSet, setResultSet] = useState(null);
@@ -40,29 +41,23 @@ export function useCubeQuery(query, options = {}) {
         progressCallback,
       });
 
-      if (isMounted.current) {
+      if (isMounted()) {
         setResultSet(response);
         setProgress(null);
       }
     } catch (error) {
-      if (isMounted.current) {
+      if (isMounted()) {
         setError(error);
         setResultSet(null);
         setProgress(null);
       }
     }
 
-    if (isMounted.current) {
+    if (isMounted()) {
       setLoading(false);
     }
   }
 
-  useEffect(() => {
-    return () => {
-      isMounted.current = false;
-    };
-  }, []);
-
   useEffect(() => {
     const { skip = false, resetResultSetOnChange } = options;
 
@@ -99,7 +94,7 @@ export function useCubeQuery(query, options = {}) {
                 progressCallback,
               },
               (e, result) => {
-                if (isMounted.current) {
+                if (isMounted()) {
                   if (e) {
                     setError(e);
                   } else {
@@ -114,7 +109,7 @@ export function useCubeQuery(query, options = {}) {
             await fetch();
           }
         } catch (e) {
-          if (isMounted.current) {
+          if (isMounted()) {
             setError(e);
             setResultSet(null);
             setLoading(false);

package/src/hooks/is-mounted.js

@@ -1,9 +1,11 @@
 import { useEffect, useRef } from 'react';
 
 export function useIsMounted() {
-  const isMounted = useRef(true);
+  const isMounted = useRef(false);
 
   useEffect(() => {
+    isMounted.current = true;
+
     return () => {
       isMounted.current = false;
     };