@carbon/ibm-products 1.59.1 → 1.61.0

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

@@ -1,3 +1,6 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
 /**
  * Copyright IBM Corp. 2023, 2023
  *
@@ -11,89 +14,175 @@ import { Checkbox } from 'carbon-components-react';
 import { isColumnVisible } from './common';
 import DraggableElement from '../../DraggableElement';
 import { pkg } from '../../../../../settings';
-import getColTitle from '../../../utils/getColTitle';
+import { getNodeTextContent } from '../../../../../global/js/utils/getNodeTextContent';
+import { DndContext, KeyboardSensor, PointerSensor, closestCenter, useSensor, useSensors } from '@dnd-kit/core';
+import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
+var matchedColsById = function matchedColsById(col1, col2) {
+  return col1 && col2 && col1.id === col2.id;
+};
 export 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.createElement(React.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 !!getColTitle(colDef);
+    return getNodeTextContent(colDef.Header).trim().length !== 0;
   }).filter(Boolean).filter(function (colDef) {
     return !colDef.isAction;
   }).filter(function (colDef) {
-    var _getColTitle;
-    return filterString.length === 0 || ((_getColTitle = getColTitle(colDef)) === null || _getColTitle === void 0 ? void 0 : _getColTitle.toLowerCase().includes(filterString)) && colDef.id !== 'spacer';
-  }).map(function (colDef, i) {
-    var colHeaderTitle = getColTitle(colDef);
+    return colDef.id !== 'spacer';
+  }).filter(function (colDef) {
+    return filterString.length === 0 || getNodeTextContent(colDef.Header).toLowerCase().includes(filterString);
+  });
+
+  // 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 = getNodeTextContent(visibleCols[fromVisibleIndex].Header);
+    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 = getNodeTextContent(visibleCols[fromIndex].Header);
+    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 = getNodeTextContent(visibleCols[fromIndex].Header);
+    setAriaRegionText("".concat(colTitle, " grabbed. Original position ").concat(fromIndex + 1, ", new position ").concat(toIndex + 1, " of ").concat(visibleCols.length, "."));
+  };
+  var pointerSensor = useSensor(PointerSensor, {
+    // Require the mouse to move by 10 pixels before activating
+    activationConstraint: {
+      distance: 4
+    }
+  });
+  var keyboardSensor = useSensor(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 = useSensors(pointerSensor, keyboardSensor);
+  var handleCheckboxKeydown = function handleCheckboxKeydown(event, colDef) {
+    if (event.code === 'Space') {
+      onSelectColumn(colDef, !isColumnVisible(colDef));
+      event.preventDefault();
+      event.stopPropagation();
+      return false;
+    }
+  };
+  return /*#__PURE__*/React.createElement(DndContext, {
+    collisionDetection: closestCenter,
+    onDragEnd: handleDragEnd,
+    onDragStart: handleDragStart,
+    onDragMove: handleDragUpdate,
+    sensors: sensors
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__draggable-underlay"),
+    "aria-hidden": "true",
+    key: "draggable-underlay-".concat(id)
+  }, visibleCols.map(function (colDef) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(blockClass, "__draggable-underlay-item"),
+      key: colDef.id
+    });
+  })), /*#__PURE__*/React.createElement(SortableContext, {
+    items: visibleCols,
+    strategy: verticalListSortingStrategy
+  }, visibleCols.map(function (colDef) {
+    var colHeaderTitle = getNodeTextContent(colDef.Header);
     var searchString = new RegExp('(' + filterString + ')');
     var res = filterString.length ? colHeaderTitle.toLowerCase().split(searchString) : null;
     var firstWord = res !== null ? res[0] === '' ? res[1].charAt(0).toUpperCase() + res[1].substring(1) : res[0].charAt(0).toUpperCase() + res[0].substring(1) : null;
     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.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
-      wrapperClassName: "".concat(blockClass, "__customize-columns-checkbox-wrapper"),
       checked: 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.createElement("div", {
       dangerouslySetInnerHTML: {
         __html: highlightedText
-      }
+      },
+      className: "".concat(blockClass, "__customize-columns-checkbox-visible-label")
     }));
     return /*#__PURE__*/React.createElement(DraggableElement, {
+      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: isColumnVisible(colDef)
     }, listContents);
-  }));
+  }))));
 };
 DraggableItemsList.propTypes = {
   columns: PropTypes.array.isRequired,
   filterString: PropTypes.string.isRequired,
-  focusIndex: PropTypes.number.isRequired,
-  getNextIndex: PropTypes.func.isRequired,
+  id: PropTypes.string.isRequired,
   moveElement: PropTypes.func.isRequired,
   onSelectColumn: PropTypes.func.isRequired,
-  setAriaRegionText: PropTypes.func.isRequired,
-  setColumnsObject: PropTypes.func.isRequired,
-  setFocusIndex: PropTypes.func.isRequired
+  setAriaRegionText: PropTypes.func.isRequired
 };

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

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

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(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) { _defineProperty(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; }
 /**
- * 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/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

@@ -11,10 +11,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * 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 React, { useState, useRef, useEffect, useCallback } from 'react';
 import { Checkbox, DatePicker, DatePickerInput, Dropdown, FormGroup, NumberInput, RadioButton, RadioButtonGroup } from 'carbon-components-react';
 import { INSTANT, BATCH, DATE, CHECKBOX, NUMBER, RADIO, DROPDOWN, PANEL } from '../constants';
 import { getInitialStateFromFilters } from '../utils';
+import { usePreviousValue } from '../../../../../../global/js/hooks';
 var useFilters = function useFilters(_ref) {
   var updateMethod = _ref.updateMethod,
     _ref$filters = _ref.filters,
@@ -23,7 +24,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 = useState(getInitialStateFromFilters(filters, variation, reactTableFiltersState)),
     _useState2 = _slicedToArray(_useState, 2),
@@ -33,11 +35,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 +54,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,7 +77,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,
@@ -291,6 +305,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/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

@@ -32,14 +32,12 @@ export var InlineEditCell = function InlineEditCell(_ref) {
     tabIndex = _ref.tabIndex,
     value = _ref.value,
     nonEditCell = _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;
@@ -442,8 +440,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()))
   );
@@ -461,7 +457,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/addons/RowSize/RowSizeDropdown.js

@@ -10,23 +10,31 @@ var _excluded = ["legendText"];
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Settings16 } from '@carbon/icons-react';
 import { Button } from 'carbon-components-react';
 import cx from 'classnames';
 import RowSizeRadioGroup from './RowSizeRadioGroup';
-import { pkg } from '../../../../../settings';
+import { pkg, carbon } from '../../../../../settings';
 var blockClass = "".concat(pkg.prefix, "--datagrid__row-size");
 var RowSizeDropdown = function RowSizeDropdown(_ref) {
   var _ref$legendText = _ref.legendText,
-    legendText = _ref$legendText === void 0 ? 'Row height' : _ref$legendText,
+    legendText = _ref$legendText === void 0 ? 'Row settings' : _ref$legendText,
     props = _objectWithoutProperties(_ref, _excluded);
   var buttonRef = useRef(null);
+  var radioGroupRef = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isOpen = _useState2[0],
     setIsOpen = _useState2[1];
+  useEffect(function () {
+    if (isOpen) {
+      var radioGroupParentElement = radioGroupRef === null || radioGroupRef === void 0 ? void 0 : radioGroupRef.current;
+      var checkedRadioChild = radioGroupParentElement === null || radioGroupParentElement === void 0 ? void 0 : radioGroupParentElement.querySelector(".".concat(carbon.prefix, "--radio-button:checked"));
+      checkedRadioChild === null || checkedRadioChild === void 0 ? void 0 : checkedRadioChild.focus();
+    }
+  }, [isOpen]);
   var onCloseHandler = function onCloseHandler() {
     setIsOpen(false);
   };
@@ -36,7 +44,9 @@ var RowSizeDropdown = function RowSizeDropdown(_ref) {
     }
   };
   var onClickHandler = function onClickHandler() {
-    setIsOpen(!isOpen);
+    setIsOpen(function (prev) {
+      return !prev;
+    });
   };
   var onKeyHandler = function onKeyHandler(e) {
     if (e.key === 'Escape') {
@@ -59,7 +69,9 @@ var RowSizeDropdown = function RowSizeDropdown(_ref) {
     iconDescription: legendText,
     className: cx("".concat(blockClass, "-button"), _defineProperty({}, "".concat(blockClass, "-button--open"), isOpen)),
     onClick: onClickHandler
-  }), isOpen && /*#__PURE__*/React.createElement(RowSizeRadioGroup, _extends({}, props, {
+  }), isOpen && /*#__PURE__*/React.createElement(RowSizeRadioGroup, _extends({
+    ref: radioGroupRef
+  }, props, {
     legendText: legendText,
     buttonRef: buttonRef
   })));