@panneau/data 3.0.174 → 3.0.175

package/es/index.js

@@ -75,7 +75,7 @@ var useData$1 = useData;
 
 var _excluded$3 = ["store", "url", "paginated", "query", "onQueryChange", "queryConfig", "keepData"],
   _excluded2$1 = ["page", "count"],
-  _excluded3 = ["data", "refetch", "isLoading", "isFetched", "status", "error"];
+  _excluded3 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched", "status", "error"];
 var useItems$2 = function useItems(_ref) {
   var store = _ref.store,
     url = _ref.url,
@@ -194,8 +194,10 @@ var useItems$2 = function useItems(_ref) {
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? null : _useQuery$data,
     reload = _useQuery.refetch,
-    loading = _useQuery.isLoading,
-    loaded = _useQuery.isFetched,
+    isLoading = _useQuery.isLoading,
+    isFetching = _useQuery.isFetching,
+    isRefetching = _useQuery.isRefetching,
+    isFetched = _useQuery.isFetched,
     _useQuery$status = _useQuery.status,
     status = _useQuery$status === void 0 ? null : _useQuery$status,
     _useQuery$error = _useQuery.error,
@@ -229,10 +231,10 @@ var useItems$2 = function useItems(_ref) {
   }, [query, onQueryChange]);
   var pages = useRef(null);
   useEffect(function () {
-    if (loaded && page !== null && data !== null) {
+    if (isFetched && page !== null && data !== null) {
       pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
     }
-  }, [loaded, page, data]);
+  }, [isFetched, page, data]);
   var finalItems = useMemo(function () {
     if (data === null) {
       return data;
@@ -270,6 +272,7 @@ var useItems$2 = function useItems(_ref) {
     var _pages$current$k;
     return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
   }) : null;
+  var finalLoading = isLoading || isFetching || isRefetching;
   return _objectSpread(_objectSpread({}, otherProps), {}, {
     items: finalItems,
     allItems: allItems,
@@ -282,10 +285,10 @@ var useItems$2 = function useItems(_ref) {
     } : null,
     total: total,
     lastPage: lastPage,
-    loaded: loaded,
-    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && loaded,
+    loaded: isFetched,
+    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && isFetched,
     // very basic stuff, TODO
-    loading: loading,
+    loading: finalLoading,
     loadNextPage: loadNextPage,
     loadPage: loadPage,
     reloadPage: reload,
@@ -605,9 +608,6 @@ var useItemsStore = function useItemsStore(store, _ref) {
   var queryKey = useMemo(function () {
     return paginated ? [store, page || 1, count || 12, queryWithoutPage] : [store, query];
   }, [paginated, store, page, count, query, queryWithoutPage, getPage, getItems]);
-
-  // console.log('queryKey', queryKey, 'paginated', paginated);
-
   var _useQuery = useQuery(_objectSpread(_objectSpread({
       queryKey: queryKey,
       queryFn: function queryFn(_ref3) {
@@ -741,6 +741,7 @@ var useItemsStore = function useItemsStore(store, _ref) {
     return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
   })) : finalItems;
   var finalLoading = isLoading || isFetching || isRefetching;
+  console.log(isLoading, isFetching, isRefetching, otherProps);
   return _objectSpread(_objectSpread({}, otherProps), {}, {
     isLoading: isLoading,
     isFetching: isFetching,

package/lib/index.js

@@ -739,7 +739,7 @@ var queryString = /*#__PURE__*/Object.freeze({
 
 var _excluded$3 = ["store", "url", "paginated", "query", "onQueryChange", "queryConfig", "keepData"],
   _excluded2$1 = ["page", "count"],
-  _excluded3 = ["data", "refetch", "isLoading", "isFetched", "status", "error"];
+  _excluded3 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched", "status", "error"];
 var useItems$2 = function useItems(_ref) {
   var store = _ref.store,
     url = _ref.url,
@@ -858,8 +858,10 @@ var useItems$2 = function useItems(_ref) {
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? null : _useQuery$data,
     reload = _useQuery.refetch,
-    loading = _useQuery.isLoading,
-    loaded = _useQuery.isFetched,
+    isLoading = _useQuery.isLoading,
+    isFetching = _useQuery.isFetching,
+    isRefetching = _useQuery.isRefetching,
+    isFetched = _useQuery.isFetched,
     _useQuery$status = _useQuery.status,
     status = _useQuery$status === void 0 ? null : _useQuery$status,
     _useQuery$error = _useQuery.error,
@@ -893,10 +895,10 @@ var useItems$2 = function useItems(_ref) {
   }, [query, onQueryChange]);
   var pages = React.useRef(null);
   React.useEffect(function () {
-    if (loaded && page !== null && data !== null) {
+    if (isFetched && page !== null && data !== null) {
       pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
     }
-  }, [loaded, page, data]);
+  }, [isFetched, page, data]);
   var finalItems = React.useMemo(function () {
     if (data === null) {
       return data;
@@ -934,6 +936,7 @@ var useItems$2 = function useItems(_ref) {
     var _pages$current$k;
     return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
   }) : null;
+  var finalLoading = isLoading || isFetching || isRefetching;
   return _objectSpread(_objectSpread({}, otherProps), {}, {
     items: finalItems,
     allItems: allItems,
@@ -946,10 +949,10 @@ var useItems$2 = function useItems(_ref) {
     } : null,
     total: total,
     lastPage: lastPage,
-    loaded: loaded,
-    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && loaded,
+    loaded: isFetched,
+    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && isFetched,
     // very basic stuff, TODO
-    loading: loading,
+    loading: finalLoading,
     loadNextPage: loadNextPage,
     loadPage: loadPage,
     reloadPage: reload,
@@ -1269,9 +1272,6 @@ var useItemsStore = function useItemsStore(store, _ref) {
   var queryKey = React.useMemo(function () {
     return paginated ? [store, page || 1, count || 12, queryWithoutPage] : [store, query];
   }, [paginated, store, page, count, query, queryWithoutPage, getPage, getItems]);
-
-  // console.log('queryKey', queryKey, 'paginated', paginated);
-
   var _useQuery = reactQuery.useQuery(_objectSpread(_objectSpread({
       queryKey: queryKey,
       queryFn: function queryFn(_ref3) {
@@ -1405,6 +1405,7 @@ var useItemsStore = function useItemsStore(store, _ref) {
     return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
   })) : finalItems;
   var finalLoading = isLoading || isFetching || isRefetching;
+  console.log(isLoading, isFetching, isRefetching, otherProps);
   return _objectSpread(_objectSpread({}, otherProps), {}, {
     isLoading: isLoading,
     isFetching: isFetching,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/data",
-    "version": "3.0.174",
+    "version": "3.0.175",
     "description": "",
     "keywords": [
         "javascript"
@@ -56,7 +56,7 @@
         "@babel/runtime": "^7.12.5",
         "@folklore/fetch": "^0.1.17",
         "@folklore/routes": "^0.2.26",
-        "@panneau/core": "^3.0.174",
+        "@panneau/core": "^3.0.175",
         "@tanstack/react-query": "^5.29.2",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -65,5 +65,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "0b3a328b97ef9e9c02f8cfe731ac50a1611dc854"
+    "gitHead": "cb8320f1041e7ced6bcf77dd6d32661950215a92"
 }