@carbon/ibm-products 2.11.3 → 2.12.0

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

@@ -5,20 +5,22 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FilterProvider = exports.FilterContext = void 0;
+exports.clearSingleFilter = exports.FilterProvider = exports.FilterContext = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _constants = require("./constants");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-/**
- * Copyright IBM Corp. 2022, 2022
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
+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) { (0, _defineProperty2.default)(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
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       *
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * This source code is licensed under the Apache-2.0 license found in the
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * LICENSE file in the root directory of this source tree.
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       */
 var FilterContext = /*#__PURE__*/(0, _react.createContext)();
 exports.FilterContext = FilterContext;
 var EventEmitter = {
@@ -39,42 +41,124 @@ 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 === _constants.CHECKBOX) {
+    return;
+  }
+  if (type === _constants.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);
+};
+var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
+  var key = _ref.key,
+    value = _ref.value;
+  var tempState = (0, _toConsumableArray2.default)(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 === _constants.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: (0, _toConsumableArray2.default)(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);
+};
+exports.clearSingleFilter = clearSingleFilter;
+var handleSingleFilterRemoval = function handleSingleFilterRemoval(key, value) {
+  EventEmitter.dispatch(_constants.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 === _constants.DROPDOWN || type === _constants.RADIO || type === _constants.NUMBER) {
-      tags.push({
+      tags.push(_objectSpread({
         key: id,
         value: value
-      });
+      }, sharedFilterProps));
     } else if (type === _constants.DATE) {
+      var _renderDateLabel;
       var _value = (0, _slicedToArray2.default)(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 === _constants.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;
 };
-var FilterProvider = function FilterProvider(_ref2) {
-  var children = _ref2.children,
-    filters = _ref2.filters;
-  var filterTags = prepareFiltersForTags(filters);
+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 = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     panelOpen = _useState2[0],
@@ -92,5 +176,6 @@ var FilterProvider = function FilterProvider(_ref2) {
 exports.FilterProvider = FilterProvider;
 FilterProvider.propTypes = {
   children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]).isRequired,
+  filterProps: _propTypes.default.object,
   filters: _propTypes.default.arrayOf(_propTypes.default.object).isRequired
 };

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

@@ -0,0 +1,79 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("@carbon/react");
+var _react2 = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _FilterPanel = require("./FilterPanel");
+var _useFilters = require("./hooks/useFilters");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 = (0, _react2.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_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__*/_react2.default.createElement(_react.Checkbox, (0, _extends2.default)({
+      key: option.labelText
+    }, option, {
+      onChange: function onChange(_, _ref2) {
+        var checked = _ref2.checked;
+        return (0, _useFilters.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__*/_react2.default.createElement(_react.FormGroup, components.FormGroup, firstFiveItems.map(renderCheckbox), showAllItems && restOfTheItems.map(renderCheckbox), /*#__PURE__*/_react2.default.createElement(_react.Button, {
+    className: "".concat(_FilterPanel.componentClass, "__view-all-button"),
+    kind: "ghost",
+    size: "sm",
+    onClick: function onClick() {
+      return setShowAllItems(!showAllItems);
+    }
+  }, renderViewAllButtonText()));
+};
+OverflowCheckboxes.propTypes = {
+  applyFilters: _propTypes.default.func,
+  column: _propTypes.default.string,
+  components: _propTypes.default.object,
+  filtersState: _propTypes.default.object,
+  setFiltersState: _propTypes.default.func,
+  type: _propTypes.default.string,
+  viewAllLabel: _propTypes.default.string,
+  viewLessLabel: _propTypes.default.string
+};
+var _default = OverflowCheckboxes;
+exports.default = _default;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RADIO = exports.PANEL_WIDTH = exports.PANEL = exports.NUMBER = exports.INSTANT = exports.FLYOUT = exports.DROPDOWN = exports.DATE = exports.CLEAR_FILTERS = exports.CHECKBOX = exports.BATCH = exports.ACTION_SET_HEIGHT = void 0;
+exports.RADIO = exports.PANEL_WIDTH = exports.PANEL = exports.NUMBER = exports.INSTANT = exports.FLYOUT = exports.DROPDOWN = exports.DATE = exports.CLEAR_SINGLE_FILTER = exports.CLEAR_FILTERS = exports.CHECKBOX = exports.BATCH = exports.ACTION_SET_HEIGHT = void 0;
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -36,9 +36,11 @@ var DROPDOWN = 'dropdown';
 /** Constants for event emitters */
 exports.DROPDOWN = DROPDOWN;
 var CLEAR_FILTERS = 'clearFilters';
+exports.CLEAR_FILTERS = CLEAR_FILTERS;
+var CLEAR_SINGLE_FILTER = 'clearSingleFilter';
 
 /** Constants for panel dimensions */
-exports.CLEAR_FILTERS = CLEAR_FILTERS;
+exports.CLEAR_SINGLE_FILTER = CLEAR_SINGLE_FILTER;
 var PANEL_WIDTH = 320;
 exports.PANEL_WIDTH = PANEL_WIDTH;
 var ACTION_SET_HEIGHT = 64;

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

@@ -5,15 +5,17 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.handleCheckboxChange = exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
-var _react2 = require("@carbon/react");
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _constants = require("../constants");
+var _react = require("@carbon/react");
+var _react2 = _interopRequireWildcard(require("react"));
+var _OverflowCheckboxes = _interopRequireDefault(require("../OverflowCheckboxes"));
 var _utils = require("../utils");
+var _hooks = require("../../../../../../global/js/hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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; }
@@ -24,29 +26,62 @@ 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.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        */
-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;
+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), {}, (0, _defineProperty2.default)({}, column, {
+    value: checkboxCopy,
+    type: type
+  })));
+  applyFilters({
+    column: column,
+    value: (0, _toConsumableArray2.default)(filtersState[column].value),
+    type: type
+  });
+  (_option$onChange = option.onChange) === null || _option$onChange === void 0 || _option$onChange.call(option, checked);
+};
+exports.handleCheckboxChange = handleCheckboxChange;
+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 = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
+  var _useState = (0, _react2.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     filtersState = _useState2[0],
     setFiltersState = _useState2[1];
-  var _useState3 = (0, _react.useState)(reactTableFiltersState),
+  var _useState3 = (0, _react2.useState)(reactTableFiltersState),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     filtersObjectArray = _useState4[0],
     setFiltersObjectArray = _useState4[1];
+  var previousState = (0, _hooks.usePreviousValue)({
+    panelOpen: panelOpen
+  });
 
   // When using batch actions we have to store the filters to then apply them later
-  var prevFiltersRef = (0, _react.useRef)(JSON.stringify(filtersState));
-  var lastAppliedFilters = (0, _react.useRef)(JSON.stringify(reactTableFiltersState));
-  var prevFiltersObjectArrayRef = (0, _react.useRef)(JSON.stringify(filtersObjectArray));
+  var prevFiltersRef = (0, _react2.useRef)(JSON.stringify(filtersState));
+  var lastAppliedFilters = (0, _react2.useRef)(JSON.stringify(reactTableFiltersState));
+  var prevFiltersObjectArrayRef = (0, _react2.useRef)(JSON.stringify(filtersObjectArray));
+  var holdingPrevFiltersRef = (0, _react2.useRef)();
+  var holdingLastAppliedFiltersRef = (0, _react2.useRef)([]);
+  var holdingPrevFiltersObjectArrayRef = (0, _react2.useRef)([]);
 
   /** Methods */
   // If the user decides to cancel or click outside the flyout, it reverts back to the filters that were
@@ -55,8 +90,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 = (0, _react2.useCallback)(function () {
     // When we reset we want the "initialFilters" to be an empty array
     var resetFiltersArray = [];
 
@@ -72,11 +113,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 === _constants.DATE && value.length > 0 && !value[1]) {
       return;
@@ -161,19 +202,50 @@ 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 === _constants.PANEL;
     if (!type) {
       return console.error("type: ".concat(type, "; does not exist as a type of filter."));
     }
+    var renderCheckboxes = function renderCheckboxes() {
+      if (variation === _constants.PANEL && filtersState[column].value.length > 10) {
+        return /*#__PURE__*/_react2.default.createElement(_OverflowCheckboxes.default, {
+          components: components,
+          type: type,
+          column: column,
+          setFiltersState: setFiltersState,
+          filtersState: filtersState,
+          applyFilters: applyFilters
+        });
+      }
+      return /*#__PURE__*/_react2.default.createElement(_react.FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
+        return /*#__PURE__*/_react2.default.createElement(_react.Checkbox, (0, _extends2.default)({
+          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 _constants.DATE:
-        filter = /*#__PURE__*/_react.default.createElement(_react2.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
+        filter = /*#__PURE__*/_react2.default.createElement(_react.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
           onChange: function onChange(value) {
             var _components$DatePicke, _components$DatePicke2;
             setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
@@ -189,16 +261,16 @@ var useFilters = function useFilters(_ref) {
           },
           value: filtersState[column].value,
           datePickerType: "range"
-        }), /*#__PURE__*/_react.default.createElement(_react2.DatePickerInput, (0, _extends2.default)({
+        }), /*#__PURE__*/_react2.default.createElement(_react.DatePickerInput, (0, _extends2.default)({
           placeholder: "mm/dd/yyyy",
           labelText: "Start date"
-        }, components.DatePickerInput.start)), /*#__PURE__*/_react.default.createElement(_react2.DatePickerInput, (0, _extends2.default)({
+        }, components.DatePickerInput.start)), /*#__PURE__*/_react2.default.createElement(_react.DatePickerInput, (0, _extends2.default)({
           placeholder: "mm/dd/yyyy",
           labelText: "End date"
         }, components.DatePickerInput.end)));
         break;
       case _constants.NUMBER:
-        filter = /*#__PURE__*/_react.default.createElement(_react2.NumberInput, (0, _extends2.default)({
+        filter = /*#__PURE__*/_react2.default.createElement(_react.NumberInput, (0, _extends2.default)({
           step: 1,
           allowEmpty: true,
           hideSteppers: true
@@ -220,35 +292,10 @@ var useFilters = function useFilters(_ref) {
         }));
         break;
       case _constants.CHECKBOX:
-        filter = /*#__PURE__*/_react.default.createElement(_react2.FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
-          return /*#__PURE__*/_react.default.createElement(_react2.Checkbox, (0, _extends2.default)({
-            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), {}, (0, _defineProperty2.default)({}, column, {
-                value: checkboxCopy,
-                type: type
-              })));
-              applyFilters({
-                column: column,
-                value: (0, _toConsumableArray2.default)(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 _constants.RADIO:
-        filter = /*#__PURE__*/_react.default.createElement(_react2.FormGroup, components.FormGroup, /*#__PURE__*/_react.default.createElement(_react2.RadioButtonGroup, (0, _extends2.default)({}, components.RadioButtonGroup, {
+        filter = /*#__PURE__*/_react2.default.createElement(_react.FormGroup, components.FormGroup, /*#__PURE__*/_react2.default.createElement(_react.RadioButtonGroup, (0, _extends2.default)({}, components.RadioButtonGroup, {
           valueSelected: ((_filtersState$column = filtersState[column]) === null || _filtersState$column === void 0 ? void 0 : _filtersState$column.value) === '' ? 'Any' : (_filtersState$column2 = filtersState[column]) === null || _filtersState$column2 === void 0 ? void 0 : _filtersState$column2.value,
           onChange: function onChange(selected) {
             var _components$RadioButt, _components$RadioButt2;
@@ -263,24 +310,24 @@ var useFilters = function useFilters(_ref) {
             });
             (_components$RadioButt = (_components$RadioButt2 = components.RadioButtonGroup).onChange) === null || _components$RadioButt === void 0 || _components$RadioButt.call(_components$RadioButt2, selected);
           }
-        }), /*#__PURE__*/_react.default.createElement(_react2.RadioButton, {
+        }), /*#__PURE__*/_react2.default.createElement(_react.RadioButton, {
           id: "any",
           labelText: "Any",
           value: "Any"
         }), components.RadioButton.map(function (radio) {
-          var _ref5, _radio$id;
-          return /*#__PURE__*/_react.default.createElement(_react2.RadioButton, (0, _extends2.default)({
-            key: (_ref5 = (_radio$id = radio.id) !== null && _radio$id !== void 0 ? _radio$id : radio.labelText) !== null && _ref5 !== void 0 ? _ref5 : radio.value
+          var _ref6, _radio$id;
+          return /*#__PURE__*/_react2.default.createElement(_react.RadioButton, (0, _extends2.default)({
+            key: (_ref6 = (_radio$id = radio.id) !== null && _radio$id !== void 0 ? _radio$id : radio.labelText) !== null && _ref6 !== void 0 ? _ref6 : radio.value
           }, radio));
         })));
         break;
       case _constants.DROPDOWN:
-        filter = /*#__PURE__*/_react.default.createElement(_react2.Dropdown, (0, _extends2.default)({}, components.Dropdown, {
+        filter = /*#__PURE__*/_react2.default.createElement(_react.Dropdown, (0, _extends2.default)({}, 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((0, _toConsumableArray2.default)(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), {}, (0, _defineProperty2.default)({}, column, {
               value: selectedItem,
               type: type
@@ -296,14 +343,33 @@ var useFilters = function useFilters(_ref) {
         break;
     }
     if (isPanel) {
-      return /*#__PURE__*/_react.default.createElement(_react2.Layer, {
+      return /*#__PURE__*/_react2.default.createElement(_react.Layer, {
         key: column
       }, filter);
     }
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
+    return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, {
       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
+   */
+  (0, _react2.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 === _constants.BATCH) {
@@ -314,7 +380,7 @@ var useFilters = function useFilters(_ref) {
 
   /** The purpose of this function is to sync any changes in react-tables state.filters array and reflect
       those new filter changes in the panel/flyout state. The external change is triggered if setAllFilters is called outside of the Datagrid */
-  (0, _react.useEffect)(function updateStateAndFiltersToReflectExternalFilterChanges() {
+  (0, _react2.useEffect)(function updateStateAndFiltersToReflectExternalFilterChanges() {
     var newFiltersState = (0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState);
     setFiltersState(newFiltersState);
     prevFiltersRef.current = JSON.stringify(newFiltersState);

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

@@ -1,17 +1,22 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getInitialStateFromFilters = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _constants = require("./constants");
+var _excluded = ["id", "labelText", "value"];
 /**
  * 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.
  */
-
+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) { (0, _defineProperty2.default)(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; }
 var applyInitialFilters = function applyInitialFilters(filterState, initialFilters) {
   Object.keys(filterState).forEach(function (key) {
     var hasInitialFilter = initialFilters.find(function (filter) {
@@ -37,13 +42,14 @@ var getInitialStateFromFilters = function getInitialStateFromFilters(filters) {
         value: props.Checkbox.map(function (_ref2) {
           var id = _ref2.id,
             labelText = _ref2.labelText,
-            value = _ref2.value;
-          return {
+            value = _ref2.value,
+            rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+          return _objectSpread({
             id: id,
             labelText: labelText,
             value: value,
             selected: false
-          };
+          }, rest);
         }),
         type: type
       };