@carbon/ibm-products 1.59.0 → 1.60.0

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/DraggableItemsList.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DraggableItemsList = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = require("prop-types");
 var _carbonComponentsReact = require("carbon-components-react");
@@ -12,25 +13,23 @@ var _common = require("./common");
 var _DraggableElement = _interopRequireDefault(require("../../DraggableElement"));
 var _settings = require("../../../../../settings");
 var _getColTitle2 = _interopRequireDefault(require("../../../utils/getColTitle"));
-/**
- * Copyright IBM Corp. 2023, 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 _core = require("@dnd-kit/core");
+var _sortable = require("@dnd-kit/sortable");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
+var matchedColsById = function matchedColsById(col1, col2) {
+  return col1 && col2 && col1.id === col2.id;
+};
 var DraggableItemsList = function DraggableItemsList(_ref) {
   var columns = _ref.columns,
     filterString = _ref.filterString,
-    focusIndex = _ref.focusIndex,
-    getNextIndex = _ref.getNextIndex,
+    id = _ref.id,
     moveElement = _ref.moveElement,
     onSelectColumn = _ref.onSelectColumn,
-    setAriaRegionText = _ref.setAriaRegionText,
-    setColumnsObject = _ref.setColumnsObject,
-    setFocusIndex = _ref.setFocusIndex;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, columns
+    setAriaRegionText = _ref.setAriaRegionText;
+  var draggableClass = "".concat(blockClass, "__draggable-item");
+  var visibleCols = columns
   // hide the columns without Header, e.g the sticky actions, spacer
   .filter(function (colDef) {
     return !!(0, _getColTitle2.default)(colDef);
@@ -39,7 +38,108 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
   }).filter(function (colDef) {
     var _getColTitle;
     return filterString.length === 0 || ((_getColTitle = (0, _getColTitle2.default)(colDef)) === null || _getColTitle === void 0 ? void 0 : _getColTitle.toLowerCase().includes(filterString)) && colDef.id !== 'spacer';
-  }).map(function (colDef, i) {
+  });
+
+  // let localRefCopy;
+  var handleDragEnd = function handleDragEnd(event) {
+    var active = event.active,
+      over = event.over;
+    var fromVisibleIndex = columns.findIndex(function (col) {
+      return matchedColsById(col, active);
+    });
+    var toVisibleIndex = columns.findIndex(function (col) {
+      return matchedColsById(col, over);
+    });
+    var colTitle = (0, _getColTitle2.default)(visibleCols[fromVisibleIndex]);
+    setAriaRegionText("".concat(colTitle, " dropped. New position ").concat(toVisibleIndex + 1, " of ").concat(visibleCols.length, "."));
+    var fromIndex = columns.findIndex(function (col) {
+      return matchedColsById(col, active);
+    });
+    var toIndex = columns.findIndex(function (col) {
+      return matchedColsById(col, over);
+    });
+    moveElement(fromIndex, toIndex);
+  };
+  var handleDragStart = function handleDragStart(event) {
+    var active = event.active;
+    var fromIndex = visibleCols.findIndex(function (col) {
+      return matchedColsById(col, active);
+    });
+    var colTitle = (0, _getColTitle2.default)(visibleCols[fromIndex]);
+    setAriaRegionText("".concat(colTitle, " grabbed. Current position ").concat(fromIndex + 1, " of ").concat(visibleCols.length, "."));
+  };
+  var handleDragUpdate = function handleDragUpdate(event) {
+    var active = event.active,
+      over = event.over;
+    var fromIndex = visibleCols.findIndex(function (col) {
+      return matchedColsById(col, active);
+    });
+    var toIndex = visibleCols.findIndex(function (col) {
+      return matchedColsById(col, over);
+    });
+    var colTitle = (0, _getColTitle2.default)(visibleCols[fromIndex]);
+    setAriaRegionText("".concat(colTitle, " grabbed. Original position ").concat(fromIndex + 1, ", new position ").concat(toIndex + 1, " of ").concat(visibleCols.length, "."));
+  };
+  var pointerSensor = (0, _core.useSensor)(_core.PointerSensor, {
+    // Require the mouse to move by 10 pixels before activating
+    activationConstraint: {
+      distance: 4
+    }
+  });
+  var keyboardSensor = (0, _core.useSensor)(_core.KeyboardSensor, {
+    coordinateGetter: function coordinateGetter(event, args) {
+      var currentCoordinates = args.currentCoordinates;
+      var target = event.target;
+      while (target && !target.classList.contains(draggableClass)) {
+        target = target.parentNode;
+      }
+      var delta = target.offsetHeight;
+      switch (event.code) {
+        case 'ArrowRight':
+        case 'ArrowLeft':
+          // ignore right and left
+          return currentCoordinates;
+        case 'ArrowUp':
+          return _objectSpread(_objectSpread({}, currentCoordinates), {}, {
+            y: currentCoordinates.y - delta
+          });
+        case 'ArrowDown':
+          return _objectSpread(_objectSpread({}, currentCoordinates), {}, {
+            y: currentCoordinates.y + delta
+          });
+        case 'Space':
+          break;
+      }
+    }
+  });
+  var sensors = (0, _core.useSensors)(pointerSensor, keyboardSensor);
+  var handleCheckboxKeydown = function handleCheckboxKeydown(event, colDef) {
+    if (event.code === 'Space') {
+      onSelectColumn(colDef, !(0, _common.isColumnVisible)(colDef));
+      event.preventDefault();
+      event.stopPropagation();
+      return false;
+    }
+  };
+  return /*#__PURE__*/_react.default.createElement(_core.DndContext, {
+    collisionDetection: _core.closestCenter,
+    onDragEnd: handleDragEnd,
+    onDragStart: handleDragStart,
+    onDragMove: handleDragUpdate,
+    sensors: sensors
+  }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__draggable-underlay"),
+    "aria-hidden": "true",
+    key: "draggable-underlay-".concat(id)
+  }, visibleCols.map(function (colDef) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "".concat(blockClass, "__draggable-underlay-item"),
+      key: colDef.id
+    });
+  })), /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
+    items: visibleCols,
+    strategy: _sortable.verticalListSortingStrategy
+  }, visibleCols.map(function (colDef) {
     var colHeaderTitle = (0, _getColTitle2.default)(colDef);
     var searchString = new RegExp('(' + filterString + ')');
     var res = filterString.length ? colHeaderTitle.toLowerCase().split(searchString) : null;
@@ -47,61 +147,42 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     var highlightedText = res !== null ? res[0] === '' ? "<strong>".concat(firstWord, "</strong>") + res[2] : firstWord + "<strong>".concat(res[1], "</strong>") + res[2] : colHeaderTitle;
     var isFrozenColumn = !!colDef.sticky;
     var listContents = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Checkbox, {
-      wrapperClassName: "".concat(blockClass, "__customize-columns-checkbox-wrapper"),
       checked: (0, _common.isColumnVisible)(colDef),
       disabled: isFrozenColumn,
-      onChange: onSelectColumn.bind(null, colDef),
+      onChange: function onChange(checked) {
+        return onSelectColumn(colDef, checked);
+      },
       id: "".concat(blockClass, "__customization-column-").concat(colDef.id),
       labelText: colHeaderTitle,
       title: colHeaderTitle,
       className: "".concat(blockClass, "__customize-columns-checkbox"),
-      hideLabel: true
+      hideLabel: true,
+      onKeyDown: function onKeyDown(event) {
+        return handleCheckboxKeydown(event, colDef);
+      }
     }), /*#__PURE__*/_react.default.createElement("div", {
       dangerouslySetInnerHTML: {
         __html: highlightedText
-      }
+      },
+      className: "".concat(blockClass, "__customize-columns-checkbox-visible-label")
     }));
     return /*#__PURE__*/_react.default.createElement(_DraggableElement.default, {
+      classList: draggableClass,
       key: colDef.id,
-      index: i,
-      listData: columns,
-      setListData: setColumnsObject,
-      id: "dnd-datagrid-columns-".concat(colDef.id),
-      type: "column-customization",
+      id: colDef.id,
       disabled: filterString.length > 0 || isFrozenColumn,
       ariaLabel: colHeaderTitle,
-      onGrab: setAriaRegionText,
-      isFocused: focusIndex === i,
-      moveElement: moveElement,
-      onArrowKeyDown: function onArrowKeyDown(e, isGrabbed, currentIndex) {
-        if (isGrabbed) {
-          var _columns$nextIndex;
-          var nextIndex = getNextIndex(columns, currentIndex, e.key);
-          e.preventDefault();
-          e.stopPropagation();
-          if (nextIndex >= 0 && !((_columns$nextIndex = columns[nextIndex]) !== null && _columns$nextIndex !== void 0 && _columns$nextIndex.sticky)) {
-            setFocusIndex(nextIndex);
-            moveElement(currentIndex, nextIndex);
-            e.target.scrollIntoView({
-              block: 'center'
-            });
-          }
-        }
-      },
       isSticky: isFrozenColumn,
       selected: (0, _common.isColumnVisible)(colDef)
     }, listContents);
-  }));
+  }))));
 };
 exports.DraggableItemsList = DraggableItemsList;
 DraggableItemsList.propTypes = {
   columns: _propTypes.PropTypes.array.isRequired,
   filterString: _propTypes.PropTypes.string.isRequired,
-  focusIndex: _propTypes.PropTypes.number.isRequired,
-  getNextIndex: _propTypes.PropTypes.func.isRequired,
+  id: _propTypes.PropTypes.string.isRequired,
   moveElement: _propTypes.PropTypes.func.isRequired,
   onSelectColumn: _propTypes.PropTypes.func.isRequired,
-  setAriaRegionText: _propTypes.PropTypes.func.isRequired,
-  setColumnsObject: _propTypes.PropTypes.func.isRequired,
-  setFocusIndex: _propTypes.PropTypes.func.isRequired
+  setAriaRegionText: _propTypes.PropTypes.func.isRequired
 };

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

@@ -71,13 +71,19 @@ var FilterPanel = function FilterPanel(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     showDividerLine = _useState2[0],
     setShowDividerLine = _useState2[1];
+
+  /** Context */
+  var _useContext = (0, _react.useContext)(_.FilterContext),
+    panelOpen = _useContext.panelOpen,
+    setPanelOpen = _useContext.setPanelOpen;
   var _useFilters = (0, _hooks.useFilters)({
       updateMethod: updateMethod,
       filters: filterSections,
       setAllFilters: setAllFilters,
       variation: _constants.PANEL,
       reactTableFiltersState: reactTableFiltersState,
-      onCancel: onCancel
+      onCancel: onCancel,
+      panelOpen: panelOpen
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
@@ -109,11 +115,6 @@ var FilterPanel = function FilterPanel(_ref) {
     return updateMethod === _constants.BATCH;
   }, [updateMethod]);
 
-  /** Context */
-  var _useContext = (0, _react.useContext)(_.FilterContext),
-    panelOpen = _useContext.panelOpen,
-    setPanelOpen = _useContext.setPanelOpen;
-
   /** Methods */
   var closePanel = function closePanel() {
     cancel();

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

@@ -5,20 +5,17 @@ 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(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var FilterContext = /*#__PURE__*/(0, _react.createContext)();
 exports.FilterContext = FilterContext;
 var EventEmitter = {
@@ -39,42 +36,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 +171,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/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

@@ -14,6 +14,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _carbonComponentsReact = require("carbon-components-react");
 var _constants = require("../constants");
 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(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -26,7 +27,8 @@ var useFilters = function useFilters(_ref) {
     variation = _ref.variation,
     reactTableFiltersState = _ref.reactTableFiltersState,
     _ref$onCancel = _ref.onCancel,
-    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
+    panelOpen = _ref.panelOpen;
   /** State */
   var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -36,11 +38,17 @@ var useFilters = function useFilters(_ref) {
     _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 holdingPrevFiltersRef = (0, _react.useRef)();
+  var holdingLastAppliedFiltersRef = (0, _react.useRef)([]);
+  var holdingPrevFiltersObjectArrayRef = (0, _react.useRef)([]);
 
   /** Methods */
   // If the user decides to cancel or click outside the flyout, it reverts back to the filters that were
@@ -49,8 +57,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, _react.useCallback)(function () {
     // When we reset we want the "initialFilters" to be an empty array
     var resetFiltersArray = [];
 
@@ -66,7 +80,7 @@ var useFilters = function useFilters(_ref) {
     // Update their respective refs so everything is in sync
     prevFiltersRef.current = JSON.stringify(initialFiltersState);
     prevFiltersObjectArrayRef.current = JSON.stringify(initialFiltersObjectArray);
-  };
+  }, [filters, setAllFilters, variation]);
   var applyFilters = function applyFilters(_ref2) {
     var column = _ref2.column,
       value = _ref2.value,
@@ -294,6 +308,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
+   */
+  (0, _react.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) {

package/lib/components/Datagrid/useExpandedRow.js

@@ -33,7 +33,7 @@ var useExpandedRow = function useExpandedRow(hooks) {
       return _objectSpread(_objectSpread({}, row), {}, {
         canExpand: row.original && !row.original.notExpandable,
         expandedContentHeight: expandedRowsHeight[row.index] || expandedContentHeight,
-        RowRenderer: (0, _DatagridExpandedRow.default)(row.RowRenderer, ExpandedRowContentComponent)
+        RowExpansionRenderer: (0, _DatagridExpandedRow.default)(ExpandedRowContentComponent)
       });
     });
     Object.assign(instance, {

package/lib/components/Datagrid/useFiltering.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _settings = require("../../settings");
@@ -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 = (0, _typeof2.default)(startDate) === 'object' ? startDate : new Date(startDate);
+          var endDateObj = (0, _typeof2.default)(endDate) === 'object' ? endDate : new Date(endDate);
+          if (rowValue.getTime() <= endDateObj.getTime() && rowValue.getTime() >= startDateObj.getTime()) {
             // In date range
             return true;
           } else {

package/lib/components/Datagrid/useNestedRowExpander.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,32 +9,45 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _iconsReact = require("@carbon/icons-react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../settings");
+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; }
 /* eslint-disable react/prop-types */
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * Copyright IBM Corp. 2020, 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 blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useNestedRowExpander = function useNestedRowExpander(hooks) {
+  var tempState = (0, _react.useRef)();
+  var useInstance = function useInstance(instance) {
+    tempState.current = instance;
+  };
   var visibleColumns = function visibleColumns(columns) {
     var expanderColumn = {
       id: 'expander',
       Cell: function Cell(_ref) {
         var _cx;
         var row = _ref.row;
+        var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
+          _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
+          expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
+          _ref2$expanderButtonT2 = _ref2.expanderButtonTitleCollapsed,
+          expanderButtonTitleCollapsed = _ref2$expanderButtonT2 === void 0 ? 'Expand row' : _ref2$expanderButtonT2;
+        var expanderTitle = row.isExpanded ? expanderButtonTitleExpanded : expanderButtonTitleCollapsed;
         return row.canExpand && /*#__PURE__*/_react.default.createElement("button", (0, _extends2.default)({
           type: "button",
-          "aria-label": "Expand current row",
+          "aria-label": expanderTitle,
           className: (0, _classnames.default)("".concat(blockClass, "__row-expander"), "".concat(_settings.carbon.prefix, "--btn"), "".concat(_settings.carbon.prefix, "--btn--ghost"))
-        }, row.getToggleRowExpandedProps()), /*#__PURE__*/_react.default.createElement(_iconsReact.ChevronRight16, {
+        }, row.getToggleRowExpandedProps(), {
+          title: expanderTitle
+        }), /*#__PURE__*/_react.default.createElement(_iconsReact.ChevronRight16, {
           className: (0, _classnames.default)("".concat(blockClass, "__expander-icon"), "".concat(blockClass, "__row-expander--icon"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__expander-icon--not-open"), !row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__expander-icon--open"), row.isExpanded), _cx))
         }));
       },
@@ -45,6 +59,7 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
     return [expanderColumn].concat((0, _toConsumableArray2.default)(columns));
   };
   hooks.visibleColumns.push(visibleColumns);
+  hooks.useInstance.push(useInstance);
 };
 var _default = useNestedRowExpander;
 exports.default = _default;