@trackunit/react-graphql-hooks 0.0.13 → 0.0.17

package/index.cjs.js

@@ -162,10 +162,19 @@ const usePaginationQuery = (document, props) => {
         /**
          * To support pagination with page and pageSize, we need to convert the variables from first and after.
          */
-        const fetchMoreVariables = Object.assign(Object.assign({}, props.variables), (props.variables && "page" in props.variables && "pageSize" in props.variables
+        let fetchMoreVariables = Object.assign(Object.assign({}, props.variables), (props.variables && "page" in props.variables && "pageSize" in props.variables
             ? // eslint-disable-next-line local-rules/no-typescript-assertion
                 { pageSize: variables.first, page: Number(variables.after) || 0 }
             : Object.assign({}, variables)));
+        // To support "pageable" queries we do it here! REMOVE once the serviceplans are updated to use the new pagination.
+        fetchMoreVariables = Object.assign({}, ("pageable" in fetchMoreVariables
+            ? Object.assign(Object.assign({}, fetchMoreVariables), { pageable: {
+                    first: fetchMoreVariables.first,
+                    last: fetchMoreVariables.last,
+                    before: fetchMoreVariables.before,
+                    after: fetchMoreVariables.after,
+                    pageSize: fetchMoreVariables.pageSize,
+                } }) : Object.assign({}, fetchMoreVariables)));
         fetchMore({
             variables: fetchMoreVariables,
             updateQuery: (_, { fetchMoreResult }) => {
@@ -192,9 +201,10 @@ const usePaginationQuery = (document, props) => {
     }, [setIsLoading, props, fetchMore, setPageInfo]);
     react.useEffect(() => {
         setData(undefined);
-    }, [props.variables]);
+        reset();
+    }, [props.variables, reset]);
     react.useEffect(() => {
-        const abortController = doFetchMore({ first: first, last: undefined, before: undefined, after: undefined }, undefined);
+        const abortController = doFetchMore({ first, last: undefined, before: undefined, after: undefined }, undefined);
         return () => {
             abortController.abort();
         };

package/index.esm.js

@@ -138,10 +138,19 @@ const usePaginationQuery = (document, props) => {
         /**
          * To support pagination with page and pageSize, we need to convert the variables from first and after.
          */
-        const fetchMoreVariables = Object.assign(Object.assign({}, props.variables), (props.variables && "page" in props.variables && "pageSize" in props.variables
+        let fetchMoreVariables = Object.assign(Object.assign({}, props.variables), (props.variables && "page" in props.variables && "pageSize" in props.variables
             ? // eslint-disable-next-line local-rules/no-typescript-assertion
                 { pageSize: variables.first, page: Number(variables.after) || 0 }
             : Object.assign({}, variables)));
+        // To support "pageable" queries we do it here! REMOVE once the serviceplans are updated to use the new pagination.
+        fetchMoreVariables = Object.assign({}, ("pageable" in fetchMoreVariables
+            ? Object.assign(Object.assign({}, fetchMoreVariables), { pageable: {
+                    first: fetchMoreVariables.first,
+                    last: fetchMoreVariables.last,
+                    before: fetchMoreVariables.before,
+                    after: fetchMoreVariables.after,
+                    pageSize: fetchMoreVariables.pageSize,
+                } }) : Object.assign({}, fetchMoreVariables)));
         fetchMore({
             variables: fetchMoreVariables,
             updateQuery: (_, { fetchMoreResult }) => {
@@ -168,9 +177,10 @@ const usePaginationQuery = (document, props) => {
     }, [setIsLoading, props, fetchMore, setPageInfo]);
     useEffect(() => {
         setData(undefined);
-    }, [props.variables]);
+        reset();
+    }, [props.variables, reset]);
     useEffect(() => {
-        const abortController = doFetchMore({ first: first, last: undefined, before: undefined, after: undefined }, undefined);
+        const abortController = doFetchMore({ first, last: undefined, before: undefined, after: undefined }, undefined);
         return () => {
             abortController.abort();
         };

package/package.json

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