@carbon/ibm-products 2.1.3 → 2.2.0

package/lib/components/ButtonSetWithOverflow/ButtonSetWithOverflow.js

@@ -145,9 +145,15 @@ var ButtonSetWithOverflow = function ButtonSetWithOverflow(_ref) {
       }, (0, _propsHelper.prepareProps)(other, ['iconDescription', 'renderIcon'])));
     }).reverse());
   });
-  (0, _useResizeObserver.useResizeObserver)(sizingContainerRefSet, checkFullyVisibleItems);
-  (0, _useResizeObserver.useResizeObserver)(sizingContainerRefCombo, checkFullyVisibleItems);
-  (0, _useResizeObserver.useResizeObserver)(spaceAvailableRef, checkFullyVisibleItems);
+  (0, _useResizeObserver.useResizeObserver)(sizingContainerRefSet, {
+    callback: checkFullyVisibleItems
+  });
+  (0, _useResizeObserver.useResizeObserver)(sizingContainerRefCombo, {
+    callback: checkFullyVisibleItems
+  });
+  (0, _useResizeObserver.useResizeObserver)(spaceAvailableRef, {
+    callback: checkFullyVisibleItems
+  });
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)([blockClass, className, (0, _defineProperty2.default)({}, "".concat(blockClass, "--right"), rightAlign)]),
     ref: spaceAvailableRef

package/lib/components/Cascade/Cascade.js

@@ -29,16 +29,6 @@ var componentName = 'Cascade';
 var defaults = {
   grid: false
 };
-
-/**
-
-This pattern is intended for use with cards, tiles, or similarly styled
-components. Use this patterns in areas that are the primary focus on the page to
-help the user along their journey or locate the most important information on
-the page. It should not be used on a page if it is the secondary focus of the
-page as that will distract the user.
-
-*/
 var Cascade = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var children = _ref.children,
     className = _ref.className,
@@ -91,7 +81,7 @@ Cascade.propTypes = {
    */
   className: _propTypes.default.string,
   /**
-   * Specifies whether or not to wrap the child content in a `<Grid />`.
+   * Specifies whether or not to wrap the child content in a <Grid />.
    * If this is set to true it's important that the children are being wrapped in rows in columns.
    * Check the documentation for additional clarification.
    */

package/lib/components/CreateFullPage/CreateFullPage.js

@@ -43,19 +43,6 @@ var StepsContext = /*#__PURE__*/(0, _react.createContext)(null);
 // to let it know what number it is in the sequence of steps
 exports.StepsContext = StepsContext;
 var StepNumberContext = /*#__PURE__*/(0, _react.createContext)(-1);
-
-/**
- * Use with creations that must be completed in order for a service to be usable.
- *
- * ### Grid
- *
- * The `CreateFullPage` component utilizes Carbons' grid system in the inner
-content of the main section inside of the component. You can read more guidance
-on the Carbon's grid system
-[here](https://www.carbondesignsystem.com/guidelines/2x-grid/overview). You can
-include `<Row>` and `<Column>` components inside of each `CreateFullPageStep`
-component to get the desired affect.
- */
 exports.StepNumberContext = StepNumberContext;
 var CreateFullPage = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var backButtonText = _ref.backButtonText,

package/lib/components/CreateModal/CreateModal.js

@@ -35,13 +35,6 @@ var isValidChildren = function isValidChildren() {
     return;
   };
 };
-
-/**
- * The `CreateModal` component provides a way for a user to quickly generate a new
-resource. It is triggered by a user’s action, appears on top of the main page
-content, and is persistent until dismissed. The purpose of this modal should be
-immediately apparent to the user, with a clear and obvious path to completion.
- */
 var CreateModal = /*#__PURE__*/_react.default.forwardRef(function (_ref2, ref) {
   var className = _ref2.className,
     children = _ref2.children,

package/lib/components/CreateSidePanel/CreateSidePanel.js

@@ -34,7 +34,7 @@ var componentName = 'CreateSidePanel';
 // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
 /**
- * Use with medium complexity creations if the user needs page context. On-page content can be seen and interacted with.
+ * This is an example component to show relevant conventions and usage.
  */
 var CreateSidePanel = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var className = _ref.className,

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -674,6 +674,9 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     defaultColumn: defaultColumn,
     cellEditorValue: cellEditorValue
   });
+  var handleActiveCellMouseEnter = (0, _react.useCallback)(function () {
+    handleActiveCellMouseEnterCallback(selectionAreas, clickAndHoldActive);
+  }, [clickAndHoldActive, selectionAreas, handleActiveCellMouseEnterCallback]);
 
   // Only update if there are cell selection areas
   // Find point object that matches currentMatcher and remove the second point
@@ -706,9 +709,6 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       });
     }
   }, [spreadsheetRef, currentMatcher]);
-  var handleActiveCellMouseEnter = (0, _react.useCallback)(function () {
-    handleActiveCellMouseEnterCallback(selectionAreas, clickAndHoldActive);
-  }, [clickAndHoldActive, selectionAreas, handleActiveCellMouseEnterCallback]);
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, getTableProps(), (0, _devtools.getDevtoolsProps)(componentName), {
     className: (0, _classnames.default)(blockClass, className, "".concat(blockClass, "--interactive-cell-element"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__container-has-focus"), containerHasFocus), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__").concat(theme), theme === 'dark'), _cx)),
     ref: spreadsheetRef,

package/lib/components/Datagrid/Datagrid/DatagridContent.js

@@ -92,7 +92,7 @@ var DatagridContent = function DatagridContent(_ref) {
     return /*#__PURE__*/_react.default.createElement(_react2.Table, (0, _extends2.default)({}, getTableProps(), {
       className: (0, _classnames.default)(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), (0, _defineProperty2.default)({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-grid-active"), gridActive), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
       role: withInlineEdit && 'grid',
-      tabIndex: withInlineEdit ? 0 : -1,
+      tabIndex: withInlineEdit && 0,
       onKeyDown: withInlineEdit ? function (event) {
         return (0, _handleGridKeyPress.handleGridKeyPress)({
           event: event,

package/lib/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js

@@ -44,9 +44,6 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
     allRowsLabel = _ref$allRowsLabel === void 0 ? 'Select all' : _ref$allRowsLabel,
     columns = _ref.columns,
     withStickyColumn = _ref.withStickyColumn;
-  var _ref2 = selectAllToggle || {},
-    onSelectAllRows = _ref2.onSelectAllRows,
-    labels = _ref2.labels;
   var _useState = (0, _react.useState)(SELECT_ALL_PAGE_ROWS),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     selectAllMode = _useState2[0],
@@ -69,6 +66,9 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
       return window.removeEventListener('resize', updateSize);
     };
   }, []);
+  var _ref2 = selectAllToggle || {},
+    onSelectAllRows = _ref2.onSelectAllRows,
+    labels = _ref2.labels;
   if (labels) {
     allPageRowsLabel = labels.allPageRows || allPageRowsLabel;
     allRowsLabel = labels.allRows || allRowsLabel;

package/lib/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -26,7 +26,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridState, width, ref) {
-  var _Object$keys;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     displayAllInMenu = _useState2[0],
@@ -39,11 +38,11 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     receivedInitialWidth = _useState6[0],
     setReceivedInitialWidth = _useState6[1];
-  var selectedRowIds = datagridState.state.selectedRowIds,
+  var selectedFlatRows = datagridState.selectedFlatRows,
     toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     toolbarBatchActions = datagridState.toolbarBatchActions,
     setGlobalFilter = datagridState.setGlobalFilter;
-  var totalSelected = (_Object$keys = Object.keys(selectedRowIds || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length;
+  var totalSelected = selectedFlatRows && selectedFlatRows.length;
 
   // Get initial width of batch actions container,
   // used to measure when all items are put inside

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -59,7 +59,9 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     var gridRefElement = gridRef === null || gridRef === void 0 ? void 0 : gridRef.current;
     gridRefElement.style.width = gridRefElement === null || gridRefElement === void 0 ? void 0 : gridRefElement.clientWidth;
   };
-  (0, _useResizeObserver.useResizeObserver)(gridRef, handleVirtualGridResize);
+  (0, _useResizeObserver.useResizeObserver)(gridRef, {
+    callback: handleVirtualGridResize
+  });
   var syncScroll = function syncScroll(e) {
     var virtualBody = e.target;
     document.querySelector(".".concat(blockClass, "__head-wrap")).scrollLeft = virtualBody.scrollLeft;

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

@@ -29,7 +29,7 @@ var TearsheetWrapper = function TearsheetWrapper(_ref) {
     rest = (0, _objectWithoutProperties2.default)(_instance$customizeCo, _excluded);
   return /*#__PURE__*/React.createElement(_CustomizeColumnsTearsheet.default, (0, _extends2.default)({}, rest, labels, {
     isOpen: isTearsheetOpen,
-    isTableSortable: (instance === null || instance === void 0 ? void 0 : instance.isTableSortable) || false,
+    isTableSortable: instance === null || instance === void 0 ? void 0 : instance.isTableSortable,
     setIsTearsheetOpen: setIsTearsheetOpen,
     columnDefinitions: instance.allColumns,
     originalColumnDefinitions: instance.columns,

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

@@ -55,8 +55,11 @@ var FilterFlyout = function FilterFlyout(_ref) {
     setAllFilters = _ref.setAllFilters,
     _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
-    _ref$reactTableFilter = _ref.reactTableFiltersState,
-    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
+    _ref$initialFilters = _ref.initialFilters,
+    initialFilters = _ref$initialFilters === void 0 ? [] : _ref$initialFilters;
+  //  Save the initial filters we only need the filters once when it loads
+  var initialFiltersRef = (0, _react2.useRef)(initialFilters);
+
   /** State */
   var _useState = (0, _react2.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -67,17 +70,15 @@ var FilterFlyout = function FilterFlyout(_ref) {
       filters: filters,
       setAllFilters: setAllFilters,
       variation: _constants.FLYOUT,
-      reactTableFiltersState: reactTableFiltersState,
-      onCancel: onCancel
+      initialFilters: initialFiltersRef.current
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
     prevFiltersRef = _useFilters.prevFiltersRef,
-    cancel = _useFilters.cancel,
+    revertToPreviousFilters = _useFilters.revertToPreviousFilters,
     reset = _useFilters.reset,
     renderFilter = _useFilters.renderFilter,
-    filtersObjectArray = _useFilters.filtersObjectArray,
-    lastAppliedFilters = _useFilters.lastAppliedFilters;
+    filtersObjectArray = _useFilters.filtersObjectArray;
 
   /** Refs */
   var filterFlyoutRef = (0, _react2.useRef)(null);
@@ -116,10 +117,26 @@ var FilterFlyout = function FilterFlyout(_ref) {
     // updates the ref so next time the flyout opens we have records of the previous filters
     prevFiltersRef.current = JSON.stringify(filtersState);
     prevFiltersObjectArrayRef.current = JSON.stringify(filtersObjectArray);
-
-    // Update the last applied filters
-    lastAppliedFilters.current = JSON.stringify(filtersObjectArray);
   };
+  var cancel = function cancel() {
+    // Reverting to previous filters only applies when using batch actions
+    if (updateMethod === _constants.BATCH) {
+      revertToPreviousFilters();
+      onCancel();
+    }
+    closeFlyout();
+  };
+
+  /** Effects */
+  (0, _hooks.useClickOutside)(filterFlyoutRef, function (target) {
+    var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
+    var hasClickedOnDropdown = target.className === "".concat(carbonPrefix, "--list-box__menu-item__option");
+    if (!open || hasClickedOnDatePicker || hasClickedOnDropdown) {
+      return;
+    }
+    cancel();
+  });
+  (0, _hooks2.useSubscribeToEventEmitter)(_constants.CLEAR_FILTERS, reset);
 
   /** Renders all filters */
   var renderFilters = function renderFilters() {
@@ -146,31 +163,22 @@ var FilterFlyout = function FilterFlyout(_ref) {
       buttonSize: "md"
     });
   };
-
-  /** Effects */
-  (0, _hooks.useClickOutside)(filterFlyoutRef, function (target) {
-    var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
-    var hasClickedOnDropdown = target.className === "".concat(carbonPrefix, "--list-box__menu-item__option");
-    if (!open || hasClickedOnDatePicker || hasClickedOnDropdown) {
-      return;
-    }
-    closeFlyout();
-    cancel();
-  });
-  (0, _hooks2.useSubscribeToEventEmitter)(_constants.CLEAR_FILTERS, reset);
-  (0, _react2.useEffect)(function reflectLastAppliedFiltersWhenReactTableUpdates() {
-    lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
-  }, [reactTableFiltersState, lastAppliedFilters]);
   return /*#__PURE__*/_react2.default.createElement("div", {
     className: "".concat(componentClass, "__container")
-  }, /*#__PURE__*/_react2.default.createElement(_react.IconButton, {
-    label: flyoutIconDescription,
+  }, /*#__PURE__*/_react2.default.createElement(_react.Button, {
     kind: "ghost",
-    align: "bottom",
+    hasIconOnly: true,
+    tooltipPosition: "bottom",
+    renderIcon: function renderIcon() {
+      return /*#__PURE__*/_react2.default.createElement(_icons.Filter, {
+        size: 16
+      });
+    },
+    iconDescription: flyoutIconDescription,
     onClick: open ? closeFlyout : openFlyout,
     className: (0, _classnames.default)("".concat(componentClass, "__trigger"), (0, _defineProperty2.default)({}, "".concat(componentClass, "__trigger--open"), open)),
     disabled: data.length === 0
-  }, /*#__PURE__*/_react2.default.createElement(_icons.Filter, null)), /*#__PURE__*/_react2.default.createElement("div", {
+  }), /*#__PURE__*/_react2.default.createElement("div", {
     ref: filterFlyoutRef,
     className: (0, _classnames.default)(componentClass, (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--open"), open), (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--batch"), showActionSet), (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--instant"), !showActionSet), _cx2))
   }, /*#__PURE__*/_react2.default.createElement("div", {
@@ -198,6 +206,14 @@ FilterFlyout.propTypes = {
    * Icon description for the filter flyout button
    */
   flyoutIconDescription: _propTypes.default.string,
+  /**
+   * Filters that should be applied on load
+   */
+  initialFilters: _propTypes.default.arrayOf(_propTypes.default.shape({
+    id: _propTypes.default.string.isRequired,
+    type: _propTypes.default.string.isRequired,
+    value: _propTypes.default.any.isRequired
+  })),
   /**
    * Callback when the apply button is clicked
    */
@@ -218,14 +234,6 @@ FilterFlyout.propTypes = {
    * Label text of the primary action in the flyout
    */
   primaryActionLabel: _propTypes.default.string,
-  /**
-   * Filters from react table's state
-   */
-  reactTableFiltersState: _propTypes.default.arrayOf(_propTypes.default.shape({
-    id: _propTypes.default.string.isRequired,
-    type: _propTypes.default.string.isRequired,
-    value: _propTypes.default.any.isRequired
-  })),
   /**
    * Label text of the secondary action in the flyout
    */

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

@@ -66,8 +66,11 @@ var FilterPanel = function FilterPanel(_ref) {
     searchLabelText = _ref$searchLabelText === void 0 ? 'Filter search' : _ref$searchLabelText,
     _ref$searchPlaceholde = _ref.searchPlaceholder,
     searchPlaceholder = _ref$searchPlaceholde === void 0 ? 'Find filters' : _ref$searchPlaceholde,
-    _ref$reactTableFilter = _ref.reactTableFiltersState,
-    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
+    _ref$initialFilters = _ref.initialFilters,
+    initialFilters = _ref$initialFilters === void 0 ? [] : _ref$initialFilters;
+  //  Save the initial filters we only need the filters once
+  var initialFiltersRef = (0, _react.useRef)(initialFilters);
+
   /** State */
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -78,17 +81,15 @@ var FilterPanel = function FilterPanel(_ref) {
       filters: filterSections,
       setAllFilters: setAllFilters,
       variation: _constants.PANEL,
-      reactTableFiltersState: reactTableFiltersState,
-      onCancel: onCancel
+      initialFilters: initialFiltersRef.current
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
     prevFiltersRef = _useFilters.prevFiltersRef,
-    cancel = _useFilters.cancel,
+    revertToPreviousFilters = _useFilters.revertToPreviousFilters,
     reset = _useFilters.reset,
     renderFilter = _useFilters.renderFilter,
-    filtersObjectArray = _useFilters.filtersObjectArray,
-    lastAppliedFilters = _useFilters.lastAppliedFilters;
+    filtersObjectArray = _useFilters.filtersObjectArray;
 
   /** Refs */
   var filterPanelRef = (0, _react.useRef)();
@@ -118,8 +119,14 @@ var FilterPanel = function FilterPanel(_ref) {
 
   /** Methods */
   var closePanel = function closePanel() {
-    cancel();
-    setPanelOpen(false);
+    return setPanelOpen(false);
+  };
+  var cancel = function cancel() {
+    // Reverting to previous filters only applies when using batch actions
+    if (updateMethod === _constants.BATCH) {
+      revertToPreviousFilters();
+      onCancel();
+    }
   };
   var apply = function apply() {
     setAllFilters(filtersObjectArray);
@@ -131,9 +138,6 @@ var FilterPanel = function FilterPanel(_ref) {
     // updates the ref so next time the flyout opens we have records of the previous filters
     prevFiltersRef.current = JSON.stringify(filtersState);
     prevFiltersObjectArrayRef.current = JSON.stringify(filtersObjectArray);
-
-    // Update the last applied filters
-    lastAppliedFilters.current = JSON.stringify(filtersObjectArray);
   };
   var renderActionSet = function renderActionSet() {
     return showActionSet && /*#__PURE__*/_react.default.createElement(MotionActionSet, {
@@ -250,20 +254,20 @@ FilterPanel.propTypes = {
   closeIconDescription: _propTypes.default.string,
   filterPanelMinHeight: _propTypes.default.number,
   filterSections: _propTypes.default.array,
-  onApply: _propTypes.default.func,
-  onCancel: _propTypes.default.func,
-  onPanelClose: _propTypes.default.func,
-  onPanelOpen: _propTypes.default.func,
-  open: _propTypes.default.bool,
-  primaryActionLabel: _propTypes.default.string,
   /**
-   * Filters from react table's state
+   * Filters that should be applied on load
    */
-  reactTableFiltersState: _propTypes.default.arrayOf(_propTypes.default.shape({
+  initialFilters: _propTypes.default.arrayOf(_propTypes.default.shape({
     id: _propTypes.default.string.isRequired,
     type: _propTypes.default.string.isRequired,
     value: _propTypes.default.any.isRequired
   })),
+  onApply: _propTypes.default.func,
+  onCancel: _propTypes.default.func,
+  onPanelClose: _propTypes.default.func,
+  onPanelOpen: _propTypes.default.func,
+  open: _propTypes.default.bool,
+  primaryActionLabel: _propTypes.default.string,
   searchLabelText: _propTypes.default.string,
   searchPlaceholder: _propTypes.default.string,
   secondaryActionLabel: _propTypes.default.string,

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

@@ -10,6 +10,12 @@ Object.defineProperty(exports, "useFilters", {
     return _useFilters.default;
   }
 });
+Object.defineProperty(exports, "useInitialStateFromFilters", {
+  enumerable: true,
+  get: function get() {
+    return _useInitialStateFromFilters.default;
+  }
+});
 Object.defineProperty(exports, "useShouldDisableButtons", {
   enumerable: true,
   get: function get() {
@@ -22,6 +28,7 @@ Object.defineProperty(exports, "useSubscribeToEventEmitter", {
     return _useSubscribeToEventEmitter.default;
   }
 });
+var _useInitialStateFromFilters = _interopRequireDefault(require("./useInitialStateFromFilters"));
 var _useSubscribeToEventEmitter = _interopRequireDefault(require("./useSubscribeToEventEmitter"));
 var _useFilters = _interopRequireDefault(require("./useFilters"));
 var _useShouldDisableButtons = _interopRequireDefault(require("./useShouldDisableButtons"));

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

@@ -13,6 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@carbon/react");
 var _constants = require("../constants");
+var _useInitialStateFromFilters = _interopRequireDefault(require("./useInitialStateFromFilters"));
 var _utils = require("../utils");
 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; }
@@ -30,22 +31,19 @@ var useFilters = function useFilters(_ref) {
     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;
+    initialFilters = _ref.initialFilters;
   /** State */
-  var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
+  var _useInitialStateFromF = (0, _useInitialStateFromFilters.default)(filters, variation, initialFilters),
+    _useInitialStateFromF2 = (0, _slicedToArray2.default)(_useInitialStateFromF, 2),
+    filtersState = _useInitialStateFromF2[0],
+    setFiltersState = _useInitialStateFromF2[1];
+  var _useState = (0, _react.useState)(initialFilters),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    filtersState = _useState2[0],
-    setFiltersState = _useState2[1];
-  var _useState3 = (0, _react.useState)(reactTableFiltersState),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    filtersObjectArray = _useState4[0],
-    setFiltersObjectArray = _useState4[1];
+    filtersObjectArray = _useState2[0],
+    setFiltersObjectArray = _useState2[1];
 
   // 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));
 
   /** Methods */
@@ -54,7 +52,6 @@ var useFilters = function useFilters(_ref) {
   var revertToPreviousFilters = function revertToPreviousFilters() {
     setFiltersState(JSON.parse(prevFiltersRef.current));
     setFiltersObjectArray(JSON.parse(prevFiltersObjectArrayRef.current));
-    setAllFilters(JSON.parse(lastAppliedFilters.current));
   };
   var reset = function reset() {
     // When we reset we want the "initialFilters" to be an empty array
@@ -166,11 +163,8 @@ var useFilters = function useFilters(_ref) {
     var type = _ref3.type,
       column = _ref3.column,
       components = _ref3.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 filter;
     switch (type) {
       case _constants.DATE:
         filter = /*#__PURE__*/_react.default.createElement(_react2.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
@@ -296,31 +290,10 @@ var useFilters = function useFilters(_ref) {
         break;
     }
     if (isPanel) {
-      return /*#__PURE__*/_react.default.createElement(_react2.Layer, {
-        key: column
-      }, filter);
+      return /*#__PURE__*/_react.default.createElement(_react2.Layer, null, filter);
     }
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
-      key: column
-    }, filter);
+    return filter;
   };
-  var cancel = function cancel() {
-    // Reverting to previous filters only applies when using batch actions
-    if (updateMethod === _constants.BATCH) {
-      revertToPreviousFilters();
-      onCancel();
-    }
-  };
-
-  /** 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() {
-    var newFiltersState = (0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState);
-    setFiltersState(newFiltersState);
-    prevFiltersRef.current = JSON.stringify(newFiltersState);
-    prevFiltersObjectArrayRef.current = JSON.stringify(reactTableFiltersState);
-    setFiltersObjectArray(reactTableFiltersState);
-  }, [filters, reactTableFiltersState, variation]);
   return {
     filtersState: filtersState,
     setFiltersState: setFiltersState,
@@ -329,9 +302,7 @@ var useFilters = function useFilters(_ref) {
     revertToPreviousFilters: revertToPreviousFilters,
     reset: reset,
     renderFilter: renderFilter,
-    filtersObjectArray: filtersObjectArray,
-    lastAppliedFilters: lastAppliedFilters,
-    cancel: cancel
+    filtersObjectArray: filtersObjectArray
   };
 };
 var _default = useFilters;

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

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _constants = require("../constants");
+var _utils = require("../utils");
+/*
+ * 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.
+ */
+
+var useInitialStateFromFilters = function useInitialStateFromFilters(filters) {
+  var variation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constants.FLYOUT;
+  var initialFilters = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, initialFilters)),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  return [state, setState];
+};
+var _default = useInitialStateFromFilters;
+exports.default = _default;

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

@@ -24,7 +24,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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; }
 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; } /**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          * Copyright IBM Corp. 2022, 2023
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          * 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.
@@ -39,8 +39,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
     placeholder = _ref$placeholder === void 0 ? '' : _ref$placeholder,
     tabIndex = _ref.tabIndex,
     value = _ref.value,
-    _ref$nonEditCell = _ref.nonEditCell,
-    nonEditCell = _ref$nonEditCell === void 0 ? false : _ref$nonEditCell,
+    nonEditCell = _ref.nonEditCell,
     totalInlineEditColumns = _ref.totalInlineEditColumns,
     type = _ref.type;
   var columnId = cell.column.id;
@@ -81,9 +80,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
   var dropdownRef = (0, _react.useRef)();
   var datePickerRef = (0, _react.useRef)();
   var outerButtonElement = (0, _react.useRef)();
-  var rowSize = instance.rowSize,
-    onDataUpdate = instance.onDataUpdate;
-  var saveCellData;
   (0, _react.useEffect)(function () {
     setInitialValue(value);
     var columnId = cell.column.id;
@@ -157,6 +153,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
       }, 1);
     }
   };
+  var rowSize = instance.rowSize,
+    onDataUpdate = instance.onDataUpdate;
 
   // Auto focus text input when entering edit mode
   (0, _react.useEffect)(function () {
@@ -170,9 +168,14 @@ var InlineEditCell = function InlineEditCell(_ref) {
     }
   }, [inEditMode, type]);
 
+  // Initialize cellValue from value prop
+  (0, _react.useEffect)(function () {
+    setCellValue(value);
+  }, [value]);
+
   // Saves the new cell data, onDataUpdate is a required function to be
   // passed to useDatagrid when using useInlineEdit
-  saveCellData = (0, _react.useCallback)(function (newValue) {
+  var saveCellData = (0, _react.useCallback)(function (newValue) {
     var columnId = cell.column.id;
     var rowIndex = cell.row.index;
     onDataUpdate(function (prev) {
@@ -184,11 +187,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
       });
     });
   }, [cell, onDataUpdate]);
-
-  // Initialize cellValue from value prop
-  (0, _react.useEffect)(function () {
-    setCellValue(value);
-  }, [value]);
   var sendFocusBackToGrid = function sendFocusBackToGrid() {
     // Allows the onKeyDown listener to go back to the entire grid area
     var inlineEditArea = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit"));