@trackunit/react-graphql-hooks 1.15.14 → 1.15.15

package/index.cjs.js

@@ -474,19 +474,26 @@ const usePaginationQuery = (document, props) => {
     react.useEffect(() => {
         isInitializedRef.current = true;
     }, []);
-    // Fetch the initial page on mount, whenever resetTrigger changes, or when
-    // skip transitions (so an initially-skipped query fires once unskipped).
+    reactComponents.useWatch({
+        value: props.skip,
+        onChange: (skip, prevSkip) => {
+            if (prevSkip && !skip) {
+                dispatch({ type: "INCREMENT_RESET_TRIGGER" });
+            }
+        },
+    });
+    // Fetch the initial page on mount and whenever resetTrigger changes.
     // Variable changes flow through the reset effect above which increments
-    // resetTrigger, so stableVariables is intentionally NOT a dependency here.
+    // resetTrigger. Skip true→false transitions increment it via the effect above.
+    const fetchVariables = react.useMemo(() => ({
+        first: latestRef.current.first ?? pageSize,
+        last: undefined,
+        before: undefined,
+        after: latestRef.current.after ?? undefined,
+    }), [pageSize]);
     react.useEffect(() => {
-        const fetchVariables = {
-            first: latestRef.current.first ?? pageSize,
-            last: undefined,
-            before: undefined,
-            after: latestRef.current.after ?? undefined,
-        };
         latestRef.current.executeFetch(fetchVariables, undefined, "initial");
-    }, [state.resetTrigger, pageSize, props.skip]);
+    }, [state.resetTrigger, fetchVariables]);
     // Fetch next/previous page when relay cursor changes
     react.useEffect(() => {
         if (!hasLoadedDataRef.current) {

package/index.esm.js

@@ -3,7 +3,7 @@ import { registerTranslations } from '@trackunit/i18n-library-translation';
 import { useLazyQuery as useLazyQuery$1, NetworkStatus, useQuery as useQuery$1 } from '@apollo/client';
 import { omit, isEqual } from 'es-toolkit';
 import { useMemo, useState, useReducer, useRef, useEffect, useCallback } from 'react';
-import { defaultPageSize, useRelayPagination } from '@trackunit/react-components';
+import { defaultPageSize, useRelayPagination, useWatch } from '@trackunit/react-components';
 import { truthy, objectKeys } from '@trackunit/shared-utils';
 
 var defaultTranslations = {
@@ -472,19 +472,26 @@ const usePaginationQuery = (document, props) => {
     useEffect(() => {
         isInitializedRef.current = true;
     }, []);
-    // Fetch the initial page on mount, whenever resetTrigger changes, or when
-    // skip transitions (so an initially-skipped query fires once unskipped).
+    useWatch({
+        value: props.skip,
+        onChange: (skip, prevSkip) => {
+            if (prevSkip && !skip) {
+                dispatch({ type: "INCREMENT_RESET_TRIGGER" });
+            }
+        },
+    });
+    // Fetch the initial page on mount and whenever resetTrigger changes.
     // Variable changes flow through the reset effect above which increments
-    // resetTrigger, so stableVariables is intentionally NOT a dependency here.
+    // resetTrigger. Skip true→false transitions increment it via the effect above.
+    const fetchVariables = useMemo(() => ({
+        first: latestRef.current.first ?? pageSize,
+        last: undefined,
+        before: undefined,
+        after: latestRef.current.after ?? undefined,
+    }), [pageSize]);
     useEffect(() => {
-        const fetchVariables = {
-            first: latestRef.current.first ?? pageSize,
-            last: undefined,
-            before: undefined,
-            after: latestRef.current.after ?? undefined,
-        };
         latestRef.current.executeFetch(fetchVariables, undefined, "initial");
-    }, [state.resetTrigger, pageSize, props.skip]);
+    }, [state.resetTrigger, fetchVariables]);
     // Fetch next/previous page when relay cursor changes
     useEffect(() => {
         if (!hasLoadedDataRef.current) {

package/package.json

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