@panneau/core 3.0.136 → 3.0.142

package/es/contexts.js

@@ -265,7 +265,7 @@ var button = PropTypes.shape({
 });
 PropTypes.arrayOf(button);
 PropTypes.oneOf(['primary', 'secondary', 'success', 'danger', 'warning', 'info', 'light', 'dark', null]);
-PropTypes.oneOf(['lg', 'sm', null]);
+PropTypes.oneOf(['lg', 'md', 'sm', null]);
 PropTypes.oneOf(['button', 'submit']);
 PropTypes.oneOf(['start', 'end']);
 PropTypes.oneOf(['lg', 'sm', null]);

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/es/index.js

@@ -41,7 +41,7 @@ var button = PropTypes$1.shape({
 });
 var buttons = PropTypes$1.arrayOf(button);
 var buttonTheme = PropTypes$1.oneOf(['primary', 'secondary', 'success', 'danger', 'warning', 'info', 'light', 'dark', null]);
-var buttonSize = PropTypes$1.oneOf(['lg', 'sm', null]);
+var buttonSize = PropTypes$1.oneOf(['lg', 'md', 'sm', null]);
 var buttonType = PropTypes$1.oneOf(['button', 'submit']);
 var dropdownAlign = PropTypes$1.oneOf(['start', 'end']);
 var controlSize = PropTypes$1.oneOf(['lg', 'sm', null]);

package/lib/contexts.js

@@ -286,7 +286,7 @@ var button = PropTypes.shape({
 });
 PropTypes.arrayOf(button);
 PropTypes.oneOf(['primary', 'secondary', 'success', 'danger', 'warning', 'info', 'light', 'dark', null]);
-PropTypes.oneOf(['lg', 'sm', null]);
+PropTypes.oneOf(['lg', 'md', 'sm', null]);
 PropTypes.oneOf(['button', 'submit']);
 PropTypes.oneOf(['start', 'end']);
 PropTypes.oneOf(['lg', 'sm', null]);
@@ -1229,7 +1229,7 @@ if (typeof history !== "undefined" && typeof window[patchKey] === "undefined") {
   });
 }
 
-var _excluded3 = ["to", "href", "onClick", "asChild", "children", "replace", "state"];
+var _excluded3 = ["to", "href", "onClick", "asChild", "children", "className", "replace", "state"];
 
 /*
  * Transforms `path` into its relative `base` version
@@ -1272,7 +1272,11 @@ var defaultRouter = {
   base: "",
   // this option is used to override the current location during SSR
   ssrPath: undefined,
-  ssrSearch: undefined
+  ssrSearch: undefined,
+  // customizes how `href` props are transformed for <Link />
+  hrefs: function hrefs(x) {
+    return x;
+  }
 };
 var RouterCtx = React.createContext(defaultRouter);
 
@@ -1314,13 +1318,15 @@ React.forwardRef(function (props, ref) {
   var router = useRouter();
   var _useLocationFromRoute3 = useLocationFromRouter(router),
     _useLocationFromRoute4 = _slicedToArray(_useLocationFromRoute3, 2),
+    path = _useLocationFromRoute4[0],
     navigate = _useLocationFromRoute4[1];
   var to = props.to,
     _props$href = props.href,
     _href = _props$href === void 0 ? to : _props$href,
     _onClick = props.onClick,
     asChild = props.asChild,
-    children = props.children;
+    children = props.children,
+    cls = props.className;
     props.replace;
     props.state;
     var restProps = _objectWithoutProperties(props, _excluded3);
@@ -1328,7 +1334,7 @@ React.forwardRef(function (props, ref) {
     // ignores the navigation when clicked using right mouse button or
     // by holding a special modifier key: ctrl, command, win, alt, shift
     if (event.ctrlKey || event.metaKey || event.altKey || event.shiftKey || event.button !== 0) return;
-    _onClick && _onClick(event); // TODO: is it safe to use _onClick?.(event)
+    _onClick === null || _onClick === void 0 || _onClick(event);
     if (!event.defaultPrevented) {
       event.preventDefault();
       navigate(_href, props);
@@ -1336,13 +1342,16 @@ React.forwardRef(function (props, ref) {
   });
 
   // handle nested routers and absolute paths
-  var href = _href[0] === "~" ? _href.slice(1) : router.base + _href;
+  var href = router.hrefs(_href[0] === "~" ? _href.slice(1) : router.base + _href, router // pass router as a second argument for convinience
+  );
   return asChild && React.isValidElement(children) ? React.cloneElement(children, {
-    href: href,
-    onClick: onClick
+    onClick: onClick,
+    href: href
   }) : React.createElement("a", _objectSpread(_objectSpread({}, restProps), {}, {
-    href: href,
     onClick: onClick,
+    href: href,
+    // `className` can be a function to apply the class if this link is active
+    className: cls !== null && cls !== void 0 && cls.call ? cls(path === href) : cls,
     children: children,
     ref: ref
   }));

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/lib/index.js

@@ -43,7 +43,7 @@ var button = PropTypes$1.shape({
 });
 var buttons = PropTypes$1.arrayOf(button);
 var buttonTheme = PropTypes$1.oneOf(['primary', 'secondary', 'success', 'danger', 'warning', 'info', 'light', 'dark', null]);
-var buttonSize = PropTypes$1.oneOf(['lg', 'sm', null]);
+var buttonSize = PropTypes$1.oneOf(['lg', 'md', 'sm', null]);
 var buttonType = PropTypes$1.oneOf(['button', 'submit']);
 var dropdownAlign = PropTypes$1.oneOf(['start', 'end']);
 var controlSize = PropTypes$1.oneOf(['lg', 'sm', null]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "3.0.136",
+    "version": "3.0.142",
     "description": "",
     "keywords": [
         "javascript"
@@ -93,7 +93,7 @@
         "classnames": "^2.5.1",
         "css-mediaquery": "^0.1.2",
         "dayjs": "^1.10.4",
-        "debug": "^4.3.1",
+        "debug": "^4.3.4",
         "flat": "^5.0.2",
         "hoist-non-react-statics": "^3.3.2",
         "lodash": "^4.17.21",
@@ -106,10 +106,10 @@
         "tinycolor2": "^1.4.2",
         "webfontloader": "^1.6.28",
         "wolfy87-eventemitter": "^5.2.9",
-        "wouter": "^3.0.0"
+        "wouter": "^3.1.0"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "c9a3de330286a6cadd73651f1893adbbe090cd0e"
+    "gitHead": "293308a0e1b7175dcc56128f6dbc1416845d0b15"
 }