@carbon/ibm-products 2.11.3 → 2.12.1

package/es/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.js

@@ -1,13 +1,17 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
- * Copyright IBM Corp. 2022, 2022
+ * Copyright IBM Corp. 2022, 2023
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
 import React, { createContext, useState } from 'react';
 import PropTypes from 'prop-types';
-import { DATE, DROPDOWN, NUMBER, RADIO, CHECKBOX } from './constants';
+import { DATE, DROPDOWN, NUMBER, RADIO, CHECKBOX, CLEAR_SINGLE_FILTER } from './constants';
 export var FilterContext = /*#__PURE__*/createContext();
 var EventEmitter = {
   events: {},
@@ -27,42 +31,123 @@ var EventEmitter = {
     }
   }
 };
-var prepareFiltersForTags = function prepareFiltersForTags(filters) {
+var removeFilterItem = function removeFilterItem(state, index) {
+  return state.splice(index, 1);
+};
+var updateFilterState = function updateFilterState(state, type, value) {
+  if (type === CHECKBOX) {
+    return;
+  }
+  if (type === DATE) {
+    var _filterTagIndex = state.findIndex(function (val) {
+      return formatDateRange(val.value[0], val.value[1]) === formatDateRange(value[0], value[1]);
+    });
+    return removeFilterItem(state, _filterTagIndex);
+  }
+  var filterTagIndex = state.findIndex(function (val) {
+    return val.value === value;
+  });
+  return removeFilterItem(state, filterTagIndex);
+};
+export var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
+  var key = _ref.key,
+    value = _ref.value;
+  var tempState = _toConsumableArray(state.filters);
+  tempState.forEach(function (f, filterIndex) {
+    if (f.id === key) {
+      var filterValues = f.value;
+      var filterType = f.type;
+      updateFilterState(tempState, filterType, value);
+      if (filterType === CHECKBOX) {
+        /**
+          When all checkboxes of a group are all unselected the value still exists in the filtersObjectArray
+          This checks if all the checkboxes are selected = false and removes it from the array
+        */
+        var valueIndex = filterValues.findIndex(function (val) {
+          return val.id === value;
+        });
+        filterValues[valueIndex].selected = false;
+        var updatedFilterObject = _objectSpread(_objectSpread({}, f), {}, {
+          value: _toConsumableArray(filterValues)
+        });
+        tempState[filterIndex] = updatedFilterObject;
+        var index = tempState.findIndex(function (filter) {
+          return filter.id === key;
+        });
+
+        // If all the selected state is false remove from array
+        var shouldRemoveFromArray = tempState[index].value.every(function (val) {
+          return val.selected === false;
+        });
+        if (shouldRemoveFromArray) {
+          removeFilterItem(tempState, index);
+        }
+      }
+    }
+  });
+  setAllFilters(tempState);
+};
+var handleSingleFilterRemoval = function handleSingleFilterRemoval(key, value) {
+  EventEmitter.dispatch(CLEAR_SINGLE_FILTER, {
+    key: key,
+    value: value
+  });
+};
+var formatDateRange = function formatDateRange(startDate, endDate) {
+  var startDateObj = new Date(startDate);
+  var endDateObj = new Date(endDate);
+  return "".concat(startDateObj.toLocaleDateString(), " - ").concat(endDateObj.toLocaleDateString());
+};
+var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLabel) {
   var tags = [];
-  filters.forEach(function (_ref) {
-    var id = _ref.id,
-      type = _ref.type,
-      value = _ref.value;
+  filters.forEach(function (_ref2) {
+    var id = _ref2.id,
+      type = _ref2.type,
+      value = _ref2.value;
+    var sharedFilterProps = {
+      filter: true,
+      onClose: function onClose() {
+        return handleSingleFilterRemoval(id, value);
+      }
+    };
     if (type === DROPDOWN || type === RADIO || type === NUMBER) {
-      tags.push({
+      tags.push(_objectSpread({
         key: id,
         value: value
-      });
+      }, sharedFilterProps));
     } else if (type === DATE) {
+      var _renderDateLabel;
       var _value = _slicedToArray(value, 2),
         startDate = _value[0],
         endDate = _value[1];
-      tags.push({
+      tags.push(_objectSpread({
         key: id,
-        value: "".concat(startDate.toLocaleDateString(), " - ").concat(endDate.toLocaleDateString())
-      });
+        value: (_renderDateLabel = renderDateLabel === null || renderDateLabel === void 0 ? void 0 : renderDateLabel(startDate, endDate)) !== null && _renderDateLabel !== void 0 ? _renderDateLabel : formatDateRange(startDate, endDate)
+      }, sharedFilterProps));
     } else if (type === CHECKBOX) {
       value.forEach(function (checkbox) {
         if (checkbox.selected) {
-          tags.push({
+          tags.push(_objectSpread(_objectSpread({
             key: id,
             value: checkbox.value
-          });
+          }, sharedFilterProps), {}, {
+            onClose: function onClose() {
+              return handleSingleFilterRemoval(id, checkbox.value);
+            }
+          }));
         }
       });
     }
   });
   return tags;
 };
-export var FilterProvider = function FilterProvider(_ref2) {
-  var children = _ref2.children,
-    filters = _ref2.filters;
-  var filterTags = prepareFiltersForTags(filters);
+export var FilterProvider = function FilterProvider(_ref3) {
+  var children = _ref3.children,
+    filters = _ref3.filters,
+    filterProps = _ref3.filterProps;
+  var _ref4 = filterProps || {},
+    renderDateLabel = _ref4.renderDateLabel;
+  var filterTags = prepareFiltersForTags(filters, renderDateLabel);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     panelOpen = _useState2[0],
@@ -79,5 +164,6 @@ export var FilterProvider = function FilterProvider(_ref2) {
 };
 FilterProvider.propTypes = {
   children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
+  filterProps: PropTypes.object,
   filters: PropTypes.arrayOf(PropTypes.object).isRequired
 };

package/es/components/Datagrid/Datagrid/addons/Filtering/OverflowCheckboxes.js

@@ -0,0 +1,68 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { Button, Checkbox, FormGroup } from '@carbon/react';
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { componentClass } from './FilterPanel';
+import { handleCheckboxChange } from './hooks/useFilters';
+var OverflowCheckboxes = function OverflowCheckboxes(_ref) {
+  var components = _ref.components,
+    filtersState = _ref.filtersState,
+    column = _ref.column,
+    setFiltersState = _ref.setFiltersState,
+    type = _ref.type,
+    applyFilters = _ref.applyFilters,
+    _ref$viewAllLabel = _ref.viewAllLabel,
+    viewAllLabel = _ref$viewAllLabel === void 0 ? 'View all' : _ref$viewAllLabel,
+    _ref$viewLessLabel = _ref.viewLessLabel,
+    viewLessLabel = _ref$viewLessLabel === void 0 ? 'View less' : _ref$viewLessLabel;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    showAllItems = _useState2[0],
+    setShowAllItems = _useState2[1];
+  var firstFiveItems = filtersState[column].value.slice(0, 5);
+  var restOfTheItems = filtersState[column].value.slice(5, filtersState[column].value.length - 1);
+  var renderCheckbox = function renderCheckbox(option) {
+    return /*#__PURE__*/React.createElement(Checkbox, _extends({
+      key: option.labelText
+    }, option, {
+      onChange: function onChange(_, _ref2) {
+        var checked = _ref2.checked;
+        return handleCheckboxChange({
+          checked: checked,
+          filtersState: filtersState,
+          column: column,
+          option: option,
+          setFiltersState: setFiltersState,
+          applyFilters: applyFilters,
+          type: type
+        });
+      },
+      checked: option.selected,
+      disabled: option.disabled
+    }));
+  };
+  var renderViewAllButtonText = function renderViewAllButtonText() {
+    /** This should render the text "View all ([amount of checkboxes])" or "View less" */
+    return showAllItems ? viewLessLabel : "".concat(viewAllLabel, " (").concat(filtersState[column].value.length, ")");
+  };
+  return /*#__PURE__*/React.createElement(FormGroup, components.FormGroup, firstFiveItems.map(renderCheckbox), showAllItems && restOfTheItems.map(renderCheckbox), /*#__PURE__*/React.createElement(Button, {
+    className: "".concat(componentClass, "__view-all-button"),
+    kind: "ghost",
+    size: "sm",
+    onClick: function onClick() {
+      return setShowAllItems(!showAllItems);
+    }
+  }, renderViewAllButtonText()));
+};
+OverflowCheckboxes.propTypes = {
+  applyFilters: PropTypes.func,
+  column: PropTypes.string,
+  components: PropTypes.object,
+  filtersState: PropTypes.object,
+  setFiltersState: PropTypes.func,
+  type: PropTypes.string,
+  viewAllLabel: PropTypes.string,
+  viewLessLabel: PropTypes.string
+};
+export default OverflowCheckboxes;

package/es/components/Datagrid/Datagrid/addons/Filtering/constants.js

@@ -21,6 +21,7 @@ export var DROPDOWN = 'dropdown';
 
 /** Constants for event emitters */
 export var CLEAR_FILTERS = 'clearFilters';
+export var CLEAR_SINGLE_FILTER = 'clearSingleFilter';
 
 /** Constants for panel dimensions */
 export var PANEL_WIDTH = 320;

package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /*
@@ -11,19 +11,48 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * US Government Users Restricted Rights - Use, duplication or disclosure
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
-import React, { useState, useRef, useEffect } from 'react';
-import { Checkbox, DatePicker, DatePickerInput, Dropdown, FormGroup, NumberInput, RadioButton, RadioButtonGroup, Layer } from '@carbon/react';
-import { INSTANT, BATCH, DATE, CHECKBOX, NUMBER, RADIO, DROPDOWN, PANEL } from '../constants';
+
+import { BATCH, CHECKBOX, DATE, DROPDOWN, INSTANT, NUMBER, PANEL, RADIO } from '../constants';
+import { Checkbox, DatePicker, DatePickerInput, Dropdown, FormGroup, Layer, NumberInput, RadioButton, RadioButtonGroup } from '@carbon/react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import OverflowCheckboxes from '../OverflowCheckboxes';
 import { getInitialStateFromFilters } from '../utils';
-var useFilters = function useFilters(_ref) {
-  var updateMethod = _ref.updateMethod,
-    _ref$filters = _ref.filters,
-    filters = _ref$filters === void 0 ? [] : _ref$filters,
-    setAllFilters = _ref.setAllFilters,
-    variation = _ref.variation,
-    reactTableFiltersState = _ref.reactTableFiltersState,
-    _ref$onCancel = _ref.onCancel,
-    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
+import { usePreviousValue } from '../../../../../../global/js/hooks';
+export var handleCheckboxChange = function handleCheckboxChange(_ref) {
+  var _option$onChange;
+  var checked = _ref.checked,
+    filtersState = _ref.filtersState,
+    column = _ref.column,
+    option = _ref.option,
+    setFiltersState = _ref.setFiltersState,
+    applyFilters = _ref.applyFilters,
+    type = _ref.type;
+  var checkboxCopy = filtersState[column].value;
+  var foundCheckbox = checkboxCopy.find(function (checkbox) {
+    return checkbox.value === option.value;
+  });
+  foundCheckbox.selected = checked;
+  setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, _defineProperty({}, column, {
+    value: checkboxCopy,
+    type: type
+  })));
+  applyFilters({
+    column: column,
+    value: _toConsumableArray(filtersState[column].value),
+    type: type
+  });
+  (_option$onChange = option.onChange) === null || _option$onChange === void 0 || _option$onChange.call(option, checked);
+};
+var useFilters = function useFilters(_ref2) {
+  var updateMethod = _ref2.updateMethod,
+    _ref2$filters = _ref2.filters,
+    filters = _ref2$filters === void 0 ? [] : _ref2$filters,
+    setAllFilters = _ref2.setAllFilters,
+    variation = _ref2.variation,
+    reactTableFiltersState = _ref2.reactTableFiltersState,
+    _ref2$onCancel = _ref2.onCancel,
+    onCancel = _ref2$onCancel === void 0 ? function () {} : _ref2$onCancel,
+    panelOpen = _ref2.panelOpen;
   /** State */
   var _useState = useState(getInitialStateFromFilters(filters, variation, reactTableFiltersState)),
     _useState2 = _slicedToArray(_useState, 2),
@@ -33,11 +62,17 @@ var useFilters = function useFilters(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     filtersObjectArray = _useState4[0],
     setFiltersObjectArray = _useState4[1];
+  var previousState = usePreviousValue({
+    panelOpen: panelOpen
+  });
 
   // When using batch actions we have to store the filters to then apply them later
   var prevFiltersRef = useRef(JSON.stringify(filtersState));
   var lastAppliedFilters = useRef(JSON.stringify(reactTableFiltersState));
   var prevFiltersObjectArrayRef = useRef(JSON.stringify(filtersObjectArray));
+  var holdingPrevFiltersRef = useRef();
+  var holdingLastAppliedFiltersRef = useRef([]);
+  var holdingPrevFiltersObjectArrayRef = useRef([]);
 
   /** Methods */
   // If the user decides to cancel or click outside the flyout, it reverts back to the filters that were
@@ -46,8 +81,14 @@ var useFilters = function useFilters(_ref) {
     setFiltersState(JSON.parse(prevFiltersRef.current));
     setFiltersObjectArray(JSON.parse(prevFiltersObjectArrayRef.current));
     setAllFilters(JSON.parse(lastAppliedFilters.current));
+
+    // Set the temp prev refs, these will be used to populate the prev values once the
+    // panel opens again
+    holdingPrevFiltersRef.current = JSON.parse(prevFiltersRef.current);
+    holdingLastAppliedFiltersRef.current = JSON.parse(prevFiltersObjectArrayRef.current);
+    holdingPrevFiltersObjectArrayRef.current = JSON.parse(lastAppliedFilters.current);
   };
-  var reset = function reset() {
+  var reset = useCallback(function () {
     // When we reset we want the "initialFilters" to be an empty array
     var resetFiltersArray = [];
 
@@ -63,11 +104,11 @@ var useFilters = function useFilters(_ref) {
     // Update their respective refs so everything is in sync
     prevFiltersRef.current = JSON.stringify(initialFiltersState);
     prevFiltersObjectArrayRef.current = JSON.stringify(initialFiltersObjectArray);
-  };
-  var applyFilters = function applyFilters(_ref2) {
-    var column = _ref2.column,
-      value = _ref2.value,
-      type = _ref2.type;
+  }, [filters, setAllFilters, variation]);
+  var applyFilters = function applyFilters(_ref3) {
+    var column = _ref3.column,
+      value = _ref3.value,
+      type = _ref3.type;
     // If no end date is selected return because we need the end date to do computations
     if (type === DATE && value.length > 0 && !value[1]) {
       return;
@@ -152,16 +193,47 @@ var useFilters = function useFilters(_ref) {
     }
   };
   /** Render the individual filter component */
-  var renderFilter = function renderFilter(_ref3) {
+  var renderFilter = function renderFilter(_ref4) {
     var _filtersState$column, _filtersState$column2, _filtersState$column3, _filtersState$column4;
-    var type = _ref3.type,
-      column = _ref3.column,
-      components = _ref3.props;
+    var type = _ref4.type,
+      column = _ref4.column,
+      components = _ref4.props;
     var filter;
     var isPanel = variation === PANEL;
     if (!type) {
       return console.error("type: ".concat(type, "; does not exist as a type of filter."));
     }
+    var renderCheckboxes = function renderCheckboxes() {
+      if (variation === PANEL && filtersState[column].value.length > 10) {
+        return /*#__PURE__*/React.createElement(OverflowCheckboxes, {
+          components: components,
+          type: type,
+          column: column,
+          setFiltersState: setFiltersState,
+          filtersState: filtersState,
+          applyFilters: applyFilters
+        });
+      }
+      return /*#__PURE__*/React.createElement(FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
+        return /*#__PURE__*/React.createElement(Checkbox, _extends({
+          key: option.id
+        }, option, {
+          onChange: function onChange(_, _ref5) {
+            var checked = _ref5.checked;
+            handleCheckboxChange({
+              checked: checked,
+              filtersState: filtersState,
+              column: column,
+              option: option,
+              setFiltersState: setFiltersState,
+              applyFilters: applyFilters,
+              type: type
+            });
+          },
+          checked: option.selected
+        }));
+      }));
+    };
     switch (type) {
       case DATE:
         filter = /*#__PURE__*/React.createElement(DatePicker, _extends({}, components.DatePicker, {
@@ -211,32 +283,7 @@ var useFilters = function useFilters(_ref) {
         }));
         break;
       case CHECKBOX:
-        filter = /*#__PURE__*/React.createElement(FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
-          return /*#__PURE__*/React.createElement(Checkbox, _extends({
-            key: option.labelText
-          }, option, {
-            onChange: function onChange(_, _ref4) {
-              var _option$onChange;
-              var isSelected = _ref4.checked;
-              var checkboxCopy = filtersState[column].value;
-              var foundCheckbox = checkboxCopy.find(function (checkbox) {
-                return checkbox.value === option.value;
-              });
-              foundCheckbox.selected = isSelected;
-              setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, _defineProperty({}, column, {
-                value: checkboxCopy,
-                type: type
-              })));
-              applyFilters({
-                column: column,
-                value: _toConsumableArray(filtersState[column].value),
-                type: type
-              });
-              (_option$onChange = option.onChange) === null || _option$onChange === void 0 || _option$onChange.call(option, isSelected);
-            },
-            checked: option.selected
-          }));
-        }));
+        filter = renderCheckboxes();
         break;
       case RADIO:
         filter = /*#__PURE__*/React.createElement(FormGroup, components.FormGroup, /*#__PURE__*/React.createElement(RadioButtonGroup, _extends({}, components.RadioButtonGroup, {
@@ -259,9 +306,9 @@ var useFilters = function useFilters(_ref) {
           labelText: "Any",
           value: "Any"
         }), components.RadioButton.map(function (radio) {
-          var _ref5, _radio$id;
+          var _ref6, _radio$id;
           return /*#__PURE__*/React.createElement(RadioButton, _extends({
-            key: (_ref5 = (_radio$id = radio.id) !== null && _radio$id !== void 0 ? _radio$id : radio.labelText) !== null && _ref5 !== void 0 ? _ref5 : radio.value
+            key: (_ref6 = (_radio$id = radio.id) !== null && _radio$id !== void 0 ? _radio$id : radio.labelText) !== null && _ref6 !== void 0 ? _ref6 : radio.value
           }, radio));
         })));
         break;
@@ -269,9 +316,9 @@ var useFilters = function useFilters(_ref) {
         filter = /*#__PURE__*/React.createElement(Dropdown, _extends({}, components.Dropdown, {
           selectedItem: ((_filtersState$column3 = filtersState[column]) === null || _filtersState$column3 === void 0 ? void 0 : _filtersState$column3.value) === '' ? 'Any' : (_filtersState$column4 = filtersState[column]) === null || _filtersState$column4 === void 0 ? void 0 : _filtersState$column4.value,
           items: ['Any'].concat(_toConsumableArray(components.Dropdown.items)),
-          onChange: function onChange(_ref6) {
+          onChange: function onChange(_ref7) {
             var _components$Dropdown$, _components$Dropdown;
-            var selectedItem = _ref6.selectedItem;
+            var selectedItem = _ref7.selectedItem;
             setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, _defineProperty({}, column, {
               value: selectedItem,
               type: type
@@ -295,6 +342,25 @@ var useFilters = function useFilters(_ref) {
       key: column
     }, filter);
   };
+
+  /** This useEffect will properly handle the previous filters when the panel closes
+   * 1. If the panel closes we need to call the reset fn but also store the
+   * previous filters in a (new) temporary place.
+   * 2. When the panel opens again, take the values from the temporary place
+   * and populate the filter state with them
+   */
+  useEffect(function () {
+    if (!panelOpen && previousState !== null && previousState !== void 0 && previousState.panelOpen) {
+      setAllFilters(holdingLastAppliedFiltersRef.current);
+    }
+    if (panelOpen && !(previousState !== null && previousState !== void 0 && previousState.panelOpen)) {
+      if (holdingPrevFiltersRef.current && holdingLastAppliedFiltersRef.current && holdingPrevFiltersObjectArrayRef.current) {
+        setFiltersState(holdingPrevFiltersRef.current);
+        setFiltersObjectArray(holdingLastAppliedFiltersRef.current);
+        setAllFilters(JSON.parse(prevFiltersObjectArrayRef.current));
+      }
+    }
+  }, [panelOpen, previousState, previousState === null || previousState === void 0 ? void 0 : previousState.panelOpen, reset, setAllFilters]);
   var cancel = function cancel() {
     // Reverting to previous filters only applies when using batch actions
     if (updateMethod === BATCH) {

package/es/components/Datagrid/Datagrid/addons/Filtering/utils.js

@@ -1,3 +1,8 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["id", "labelText", "value"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * Copyright IBM Corp. 2022, 2023
  *
@@ -31,13 +36,14 @@ export var getInitialStateFromFilters = function getInitialStateFromFilters(filt
         value: props.Checkbox.map(function (_ref2) {
           var id = _ref2.id,
             labelText = _ref2.labelText,
-            value = _ref2.value;
-          return {
+            value = _ref2.value,
+            rest = _objectWithoutProperties(_ref2, _excluded);
+          return _objectSpread({
             id: id,
             labelText: labelText,
             value: value,
             selected: false
-          };
+          }, rest);
         }),
         type: type
       };

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditButton/InlineEditButton.js

@@ -1,10 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2022
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * Copyright IBM Corp. 2022, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 import React from 'react';
@@ -22,12 +21,9 @@ export var InlineEditButton = function InlineEditButton(_ref) {
     nonEditCell = _ref.nonEditCell,
     isActiveCell = _ref.isActiveCell,
     columnConfig = _ref.columnConfig,
-    totalInlineEditColumns = _ref.totalInlineEditColumns,
-    totalColumns = _ref.totalColumns,
     type = _ref.type;
-  var inlineEditColsLessThanHalfOfTotal = totalInlineEditColumns < totalColumns / 2;
   return /*#__PURE__*/React.createElement("div", {
-    className: cx("".concat(blockClass, "__inline-edit-button"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--disabled"), disabled || nonEditCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--with-label-icon"), LabelIcon), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--non-edit"), nonEditCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--active"), isActiveCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--edit-less-than-half-of-total-cols"), inlineEditColsLessThanHalfOfTotal), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--").concat(type), type === 'date' || type === 'selection'), _cx)),
+    className: cx("".concat(blockClass, "__inline-edit-button"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--disabled"), disabled || nonEditCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--with-label-icon"), LabelIcon), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--non-edit"), nonEditCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--active"), isActiveCell), _defineProperty(_cx, "".concat(blockClass, "__inline-edit-button--").concat(type), type === 'date' || type === 'selection'), _cx)),
     tabIndex: isActiveCell ? 0 : -1,
     "data-disabled": disabled || nonEditCell,
     "aria-disabled": disabled || nonEditCell,
@@ -52,8 +48,6 @@ InlineEditButton.propTypes = {
   nonEditCell: PropTypes.bool,
   placeholder: PropTypes.string,
   renderIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-  totalColumns: PropTypes.number,
-  totalInlineEditColumns: PropTypes.number,
   type: PropTypes.oneOf(['text', 'number', 'selection', 'date']),
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.node])
 };

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -33,14 +33,12 @@ export var InlineEditCell = function InlineEditCell(_ref) {
     value = _ref.value,
     _ref$nonEditCell = _ref.nonEditCell,
     nonEditCell = _ref$nonEditCell === void 0 ? false : _ref$nonEditCell,
-    totalInlineEditColumns = _ref.totalInlineEditColumns,
     type = _ref.type;
   var columnId = cell.column.id;
   var columnIndex = instance.columns.findIndex(function (col) {
     return col.id === columnId;
   });
   var cellId = "column-".concat(columnIndex, "-row-").concat(cell.row.index);
-  var totalColumns = instance.columns.length;
   var _useContext = useContext(InlineEditContext),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -450,8 +448,6 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       tabIndex: tabIndex,
       nonEditCell: nonEditCell,
       columnConfig: cell.column,
-      totalInlineEditColumns: totalInlineEditColumns,
-      totalColumns: totalColumns,
       type: type
     }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React.createElement(React.Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
   );
@@ -469,7 +465,6 @@ InlineEditCell.propTypes = {
   nonEditCell: PropTypes.bool,
   placeholder: PropTypes.string,
   tabIndex: PropTypes.number,
-  totalInlineEditColumns: PropTypes.number,
   type: PropTypes.oneOf(['text', 'number', 'selection', 'date']),
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.node, PropTypes.object])
 };

package/es/components/Datagrid/Datagrid.docs-page.js

@@ -116,7 +116,7 @@ export var DocsPage = function DocsPage() {
       title: 'Sortable columns',
       description: "To add sortable columns to your Datagrid, simply add the `useSortableColumns` hook. This will allow each column header to be clickable and sort each column in either ascending or descending order.\n- Include `useSortableColumns` hook\n        ",
       source: {
-        code: "\nconst [data] = useState(makeData(10));\nconst columns = React.useMemo(() => getColumns(data), []);\nconst datagridState = useDatagrid(\n  {\n    columns,\n    data,\n  },\n  useSortableColumns\n);\n\nreturn <Datagrid datagridState={datagridState} />;\n          "
+        code: "\nconst [data] = useState(makeData(10));\nconst columns = React.useMemo(() => getColumns(data), []);\nconst datagridState = useDatagrid(\n  {\n    columns,\n    data,\n    ascendingSortableLabelText: 'none',\n    descendingSortableLabelText: 'ascending',\n    defaultSortableLabelText: 'descending',\n  },\n  useSortableColumns\n);\n\nreturn <Datagrid datagridState={datagridState} />;\n          "
       }
     }, {
       title: 'Sticky column',

package/es/components/Datagrid/useActionsColumn.js

@@ -69,7 +69,6 @@ var useActionsColumn = function useActionsColumn(hooks) {
               }, /*#__PURE__*/React.createElement(OverflowMenu, _extends({}, rest, {
                 align: align || 'top',
                 renderIcon: icon,
-                light: true,
                 iconDescription: itemText,
                 kind: "ghost",
                 className: cx(_defineProperty({}, "".concat(blockClass, "__disabled-row-action"), getDisabledState(row.index))),
@@ -85,7 +84,6 @@ var useActionsColumn = function useActionsColumn(hooks) {
             })), !isFetching && rowActions.length > 2 && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(OverflowMenu, {
               align: "top-right",
               size: "sm",
-              light: true,
               flipped: true,
               onClick: function onClick(e) {
                 e.stopPropagation();

package/es/components/Datagrid/useDisableSelectRows.js

@@ -13,7 +13,7 @@ var useDisableSelectRows = function useDisableSelectRows(hooks) {
     var row = _ref.row,
       instance = _ref.instance;
     return [props, {
-      selectDisabled: instance.shouldDisableSelectRow && instance.shouldDisableSelectRow(row)
+      disabled: instance.shouldDisableSelectRow && instance.shouldDisableSelectRow(row)
     }];
   };
   hooks.getRowProps.push(getRowProps);

package/es/components/Datagrid/useFiltering.js

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -25,7 +26,9 @@ var useFiltering = function useFiltering(hooks) {
           endDate = _ref2[1];
         return rows.filter(function (row) {
           var rowValue = row.values[id];
-          if (rowValue.getTime() <= endDate.getTime() && rowValue.getTime() >= startDate.getTime()) {
+          var startDateObj = _typeof(startDate) === 'object' ? startDate : new Date(startDate);
+          var endDateObj = _typeof(endDate) === 'object' ? endDate : new Date(endDate);
+          if (rowValue.getTime() <= endDateObj.getTime() && rowValue.getTime() >= startDateObj.getTime()) {
             // In date range
             return true;
           } else {