@trackunit/react-graphql-hooks 1.13.5 → 1.13.6

package/index.cjs.js

@@ -212,38 +212,23 @@ const useStableVariables = (variables) => {
         onChange: setStableVariables,
         skip: !Boolean(variables),
     });
-    return [stableVariables, setStableVariables];
+    return stableVariables;
 };
 /**
  * Hook to manage AbortController for cancellable requests.
  * Returns an abort signal that can be passed to fetch requests and a function to create new controllers.
  */
-const useAbortableRequest = (props, setStableVariables) => {
-    const [abortController, setAbortController] = react.useState(() => new AbortController());
-    const [prevVariables, setPrevVariables] = react.useState(props.variables);
-    const [lastAbortController, setLastAbortController] = react.useState(undefined);
-    if (!esToolkit.isEqual(props.variables, prevVariables)) {
-        setPrevVariables(props.variables);
-        setStableVariables(props.variables);
-        if (!props.skip) {
-            if (lastAbortController) {
-                lastAbortController.abort();
-            }
-            const newAbortController = new AbortController();
-            setLastAbortController(newAbortController);
-            setAbortController(newAbortController);
-        }
-    }
-    const abortControllerRef = react.useRef(abortController);
-    react.useEffect(() => {
-        abortControllerRef.current = abortController;
-    }, [abortController]);
-    // Cleanup on unmount only
+const useAbortableRequest = () => {
+    const [abortController] = react.useState(() => new AbortController());
+    const firstRender = reactComponents.useIsFirstRender();
     react.useEffect(() => {
+        if (firstRender) {
+            return;
+        }
         return () => {
-            abortControllerRef.current.abort();
+            abortController.abort();
         };
-    }, []);
+    }, [abortController, firstRender]);
     return { abortSignal: abortController.signal };
 };
 /**
@@ -304,9 +289,9 @@ const usePaginationQuery = (document, props) => {
         resetTrigger: 0,
     });
     // Stabilize variables to prevent unnecessary re-fetches
-    const [stableVariables, setStableVariables] = useStableVariables(props.variables);
+    const stableVariables = useStableVariables(props.variables);
     // Manage abort controller for cancellable requests
-    const { abortSignal } = useAbortableRequest(props, setStableVariables);
+    const { abortSignal } = useAbortableRequest();
     const internalProps = react.useMemo(() => {
         return {
             ...props,

package/index.esm.js

@@ -2,9 +2,9 @@ import 'react/jsx-runtime';
 import { registerTranslations } from '@trackunit/i18n-library-translation';
 import { truthy, objectKeys } from '@trackunit/shared-utils';
 import { useLazyQuery as useLazyQuery$1, NetworkStatus, useQuery as useQuery$1 } from '@apollo/client';
-import { omit, isEqual } from 'es-toolkit';
+import { omit } from 'es-toolkit';
 import { useMemo, useReducer, useCallback, useEffect, useState, useRef } from 'react';
-import { useRelayPagination, defaultPageSize, useWatch } from '@trackunit/react-components';
+import { useRelayPagination, defaultPageSize, useWatch, useIsFirstRender } from '@trackunit/react-components';
 
 var defaultTranslations = {
 	
@@ -210,38 +210,23 @@ const useStableVariables = (variables) => {
         onChange: setStableVariables,
         skip: !Boolean(variables),
     });
-    return [stableVariables, setStableVariables];
+    return stableVariables;
 };
 /**
  * Hook to manage AbortController for cancellable requests.
  * Returns an abort signal that can be passed to fetch requests and a function to create new controllers.
  */
-const useAbortableRequest = (props, setStableVariables) => {
-    const [abortController, setAbortController] = useState(() => new AbortController());
-    const [prevVariables, setPrevVariables] = useState(props.variables);
-    const [lastAbortController, setLastAbortController] = useState(undefined);
-    if (!isEqual(props.variables, prevVariables)) {
-        setPrevVariables(props.variables);
-        setStableVariables(props.variables);
-        if (!props.skip) {
-            if (lastAbortController) {
-                lastAbortController.abort();
-            }
-            const newAbortController = new AbortController();
-            setLastAbortController(newAbortController);
-            setAbortController(newAbortController);
-        }
-    }
-    const abortControllerRef = useRef(abortController);
-    useEffect(() => {
-        abortControllerRef.current = abortController;
-    }, [abortController]);
-    // Cleanup on unmount only
+const useAbortableRequest = () => {
+    const [abortController] = useState(() => new AbortController());
+    const firstRender = useIsFirstRender();
     useEffect(() => {
+        if (firstRender) {
+            return;
+        }
         return () => {
-            abortControllerRef.current.abort();
+            abortController.abort();
         };
-    }, []);
+    }, [abortController, firstRender]);
     return { abortSignal: abortController.signal };
 };
 /**
@@ -302,9 +287,9 @@ const usePaginationQuery = (document, props) => {
         resetTrigger: 0,
     });
     // Stabilize variables to prevent unnecessary re-fetches
-    const [stableVariables, setStableVariables] = useStableVariables(props.variables);
+    const stableVariables = useStableVariables(props.variables);
     // Manage abort controller for cancellable requests
-    const { abortSignal } = useAbortableRequest(props, setStableVariables);
+    const { abortSignal } = useAbortableRequest();
     const internalProps = useMemo(() => {
         return {
             ...props,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-graphql-hooks",
-  "version": "1.13.5",
+  "version": "1.13.6",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {