@panneau/core 3.0.136 → 3.0.140

package/es/hooks.js

@@ -1119,63 +1119,64 @@ var useItemSelection = function useItemSelection(_ref) {
     selectedItems = _useState2[0],
     setSelectedItems = _useState2[1];
   var onSelectItem = useCallback(function (item, index) {
-    var newItems = selectedItems !== null && multipleSelection ? [].concat(_toConsumableArray(selectedItems), [item]) : [item];
-    setSelectedItems(newItems);
-    if (onSelectionChange !== null) {
-      onSelectionChange(newItems, item, index);
-    }
-  }, [selectedItems, onSelectionChange, multipleSelection]);
-  var onDeselectItem = useCallback(function (item, index) {
     var _ref2 = item || {},
       _ref2$id = _ref2.id,
       itemId = _ref2$id === void 0 ? null : _ref2$id;
-    var newItems = (selectedItems || []).filter(function (_ref3) {
+    var oldItem = (selectedItems || []).find(function (_ref3) {
       var id = _ref3.id;
-      return id !== itemId;
-    });
+      return id === itemId;
+    }) || null;
+    var newItems = [];
+    if (oldItem === null) {
+      newItems = selectedItems !== null && multipleSelection ? [].concat(_toConsumableArray(selectedItems), [item]) : [item];
+    } else {
+      newItems = (selectedItems || []).filter(function (_ref4) {
+        var id = _ref4.id;
+        return id !== itemId;
+      });
+    }
     setSelectedItems(newItems);
     if (onSelectionChange !== null) {
-      onSelectionChange(multipleSelection ? newItems : null, item, index);
+      onSelectionChange(newItems, item, index);
     }
   }, [selectedItems, onSelectionChange, multipleSelection]);
   var onSelectPage = useCallback(function () {
-    var nextItems = uniqBy([].concat(_toConsumableArray(items || []), _toConsumableArray(selectedItems || [])), function () {
-      var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref4$id = _ref4.id,
-        id = _ref4$id === void 0 ? null : _ref4$id;
-      return id;
-    });
-    setSelectedItems(nextItems);
-    if (onSelectionChange !== null) {
-      onSelectionChange(nextItems);
+    var pageSelected = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    var nextItems = [];
+    if (!pageSelected) {
+      nextItems = uniqBy([].concat(_toConsumableArray(items || []), _toConsumableArray(selectedItems || [])), function () {
+        var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref5$id = _ref5.id,
+          id = _ref5$id === void 0 ? null : _ref5$id;
+        return id;
+      });
+    } else {
+      var ids = (items || []).map(function () {
+        var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref6$id = _ref6.id,
+          id = _ref6$id === void 0 ? null : _ref6$id;
+        return id;
+      }).filter(function (id) {
+        return id !== null;
+      });
+      nextItems = uniqBy((selectedItems || []).filter(function (it) {
+        var _ref7 = it || {},
+          _ref7$id = _ref7.id,
+          id = _ref7$id === void 0 ? null : _ref7$id;
+        return ids.indexOf(id) === -1;
+      }), function () {
+        var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref8$id = _ref8.id,
+          id = _ref8$id === void 0 ? null : _ref8$id;
+        return id;
+      });
     }
-  }, [items, selectedItems, setSelectedItems, onSelectionChange]);
-  var onDeselectPage = useCallback(function () {
-    var ids = (items || []).map(function () {
-      var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref5$id = _ref5.id,
-        id = _ref5$id === void 0 ? null : _ref5$id;
-      return id;
-    }).filter(function (id) {
-      return id !== null;
-    });
-    var nextItems = uniqBy((selectedItems || []).filter(function (it) {
-      var _ref6 = it || {},
-        _ref6$id = _ref6.id,
-        id = _ref6$id === void 0 ? null : _ref6$id;
-      return ids.indexOf(id) === -1;
-    }), 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;
-    });
     setSelectedItems(nextItems);
     if (onSelectionChange !== null) {
       onSelectionChange(nextItems);
     }
   }, [items, selectedItems, setSelectedItems, onSelectionChange]);
-  var onClearAll = useCallback(function () {
+  var onClearSelected = useCallback(function () {
     setSelectedItems([]);
     if (onSelectionChange !== null) {
       onSelectionChange([]);
@@ -1186,17 +1187,17 @@ var useItemSelection = function useItemSelection(_ref) {
   }, [initialSelectedItems]);
   var pageSelected = useMemo(function () {
     var ids = (items || []).map(function () {
-      var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref8$id = _ref8.id,
-        id = _ref8$id === void 0 ? null : _ref8$id;
+      var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        _ref9$id = _ref9.id,
+        id = _ref9$id === void 0 ? null : _ref9$id;
       return id;
     }).filter(function (id) {
       return id !== null;
     });
     var currentPageItems = (selectedItems || []).filter(function (it) {
-      var _ref9 = it || {},
-        _ref9$id = _ref9.id,
-        id = _ref9$id === void 0 ? null : _ref9$id;
+      var _ref10 = it || {},
+        _ref10$id = _ref10.id,
+        id = _ref10$id === void 0 ? null : _ref10$id;
       return ids.indexOf(id) !== -1;
     });
     return currentPageItems.length === (items || []).length && currentPageItems.length > 0;
@@ -1204,19 +1205,18 @@ var useItemSelection = function useItemSelection(_ref) {
   var allSelected = useMemo(function () {
     return selectedItems !== null && items !== null && selectedItems.length === items.length;
   }, [selectedItems, items]);
-  var countSelected = useMemo(function () {
+  var selectedCount = useMemo(function () {
     return selectedItems !== null && selectedItems.length > 0 ? selectedItems.length : null;
   }, [selectedItems]);
   return {
     onSelectItem: onSelectItem,
-    onDeselectItem: onDeselectItem,
     onSelectPage: onSelectPage,
-    onDeselectPage: onDeselectPage,
-    onClearAll: onClearAll,
+    onClearSelected: onClearSelected,
     pageSelected: pageSelected,
     allSelected: allSelected,
-    count: countSelected,
-    selectedItems: selectedItems
+    selectedCount: selectedCount,
+    selectedItems: selectedItems,
+    setSelectedItems: setSelectedItems
   };
 };
 var useItemSelection$1 = useItemSelection;

package/lib/hooks.js

@@ -1121,63 +1121,64 @@ var useItemSelection = function useItemSelection(_ref) {
     selectedItems = _useState2[0],
     setSelectedItems = _useState2[1];
   var onSelectItem = react.useCallback(function (item, index) {
-    var newItems = selectedItems !== null && multipleSelection ? [].concat(_toConsumableArray(selectedItems), [item]) : [item];
-    setSelectedItems(newItems);
-    if (onSelectionChange !== null) {
-      onSelectionChange(newItems, item, index);
-    }
-  }, [selectedItems, onSelectionChange, multipleSelection]);
-  var onDeselectItem = react.useCallback(function (item, index) {
     var _ref2 = item || {},
       _ref2$id = _ref2.id,
       itemId = _ref2$id === void 0 ? null : _ref2$id;
-    var newItems = (selectedItems || []).filter(function (_ref3) {
+    var oldItem = (selectedItems || []).find(function (_ref3) {
       var id = _ref3.id;
-      return id !== itemId;
-    });
+      return id === itemId;
+    }) || null;
+    var newItems = [];
+    if (oldItem === null) {
+      newItems = selectedItems !== null && multipleSelection ? [].concat(_toConsumableArray(selectedItems), [item]) : [item];
+    } else {
+      newItems = (selectedItems || []).filter(function (_ref4) {
+        var id = _ref4.id;
+        return id !== itemId;
+      });
+    }
     setSelectedItems(newItems);
     if (onSelectionChange !== null) {
-      onSelectionChange(multipleSelection ? newItems : null, item, index);
+      onSelectionChange(newItems, item, index);
     }
   }, [selectedItems, onSelectionChange, multipleSelection]);
   var onSelectPage = react.useCallback(function () {
-    var nextItems = uniqBy([].concat(_toConsumableArray(items || []), _toConsumableArray(selectedItems || [])), function () {
-      var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref4$id = _ref4.id,
-        id = _ref4$id === void 0 ? null : _ref4$id;
-      return id;
-    });
-    setSelectedItems(nextItems);
-    if (onSelectionChange !== null) {
-      onSelectionChange(nextItems);
+    var pageSelected = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    var nextItems = [];
+    if (!pageSelected) {
+      nextItems = uniqBy([].concat(_toConsumableArray(items || []), _toConsumableArray(selectedItems || [])), function () {
+        var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref5$id = _ref5.id,
+          id = _ref5$id === void 0 ? null : _ref5$id;
+        return id;
+      });
+    } else {
+      var ids = (items || []).map(function () {
+        var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref6$id = _ref6.id,
+          id = _ref6$id === void 0 ? null : _ref6$id;
+        return id;
+      }).filter(function (id) {
+        return id !== null;
+      });
+      nextItems = uniqBy((selectedItems || []).filter(function (it) {
+        var _ref7 = it || {},
+          _ref7$id = _ref7.id,
+          id = _ref7$id === void 0 ? null : _ref7$id;
+        return ids.indexOf(id) === -1;
+      }), function () {
+        var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref8$id = _ref8.id,
+          id = _ref8$id === void 0 ? null : _ref8$id;
+        return id;
+      });
     }
-  }, [items, selectedItems, setSelectedItems, onSelectionChange]);
-  var onDeselectPage = react.useCallback(function () {
-    var ids = (items || []).map(function () {
-      var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref5$id = _ref5.id,
-        id = _ref5$id === void 0 ? null : _ref5$id;
-      return id;
-    }).filter(function (id) {
-      return id !== null;
-    });
-    var nextItems = uniqBy((selectedItems || []).filter(function (it) {
-      var _ref6 = it || {},
-        _ref6$id = _ref6.id,
-        id = _ref6$id === void 0 ? null : _ref6$id;
-      return ids.indexOf(id) === -1;
-    }), 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;
-    });
     setSelectedItems(nextItems);
     if (onSelectionChange !== null) {
       onSelectionChange(nextItems);
     }
   }, [items, selectedItems, setSelectedItems, onSelectionChange]);
-  var onClearAll = react.useCallback(function () {
+  var onClearSelected = react.useCallback(function () {
     setSelectedItems([]);
     if (onSelectionChange !== null) {
       onSelectionChange([]);
@@ -1188,17 +1189,17 @@ var useItemSelection = function useItemSelection(_ref) {
   }, [initialSelectedItems]);
   var pageSelected = react.useMemo(function () {
     var ids = (items || []).map(function () {
-      var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref8$id = _ref8.id,
-        id = _ref8$id === void 0 ? null : _ref8$id;
+      var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        _ref9$id = _ref9.id,
+        id = _ref9$id === void 0 ? null : _ref9$id;
       return id;
     }).filter(function (id) {
       return id !== null;
     });
     var currentPageItems = (selectedItems || []).filter(function (it) {
-      var _ref9 = it || {},
-        _ref9$id = _ref9.id,
-        id = _ref9$id === void 0 ? null : _ref9$id;
+      var _ref10 = it || {},
+        _ref10$id = _ref10.id,
+        id = _ref10$id === void 0 ? null : _ref10$id;
       return ids.indexOf(id) !== -1;
     });
     return currentPageItems.length === (items || []).length && currentPageItems.length > 0;
@@ -1206,19 +1207,18 @@ var useItemSelection = function useItemSelection(_ref) {
   var allSelected = react.useMemo(function () {
     return selectedItems !== null && items !== null && selectedItems.length === items.length;
   }, [selectedItems, items]);
-  var countSelected = react.useMemo(function () {
+  var selectedCount = react.useMemo(function () {
     return selectedItems !== null && selectedItems.length > 0 ? selectedItems.length : null;
   }, [selectedItems]);
   return {
     onSelectItem: onSelectItem,
-    onDeselectItem: onDeselectItem,
     onSelectPage: onSelectPage,
-    onDeselectPage: onDeselectPage,
-    onClearAll: onClearAll,
+    onClearSelected: onClearSelected,
     pageSelected: pageSelected,
     allSelected: allSelected,
-    count: countSelected,
-    selectedItems: selectedItems
+    selectedCount: selectedCount,
+    selectedItems: selectedItems,
+    setSelectedItems: setSelectedItems
   };
 };
 var useItemSelection$1 = useItemSelection;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "3.0.136",
+    "version": "3.0.140",
     "description": "",
     "keywords": [
         "javascript"
@@ -111,5 +111,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "c9a3de330286a6cadd73651f1893adbbe090cd0e"
+    "gitHead": "f148a421cabe2dfa529d2df1eaae42d0f4bb32c5"
 }