@carbon/ibm-products 2.2.0 → 2.3.0

package/lib/components/CreateSidePanel/CreateSidePanel.docs-page.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _StoryDocsPage = require("../../global/js/utils/StoryDocsPage");
+var stories = _interopRequireWildcard(require("./CreateSidePanel.stories"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var DocsPage = function DocsPage() {
+  return /*#__PURE__*/_react.default.createElement(_StoryDocsPage.StoryDocsPage, {
+    altGuidelinesHref: [{
+      href: 'https://pages.github.ibm.com/cdai-design/pal/patterns/creation-flows/usage#side-panel',
+      label: 'Carbon create flows side panel usage guidelines'
+    }],
+    blocks: [{
+      story: stories.Default
+    }, {
+      title: 'Form validation',
+      description: "All forms, including that within the `CreateSidePanel` should follow C&CS\nguidelines for form validation.\n\nThis includes the following:\n\n- The `Submit` button in the side panel should be disabled, until all required\n  inputs are filled in and valid\n- All required inputs should _only_ throw an invalid error _after_ the element\n  loses focus\n- All optional form fields should have an `(optional)` text at the end of the\n  input `labelText`. Optional should always be in parentheses\n\nYou can find more information on how to validate your form fields in\n[Carbon's Form usage page](https://www.carbondesignsystem.com/components/form/usage)."
+    }]
+  });
+};
+var _default = DocsPage;
+exports.default = _default;

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.
 
 /**
- * This is an example component to show relevant conventions and usage.
+ * Use with medium complexity creations if the user needs page context. On-page content can be seen and interacted with.
  */
 var CreateSidePanel = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var className = _ref.className,

package/lib/components/CreateTearsheet/CreateTearsheet.docs-page.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _StoryDocsPage = require("../../global/js/utils/StoryDocsPage");
+var stories = _interopRequireWildcard(require("./CreateTearsheet.stories"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var DocsPage = function DocsPage() {
+  return /*#__PURE__*/_react.default.createElement(_StoryDocsPage.StoryDocsPage, {
+    altGuidelinesHref: "https://pages.github.ibm.com/cdai-design/pal/patterns/creation-flows/usage#wide-tearsheet",
+    blocks: [{
+      story: stories.multiStepTearsheet,
+      description: "This is used when you have one section per step. This can be created by passing\nin the overall `<CreateTearsheet />` component and the `<CreateTearsheetStep />`\ncomponent with form items as children:",
+      source: {
+        code: "    <CreateTearsheet {...props}>\n      <CreateTearsheetStep\n          title=\"Required title\"\n          subtitle=\"Optional subtitle\"\n          description=\"Optional description\"\n          onNext={() => {'Optional function'}}\n          disableSubmit={}\n          >\n        <TextInput\n          id=\"test-1\"\n          invalidText=\"A valid value is required\"\n          labelText=\"Topic name\"\n          placeholder=\"Enter topic name\"\n        />\n      </CreateTearsheetStep>\n    </CreateTearsheet>"
+      }
+    }, {
+      title: 'Using custom components',
+      description: "It is possible to use custom components that return `CreateTearsheetStep`s in\norder to help reduce the amount of logic in the component that contains the main\n`CreateTearsheet`. _It is required that each child of the `CreateTearsheet`\neither be a custom step or a `CreateTearsheetStep`_. An example of this could\nlook like the following:",
+      source: {
+        code: "const CreateStepCustom = ({ subtitle, ...rest }) => {\n  return (\n    <CreateTearsheetStep\n      {...rest}\n      subtitle={subtitle}\n      title=\"Step 1\"\n      onNext={() => console.log('optional validation check')}\n      onMount={() => console.log('optional onMount fn')}\n      disableSubmit={false}\n    >\n      step content here\n    </CreateTearsheetStep>\n  );\n};\n\nconst CreateComponent = () => {\n  return (\n    <CreateTearsheet {...createTearsheetProps}>\n      <CreateStepCustom subtitle=\"Custom step subtitle\" />\n      <CreateTearsheetStep\n        title=\"Topic name\"\n        fieldsetLegendText=\"Topic information\"\n        disableSubmit={!value}\n        subtitle=\"This is the unique name used to recognize your topic\"\n        description=\"It will also be used by your producers and consumers as part of the\n        connection information, so make it something easy to recognize.\"\n      >\n        Content for second step\n      </CreateTearsheetStep>\n    </CreateTearsheet>\n  );\n};"
+      }
+    }, {
+      title: 'Using dynamic steps',
+      description: "The use of dynamic steps can be utilized in a scenario when the user makes a\ncertain selection on one step that effects which steps will follow it, this is\ncontrolled via the `includeStep` prop. See abbreviated example below:",
+      code: "import { useState } from 'react';\n\nconst CreateFlow = () => {\n  const [shouldIncludeAdditionalStep, setShouldIncludeAdditionalStep] =\n    useState(false);\n  return (\n    <CreateTearsheet {...createTearsheetProps}>\n      <CreateTearsheetStep {...step1Props}>\n        Step 1 content\n        <Checkbox\n          labelText={`Include additional step`}\n          id=\"include-additional-step-checkbox\"\n          onChange={(value) => setShouldIncludeAdditionalStep(value)}\n          checked={shouldIncludeAdditionalStep}\n        />\n      </CreateTearsheetStep>\n      <CreateTearsheetStep\n        {...step2Props}\n        includeStep={shouldIncludeAdditionalStep}\n      >\n        Dynamic step content\n      </CreateTearsheetStep>\n      <CreateTearsheetStep {...step3Props}>\n        Final step content\n      </CreateTearsheetStep>\n    </CreateTearsheet>\n  );\n};"
+    }, {
+      title: 'Class names',
+      description: "Additionally, to get the preferred styling when including your own children as\nsections, you can utilize the below included class names.\n\n| Class name                                            | Element     | Features                                                   |\n| ----------------------------------------------------- | ----------- | ---------------------------------------------------------- |\n| `#{$pkg-prefix}--create-tearsheet__step--title`       | title       | `productive-heading-04` & `margin-bottom` of `$spacing-05` |\n| `#{$pkg-prefix}--create-tearsheet__step--subtitle`    | subtitle    | `productive-heading-01` & `margin-bottom` of `$spacing-03` |\n| `#{$pkg-prefix}--create-tearsheet__step--description` | description | `body-long-01` & `margin-bottom` of `$spacing-06`          |\n| `#{$pkg-prefix}--create-tearsheet__step--fieldset`    | fieldset    | `margin-bottom` of `$spacing-05` to all children elements  |\n| `#{$pkg-prefix}--create-tearsheet__section--divider`  | divider     | Includes a `1px` divider line inside the `main` content    |\n"
+    }]
+  });
+};
+var _default = DocsPage;
+exports.default = _default;

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -674,9 +674,6 @@ 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
@@ -709,6 +706,9 @@ 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,
+      tabIndex: withInlineEdit ? 0 : -1,
       onKeyDown: withInlineEdit ? function (event) {
         return (0, _handleGridKeyPress.handleGridKeyPress)({
           event: event,

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

@@ -44,6 +44,9 @@ 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],
@@ -66,9 +69,6 @@ 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

@@ -18,7 +18,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 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
+ * 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.
@@ -26,6 +26,7 @@ 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],
@@ -38,11 +39,12 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     receivedInitialWidth = _useState6[0],
     setReceivedInitialWidth = _useState6[1];
-  var selectedFlatRows = datagridState.selectedFlatRows,
+  var selectedRowIds = datagridState.state.selectedRowIds,
     toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     toolbarBatchActions = datagridState.toolbarBatchActions,
-    setGlobalFilter = datagridState.setGlobalFilter;
-  var totalSelected = selectedFlatRows && selectedFlatRows.length;
+    setGlobalFilter = datagridState.setGlobalFilter,
+    rows = datagridState.rows;
+  var totalSelected = (_Object$keys = Object.keys(selectedRowIds || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length;
 
   // Get initial width of batch actions container,
   // used to measure when all items are put inside
@@ -62,6 +64,19 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       setDisplayAllInMenu(false);
     }
   }, [width, ref, initialListWidth]);
+  var getSelectedRowData = function getSelectedRowData() {
+    var selectedRowIndexes = Object.keys(selectedRowIds);
+    var selectedRowData = selectedRowIndexes && selectedRowIndexes.length ? selectedRowIndexes.map(function (rowIndex) {
+      var filteredRow = rows.filter(function (row) {
+        return row.index === parseInt(rowIndex);
+      });
+      if (filteredRow.length) {
+        return filteredRow[0];
+      }
+      return [];
+    }) : [];
+    return selectedRowData;
+  };
 
   // Render batch actions in ButtonMenu
   var renderBatchActionOverflow = function renderBatchActionOverflow() {
@@ -84,8 +99,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
           return /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenuItem, {
             key: "".concat(batchAction.label, "-").concat(index),
             itemText: batchAction.label,
-            onClick: function onClick() {
-              batchAction.onClick();
+            onClick: function onClick(event) {
+              batchAction.onClick(getSelectedRowData(), event);
               if (batchAction.type === 'select_all') {
                 toggleAllRowsSelected(true);
               }
@@ -97,8 +112,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       return /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenuItem, {
         key: "".concat(batchAction.label, "-").concat(index),
         itemText: batchAction.label,
-        onClick: function onClick() {
-          batchAction.onClick();
+        onClick: function onClick(event) {
+          batchAction.onClick(getSelectedRowData(), event);
           if (batchAction.type === 'select_all') {
             toggleAllRowsSelected(true);
           }
@@ -122,8 +137,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       return /*#__PURE__*/_react.default.createElement(_react2.TableBatchAction, {
         key: "".concat(batchAction.label, "-").concat(index),
         renderIcon: batchAction.renderIcon,
-        onClick: function onClick() {
-          batchAction.onClick();
+        onClick: function onClick(event) {
+          batchAction.onClick(getSelectedRowData(), event);
           if (batchAction.type === 'select_all') {
             toggleAllRowsSelected(true);
           }

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

@@ -59,9 +59,7 @@ 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, {
-    callback: handleVirtualGridResize
-  });
+  (0, _useResizeObserver.useResizeObserver)(gridRef, 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,
+    isTableSortable: (instance === null || instance === void 0 ? void 0 : instance.isTableSortable) || false,
     setIsTearsheetOpen: setIsTearsheetOpen,
     columnDefinitions: instance.allColumns,
     originalColumnDefinitions: instance.columns,

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

@@ -55,11 +55,8 @@ var FilterFlyout = function FilterFlyout(_ref) {
     setAllFilters = _ref.setAllFilters,
     _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
-    _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);
-
+    _ref$reactTableFilter = _ref.reactTableFiltersState,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
   /** State */
   var _useState = (0, _react2.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -70,15 +67,17 @@ var FilterFlyout = function FilterFlyout(_ref) {
       filters: filters,
       setAllFilters: setAllFilters,
       variation: _constants.FLYOUT,
-      initialFilters: initialFiltersRef.current
+      reactTableFiltersState: reactTableFiltersState,
+      onCancel: onCancel
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
     prevFiltersRef = _useFilters.prevFiltersRef,
-    revertToPreviousFilters = _useFilters.revertToPreviousFilters,
+    cancel = _useFilters.cancel,
     reset = _useFilters.reset,
     renderFilter = _useFilters.renderFilter,
-    filtersObjectArray = _useFilters.filtersObjectArray;
+    filtersObjectArray = _useFilters.filtersObjectArray,
+    lastAppliedFilters = _useFilters.lastAppliedFilters;
 
   /** Refs */
   var filterFlyoutRef = (0, _react2.useRef)(null);
@@ -117,26 +116,10 @@ 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);
-  };
-  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);
+    // Update the last applied filters
+    lastAppliedFilters.current = JSON.stringify(filtersObjectArray);
+  };
 
   /** Renders all filters */
   var renderFilters = function renderFilters() {
@@ -163,22 +146,31 @@ 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.Button, {
+  }, /*#__PURE__*/_react2.default.createElement(_react.IconButton, {
+    label: flyoutIconDescription,
     kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: function renderIcon() {
-      return /*#__PURE__*/_react2.default.createElement(_icons.Filter, {
-        size: 16
-      });
-    },
-    iconDescription: flyoutIconDescription,
+    align: "bottom",
     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("div", {
+  }, /*#__PURE__*/_react2.default.createElement(_icons.Filter, null)), /*#__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", {
@@ -206,14 +198,6 @@ 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
    */
@@ -234,6 +218,14 @@ 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,11 +66,8 @@ 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$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);
-
+    _ref$reactTableFilter = _ref.reactTableFiltersState,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
   /** State */
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -81,15 +78,17 @@ var FilterPanel = function FilterPanel(_ref) {
       filters: filterSections,
       setAllFilters: setAllFilters,
       variation: _constants.PANEL,
-      initialFilters: initialFiltersRef.current
+      reactTableFiltersState: reactTableFiltersState,
+      onCancel: onCancel
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
     prevFiltersRef = _useFilters.prevFiltersRef,
-    revertToPreviousFilters = _useFilters.revertToPreviousFilters,
+    cancel = _useFilters.cancel,
     reset = _useFilters.reset,
     renderFilter = _useFilters.renderFilter,
-    filtersObjectArray = _useFilters.filtersObjectArray;
+    filtersObjectArray = _useFilters.filtersObjectArray,
+    lastAppliedFilters = _useFilters.lastAppliedFilters;
 
   /** Refs */
   var filterPanelRef = (0, _react.useRef)();
@@ -119,14 +118,8 @@ var FilterPanel = function FilterPanel(_ref) {
 
   /** Methods */
   var closePanel = function closePanel() {
-    return setPanelOpen(false);
-  };
-  var cancel = function cancel() {
-    // Reverting to previous filters only applies when using batch actions
-    if (updateMethod === _constants.BATCH) {
-      revertToPreviousFilters();
-      onCancel();
-    }
+    cancel();
+    setPanelOpen(false);
   };
   var apply = function apply() {
     setAllFilters(filtersObjectArray);
@@ -138,6 +131,9 @@ 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, {
@@ -254,20 +250,20 @@ FilterPanel.propTypes = {
   closeIconDescription: _propTypes.default.string,
   filterPanelMinHeight: _propTypes.default.number,
   filterSections: _propTypes.default.array,
-  /**
-   * 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
-  })),
   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
+   */
+  reactTableFiltersState: _propTypes.default.arrayOf(_propTypes.default.shape({
+    id: _propTypes.default.string.isRequired,
+    type: _propTypes.default.string.isRequired,
+    value: _propTypes.default.any.isRequired
+  })),
   searchLabelText: _propTypes.default.string,
   searchPlaceholder: _propTypes.default.string,
   secondaryActionLabel: _propTypes.default.string,

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

@@ -4,16 +4,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "useFilters", {
+Object.defineProperty(exports, "useFilterContext", {
   enumerable: true,
   get: function get() {
-    return _useFilters.default;
+    return _useFilterContext.default;
   }
 });
-Object.defineProperty(exports, "useInitialStateFromFilters", {
+Object.defineProperty(exports, "useFilters", {
   enumerable: true,
   get: function get() {
-    return _useInitialStateFromFilters.default;
+    return _useFilters.default;
   }
 });
 Object.defineProperty(exports, "useShouldDisableButtons", {
@@ -28,7 +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"));
+var _useShouldDisableButtons = _interopRequireDefault(require("./useShouldDisableButtons"));
+var _useFilterContext = _interopRequireDefault(require("./useFilterContext"));

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

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _FilterProvider = require("../FilterProvider");
+var _react = require("react");
+var useFilterContext = function useFilterContext() {
+  // get the context
+  var context = (0, _react.useContext)(_FilterProvider.FilterContext);
+
+  // if `undefined`, throw an error
+  if (context === undefined) {
+    throw new Error('useFilterContext was used outside of its Provider');
+  }
+  return context;
+};
+var _default = useFilterContext;
+exports.default = _default;

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

@@ -13,7 +13,6 @@ 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; }
@@ -31,19 +30,22 @@ var useFilters = function useFilters(_ref) {
     filters = _ref$filters === void 0 ? [] : _ref$filters,
     setAllFilters = _ref.setAllFilters,
     variation = _ref.variation,
-    initialFilters = _ref.initialFilters;
+    reactTableFiltersState = _ref.reactTableFiltersState,
+    _ref$onCancel = _ref.onCancel,
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
   /** State */
-  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),
+  var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    filtersObjectArray = _useState2[0],
-    setFiltersObjectArray = _useState2[1];
+    filtersState = _useState2[0],
+    setFiltersState = _useState2[1];
+  var _useState3 = (0, _react.useState)(reactTableFiltersState),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    filtersObjectArray = _useState4[0],
+    setFiltersObjectArray = _useState4[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 */
@@ -52,6 +54,7 @@ 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
@@ -163,8 +166,11 @@ var useFilters = function useFilters(_ref) {
     var type = _ref3.type,
       column = _ref3.column,
       components = _ref3.props;
-    var isPanel = variation === _constants.PANEL;
     var filter;
+    var isPanel = variation === _constants.PANEL;
+    if (!type) {
+      return console.error("type: ".concat(type, "; does not exist as a type of filter."));
+    }
     switch (type) {
       case _constants.DATE:
         filter = /*#__PURE__*/_react.default.createElement(_react2.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
@@ -290,10 +296,31 @@ var useFilters = function useFilters(_ref) {
         break;
     }
     if (isPanel) {
-      return /*#__PURE__*/_react.default.createElement(_react2.Layer, null, filter);
+      return /*#__PURE__*/_react.default.createElement(_react2.Layer, {
+        key: column
+      }, filter);
     }
-    return filter;
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
+      key: column
+    }, 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,
@@ -302,7 +329,9 @@ var useFilters = function useFilters(_ref) {
     revertToPreviousFilters: revertToPreviousFilters,
     reset: reset,
     renderFilter: renderFilter,
-    filtersObjectArray: filtersObjectArray
+    filtersObjectArray: filtersObjectArray,
+    lastAppliedFilters: lastAppliedFilters,
+    cancel: cancel
   };
 };
 var _default = useFilters;