@panneau/data 3.0.194 → 3.0.208

package/es/index.js

@@ -12,9 +12,9 @@ import queryString from 'query-string';
 import { useQuery, keepPreviousData, QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import isEmpty from 'lodash/isEmpty';
-import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 
 var useData = function useData(loadData) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -76,6 +76,9 @@ var useData$1 = useData;
 var _excluded$3 = ["store", "url", "paginated", "query", "onQueryChange", "queryConfig", "keepData"],
   _excluded2$1 = ["page", "count"],
   _excluded3 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched", "status", "error"];
+
+// For backwards compatibility
+
 var useItems$2 = function useItems(_ref) {
   var store = _ref.store,
     url = _ref.url,
@@ -89,7 +92,7 @@ var useItems$2 = function useItems(_ref) {
     _ref$keepData = _ref.keepData,
     keepData = _ref$keepData === void 0 ? true : _ref$keepData,
     oldProps = _objectWithoutProperties(_ref, _excluded$3);
-  // Legacy
+  // Legacy compatibility
   var _ref2 = oldProps || {},
     _ref2$getPage = _ref2.getPage,
     getPage = _ref2$getPage === void 0 ? null : _ref2$getPage,
@@ -98,10 +101,9 @@ var useItems$2 = function useItems(_ref) {
     _ref2$page = _ref2.page,
     oldPage = _ref2$page === void 0 ? null : _ref2$page,
     _ref2$count = _ref2.count,
-    oldCount = _ref2$count === void 0 ? null : _ref2$count,
-    _ref2$items = _ref2.items,
-    providedItems = _ref2$items === void 0 ? null : _ref2$items,
-    _ref2$pages = _ref2.pages,
+    oldCount = _ref2$count === void 0 ? null : _ref2$count;
+    _ref2.items;
+    var _ref2$pages = _ref2.pages,
     initialPages = _ref2$pages === void 0 ? null : _ref2$pages,
     _ref2$getPageFromResp = _ref2.getPageFromResponse,
     getPageFromResponse = _ref2$getPageFromResp === void 0 ? function () {
@@ -159,7 +161,7 @@ var useItems$2 = function useItems(_ref) {
   var queryKey = useMemo(function () {
     return paginated && getPage !== null ? [store, page, count || 10, queryWithoutPageAndCount] : [store, query];
   }, [paginated, page, count, queryWithoutPageAndCount]);
-  var _useQuery = useQuery(_objectSpread(_objectSpread(_objectSpread({
+  var _useQuery = useQuery(_objectSpread(_objectSpread({
       queryKey: queryKey,
       queryFn: function queryFn(_ref5) {
         var key = _ref5.queryKey;
@@ -188,8 +190,6 @@ var useItems$2 = function useItems(_ref) {
       }
     }, keepData ? {
       placeholderData: keepPreviousData
-    } : null), providedItems !== null ? {
-      initialData: providedItems
     } : null), queryConfig)),
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? null : _useQuery$data,
@@ -231,19 +231,52 @@ var useItems$2 = function useItems(_ref) {
       }));
     }
   }, [query, onQueryChange]);
-  var pages = useRef(null);
-  useEffect(function () {
-    if (isFetched && page !== null && data !== null) {
-      pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
+
+  // Keep a list of updated items
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    updatedItems = _useState2[0],
+    setUpdatedItems = _useState2[1];
+  var updateItem = useCallback(function (item) {
+    var _ref8 = item || {},
+      _ref8$id = _ref8.id,
+      itemId = _ref8$id === void 0 ? null : _ref8$id;
+    if (itemId !== null) {
+      setUpdatedItems([].concat(_toConsumableArray((updatedItems || []).filter(function () {
+        var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref9$id = _ref9.id,
+          id = _ref9$id === void 0 ? null : _ref9$id;
+        return id !== itemId;
+      })), [item]));
+    }
+  }, [updatedItems, setUpdatedItems]);
+  var replaceUpdatedItems = useCallback(function (currentItems) {
+    if (currentItems === null || updatedItems === null || updatedItems.length === 0) {
+      return currentItems;
     }
-  }, [isFetched, page, data]);
-  var finalItems = useMemo(function () {
+    return (currentItems || []).map(function (item) {
+      var _ref10 = item || {},
+        _ref10$id = _ref10.id,
+        itemId = _ref10$id === void 0 ? null : _ref10$id;
+      var updated = (updatedItems || []).find(function () {
+        var _ref11 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref11$id = _ref11.id,
+          id = _ref11$id === void 0 ? null : _ref11$id;
+        return id === itemId;
+      }) || null;
+      if (updated !== null) {
+        return updated;
+      }
+      return item;
+    }, []);
+  }, [updatedItems]);
+  var partialItems = useMemo(function () {
     if (data === null) {
       return data;
     }
     if (paginated) {
       if (getPageFromResponse !== null) {
-        return items;
+        return getPageFromResponse(items);
       }
       return items;
     }
@@ -251,7 +284,8 @@ var useItems$2 = function useItems(_ref) {
       return getItemsFromResponse(data);
     }
     return data;
-  }, [items, data, paginated, getPageFromResponse, getItemsFromResponse]);
+  }, [items, data, paginated, getPageFromResponse, getItemsFromResponse, updatedItems]);
+  var finalItems = replaceUpdatedItems(partialItems);
 
   // Pseudo-events for compatibility
   useEffect(function () {
@@ -270,10 +304,16 @@ var useItems$2 = function useItems(_ref) {
       onError(error);
     }
   }, [status]);
-  var allItems = pages.current !== null ? Object.keys(pages.current).flatMap(function (k) {
+
+  // Keep a list of pages, useEffect wont work here because delayed
+  var pages = useRef(null);
+  if (isFetched && page !== null && data !== null) {
+    pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
+  }
+  var allItems = pages.current !== null ? replaceUpdatedItems(Object.keys(pages.current).flatMap(function (k) {
     var _pages$current$k;
     return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
-  }) : null;
+  })) : null;
   var finalLoading = isLoading || isFetching || isRefetching;
   return _objectSpread(_objectSpread({}, otherProps), {}, {
     items: finalItems,
@@ -296,7 +336,7 @@ var useItems$2 = function useItems(_ref) {
     reloadPage: reload,
     reload: reload,
     reset: reload,
-    updateItem: null,
+    updateItem: updateItem,
     status: status,
     error: error
   });
@@ -577,6 +617,9 @@ var useItems$1 = useItems;
 
 var _excluded$2 = ["page", "count"],
   _excluded2 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched"];
+
+// The new, better version
+
 var useItemsStore = function useItemsStore(store, _ref) {
   var _ref$url = _ref.url,
     url = _ref$url === void 0 ? null : _ref$url,
@@ -688,14 +731,14 @@ var useItemsStore = function useItemsStore(store, _ref) {
       _ref6$id = _ref6.id,
       itemId = _ref6$id === void 0 ? null : _ref6$id;
     if (itemId !== null) {
-      setUpdatedItems([].concat(_toConsumableArray((items || []).filter(function () {
+      setUpdatedItems([].concat(_toConsumableArray((updatedItems || []).filter(function () {
         var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
           _ref7$id = _ref7.id,
           id = _ref7$id === void 0 ? null : _ref7$id;
         return id !== itemId;
       })), [item]));
     }
-  }, [items, updatedItems, setUpdatedItems]);
+  }, [updatedItems, setUpdatedItems]);
   var replaceUpdatedItems = useCallback(function (currentItems) {
     if (currentItems === null || updatedItems === null || updatedItems.length === 0) {
       return currentItems;

package/lib/index.js

@@ -15,9 +15,9 @@ var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIter
 var reactQuery = require('@tanstack/react-query');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var isEmpty = require('lodash/isEmpty');
-var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 
 var useData = function useData(loadData) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -740,6 +740,9 @@ var queryString = /*#__PURE__*/Object.freeze({
 var _excluded$3 = ["store", "url", "paginated", "query", "onQueryChange", "queryConfig", "keepData"],
   _excluded2$1 = ["page", "count"],
   _excluded3 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched", "status", "error"];
+
+// For backwards compatibility
+
 var useItems$2 = function useItems(_ref) {
   var store = _ref.store,
     url = _ref.url,
@@ -753,7 +756,7 @@ var useItems$2 = function useItems(_ref) {
     _ref$keepData = _ref.keepData,
     keepData = _ref$keepData === void 0 ? true : _ref$keepData,
     oldProps = _objectWithoutProperties(_ref, _excluded$3);
-  // Legacy
+  // Legacy compatibility
   var _ref2 = oldProps || {},
     _ref2$getPage = _ref2.getPage,
     getPage = _ref2$getPage === void 0 ? null : _ref2$getPage,
@@ -762,10 +765,9 @@ var useItems$2 = function useItems(_ref) {
     _ref2$page = _ref2.page,
     oldPage = _ref2$page === void 0 ? null : _ref2$page,
     _ref2$count = _ref2.count,
-    oldCount = _ref2$count === void 0 ? null : _ref2$count,
-    _ref2$items = _ref2.items,
-    providedItems = _ref2$items === void 0 ? null : _ref2$items,
-    _ref2$pages = _ref2.pages,
+    oldCount = _ref2$count === void 0 ? null : _ref2$count;
+    _ref2.items;
+    var _ref2$pages = _ref2.pages,
     initialPages = _ref2$pages === void 0 ? null : _ref2$pages,
     _ref2$getPageFromResp = _ref2.getPageFromResponse,
     getPageFromResponse = _ref2$getPageFromResp === void 0 ? function () {
@@ -823,7 +825,7 @@ var useItems$2 = function useItems(_ref) {
   var queryKey = React.useMemo(function () {
     return paginated && getPage !== null ? [store, page, count || 10, queryWithoutPageAndCount] : [store, query];
   }, [paginated, page, count, queryWithoutPageAndCount]);
-  var _useQuery = reactQuery.useQuery(_objectSpread(_objectSpread(_objectSpread({
+  var _useQuery = reactQuery.useQuery(_objectSpread(_objectSpread({
       queryKey: queryKey,
       queryFn: function queryFn(_ref5) {
         var key = _ref5.queryKey;
@@ -852,8 +854,6 @@ var useItems$2 = function useItems(_ref) {
       }
     }, keepData ? {
       placeholderData: reactQuery.keepPreviousData
-    } : null), providedItems !== null ? {
-      initialData: providedItems
     } : null), queryConfig)),
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? null : _useQuery$data,
@@ -895,19 +895,52 @@ var useItems$2 = function useItems(_ref) {
       }));
     }
   }, [query, onQueryChange]);
-  var pages = React.useRef(null);
-  React.useEffect(function () {
-    if (isFetched && page !== null && data !== null) {
-      pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
+
+  // Keep a list of updated items
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    updatedItems = _useState2[0],
+    setUpdatedItems = _useState2[1];
+  var updateItem = React.useCallback(function (item) {
+    var _ref8 = item || {},
+      _ref8$id = _ref8.id,
+      itemId = _ref8$id === void 0 ? null : _ref8$id;
+    if (itemId !== null) {
+      setUpdatedItems([].concat(_toConsumableArray((updatedItems || []).filter(function () {
+        var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref9$id = _ref9.id,
+          id = _ref9$id === void 0 ? null : _ref9$id;
+        return id !== itemId;
+      })), [item]));
+    }
+  }, [updatedItems, setUpdatedItems]);
+  var replaceUpdatedItems = React.useCallback(function (currentItems) {
+    if (currentItems === null || updatedItems === null || updatedItems.length === 0) {
+      return currentItems;
     }
-  }, [isFetched, page, data]);
-  var finalItems = React.useMemo(function () {
+    return (currentItems || []).map(function (item) {
+      var _ref10 = item || {},
+        _ref10$id = _ref10.id,
+        itemId = _ref10$id === void 0 ? null : _ref10$id;
+      var updated = (updatedItems || []).find(function () {
+        var _ref11 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref11$id = _ref11.id,
+          id = _ref11$id === void 0 ? null : _ref11$id;
+        return id === itemId;
+      }) || null;
+      if (updated !== null) {
+        return updated;
+      }
+      return item;
+    }, []);
+  }, [updatedItems]);
+  var partialItems = React.useMemo(function () {
     if (data === null) {
       return data;
     }
     if (paginated) {
       if (getPageFromResponse !== null) {
-        return items;
+        return getPageFromResponse(items);
       }
       return items;
     }
@@ -915,7 +948,8 @@ var useItems$2 = function useItems(_ref) {
       return getItemsFromResponse(data);
     }
     return data;
-  }, [items, data, paginated, getPageFromResponse, getItemsFromResponse]);
+  }, [items, data, paginated, getPageFromResponse, getItemsFromResponse, updatedItems]);
+  var finalItems = replaceUpdatedItems(partialItems);
 
   // Pseudo-events for compatibility
   React.useEffect(function () {
@@ -934,10 +968,16 @@ var useItems$2 = function useItems(_ref) {
       onError(error);
     }
   }, [status]);
-  var allItems = pages.current !== null ? Object.keys(pages.current).flatMap(function (k) {
+
+  // Keep a list of pages, useEffect wont work here because delayed
+  var pages = React.useRef(null);
+  if (isFetched && page !== null && data !== null) {
+    pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
+  }
+  var allItems = pages.current !== null ? replaceUpdatedItems(Object.keys(pages.current).flatMap(function (k) {
     var _pages$current$k;
     return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
-  }) : null;
+  })) : null;
   var finalLoading = isLoading || isFetching || isRefetching;
   return _objectSpread(_objectSpread({}, otherProps), {}, {
     items: finalItems,
@@ -960,7 +1000,7 @@ var useItems$2 = function useItems(_ref) {
     reloadPage: reload,
     reload: reload,
     reset: reload,
-    updateItem: null,
+    updateItem: updateItem,
     status: status,
     error: error
   });
@@ -1241,6 +1281,9 @@ var useItems$1 = useItems;
 
 var _excluded$2 = ["page", "count"],
   _excluded2 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched"];
+
+// The new, better version
+
 var useItemsStore = function useItemsStore(store, _ref) {
   var _ref$url = _ref.url,
     url = _ref$url === void 0 ? null : _ref$url,
@@ -1352,14 +1395,14 @@ var useItemsStore = function useItemsStore(store, _ref) {
       _ref6$id = _ref6.id,
       itemId = _ref6$id === void 0 ? null : _ref6$id;
     if (itemId !== null) {
-      setUpdatedItems([].concat(_toConsumableArray((items || []).filter(function () {
+      setUpdatedItems([].concat(_toConsumableArray((updatedItems || []).filter(function () {
         var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
           _ref7$id = _ref7.id,
           id = _ref7$id === void 0 ? null : _ref7$id;
         return id !== itemId;
       })), [item]));
     }
-  }, [items, updatedItems, setUpdatedItems]);
+  }, [updatedItems, setUpdatedItems]);
   var replaceUpdatedItems = React.useCallback(function (currentItems) {
     if (currentItems === null || updatedItems === null || updatedItems.length === 0) {
       return currentItems;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/data",
-    "version": "3.0.194",
+    "version": "3.0.208",
     "description": "",
     "keywords": [
         "javascript"
@@ -65,5 +65,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "6d49da8ecbe43b3a5c11dc9ddb9553ef64e58c83"
+    "gitHead": "784e87ce65299b81ce5f139a676ded4d70f5cfb1"
 }