@carbon/ibm-products 2.0.0-rc.18 → 2.0.0-rc.19

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

@@ -0,0 +1,50 @@
+"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 _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
+/**
+ * Copyright IBM Corp. 2023, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/* eslint-disable jsdoc/check-param-names */
+
+/**
+ * Keeps track of the button disabled state
+ * @param  {string} initialValue - the initial value if the buttons should be enabled or disabled
+ * @param  {object} filtersState - the filter state from the filter panel or flyout
+ * @param  {object} prevFiltersRef - reference of the prev filterState
+ * @returns {Array} returns a tuple of the state and setter function
+ */
+var useShouldDisableButtons = function useShouldDisableButtons(_ref) {
+  var _ref$initialValue = _ref.initialValue,
+      initialValue = _ref$initialValue === void 0 ? true : _ref$initialValue,
+      filtersState = _ref.filtersState,
+      prevFiltersRef = _ref.prevFiltersRef;
+
+  var _useState = (0, _react.useState)(initialValue),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      shouldDisableButtons = _useState2[0],
+      setShouldDisableButtons = _useState2[1];
+
+  (0, _react.useEffect)(function updateDisabledButtonsState() {
+    setShouldDisableButtons((0, _isEqual.default)(filtersState, JSON.parse(prevFiltersRef.current)));
+  }, [filtersState, prevFiltersRef]);
+  return [shouldDisableButtons, setShouldDisableButtons];
+};
+
+var _default = useShouldDisableButtons;
+exports.default = _default;

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

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+var _FilterProvider = require("../FilterProvider");
+
+/**
+ * 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.
+ */
+
+/**
+ * Subscribes to the filter event emitter
+ * @param  {string} type - the type of event to call
+ * @param  {Function} callback - a callback to run when the event is dispatched
+ */
+var useSubscribeToEventEmitter = function useSubscribeToEventEmitter(type, callback) {
+  var _useContext = (0, _react.useContext)(_FilterProvider.FilterContext),
+      EventEmitter = _useContext.EventEmitter;
+
+  (0, _react.useEffect)(function subscribeToEmitter() {
+    // This event is emitted from the DatagridToolbar component when clearFilters is clicked in FilterSummary
+    EventEmitter.subscribe(type, callback);
+  });
+};
+
+var _default = useSubscribeToEventEmitter;
+exports.default = _default;

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

@@ -5,11 +5,33 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "FilterContext", {
+  enumerable: true,
+  get: function get() {
+    return _FilterProvider.FilterContext;
+  }
+});
 Object.defineProperty(exports, "FilterFlyout", {
   enumerable: true,
   get: function get() {
     return _FilterFlyout.default;
   }
 });
+Object.defineProperty(exports, "FilterPanel", {
+  enumerable: true,
+  get: function get() {
+    return _FilterPanel.default;
+  }
+});
+Object.defineProperty(exports, "FilterProvider", {
+  enumerable: true,
+  get: function get() {
+    return _FilterProvider.FilterProvider;
+  }
+});
+
+var _FilterFlyout = _interopRequireDefault(require("./FilterFlyout"));
+
+var _FilterPanel = _interopRequireDefault(require("./FilterPanel"));
 
-var _FilterFlyout = _interopRequireDefault(require("./FilterFlyout"));
+var _FilterProvider = require("./FilterProvider");

package/lib/components/Datagrid/Datagrid/addons/Filtering/motion/variants.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.panelVariants = exports.innerContainerVariants = exports.actionSetVariants = void 0;
+
+var _motionConstants = require("../../../../../../global/js/utils/motionConstants");
+
+var _constants = require("../constants");
+
+var panelVariants = {
+  hidden: {
+    width: 0,
+    overflow: 'hidden',
+    transition: {
+      duration: _motionConstants.DURATIONS.fast02,
+      ease: _motionConstants.EASINGS.productive.exit,
+      when: 'afterChildren'
+    }
+  },
+  visible: {
+    width: _constants.PANEL_WIDTH,
+    overflow: 'visible',
+    transition: {
+      duration: _motionConstants.DURATIONS.moderate02,
+      ease: _motionConstants.EASINGS.productive.entrance,
+      when: 'beforeChildren'
+    }
+  }
+};
+exports.panelVariants = panelVariants;
+var innerContainerVariants = {
+  hidden: {
+    opacity: 0,
+    transition: {
+      duration: _motionConstants.DURATIONS.fast01,
+      ease: _motionConstants.EASINGS.productive.exit
+    }
+  },
+  visible: {
+    opacity: 1,
+    transition: {
+      duration: _motionConstants.DURATIONS.fast02,
+      ease: _motionConstants.EASINGS.productive.entrance,
+      when: 'beforeChildren'
+    }
+  }
+};
+exports.innerContainerVariants = innerContainerVariants;
+var actionSetVariants = {
+  hidden: {
+    y: _constants.ACTION_SET_HEIGHT,
+    transition: {
+      duration: _motionConstants.DURATIONS.fast01,
+      ease: _motionConstants.EASINGS.productive.exit
+    }
+  },
+  visible: {
+    y: 0,
+    transition: {
+      duration: _motionConstants.DURATIONS.fast02,
+      ease: _motionConstants.EASINGS.productive.entrance
+    }
+  }
+};
+exports.actionSetVariants = actionSetVariants;

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

@@ -5,42 +5,77 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getInitialStateFromFilters = void 0;
 
+var _constants = require("./constants");
+
 /**
- * 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.
  */
 // This functions takes the filters passed in and makes an object to track it's state
 var getInitialStateFromFilters = function getInitialStateFromFilters(filters) {
+  var variation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constants.FLYOUT;
   var initialFilterState = {};
-  filters.forEach(function (_ref) {
+
+  var setInitialState = function setInitialState(_ref) {
     var type = _ref.type,
         column = _ref.column,
         props = _ref.props;
 
     if (type === 'checkbox') {
-      initialFilterState[column] = props.Checkbox.map(function (_ref2) {
-        var id = _ref2.id,
-            labelText = _ref2.labelText,
-            value = _ref2.value;
-        return {
-          id: id,
-          labelText: labelText,
-          value: value,
-          selected: false
-        };
-      });
+      initialFilterState[column] = {
+        value: props.Checkbox.map(function (_ref2) {
+          var id = _ref2.id,
+              labelText = _ref2.labelText,
+              value = _ref2.value;
+          return {
+            id: id,
+            labelText: labelText,
+            value: value,
+            selected: false
+          };
+        }),
+        type: type
+      };
     } else if (type === 'date') {
-      initialFilterState[column] = [undefined, undefined];
+      initialFilterState[column] = {
+        value: [null, null],
+        type: type
+      };
     } else if (type === 'number') {
-      initialFilterState[column] = '';
+      initialFilterState[column] = {
+        value: '',
+        type: type
+      };
     } else if (type === 'radio') {
-      initialFilterState[column] = '';
+      initialFilterState[column] = {
+        value: '',
+        type: type
+      };
     } else if (type === 'dropdown') {
-      initialFilterState[column] = '';
+      initialFilterState[column] = {
+        value: '',
+        type: type
+      };
     }
-  });
+  };
+
+  if (variation === _constants.FLYOUT) {
+    filters.forEach(setInitialState);
+  } else if (variation === _constants.PANEL) {
+    filters.forEach(function (_ref3) {
+      var _ref3$filters = _ref3.filters,
+          sections = _ref3$filters === void 0 ? [] : _ref3$filters;
+      sections.forEach(function (_ref4) {
+        var filter = _ref4.filter;
+        return setInitialState(filter);
+      });
+    });
+  } else {
+    console.error('No variation passed into useInitialStateFromFilters');
+  }
+
   return initialFilterState;
 };
 

package/lib/components/Datagrid/Datagrid.stories/index.js

@@ -11,12 +11,6 @@ Object.defineProperty(exports, "CustomizeColumnStoryNotes", {
     return _CustomizeColumnStory.story;
   }
 });
-Object.defineProperty(exports, "LeftPanelStory", {
-  enumerable: true,
-  get: function get() {
-    return _LeftPanelStory.story;
-  }
-});
 Object.defineProperty(exports, "RowSizeDropdownStory", {
   enumerable: true,
   get: function get() {
@@ -42,6 +36,4 @@ var _StickyActionsColumnStory = _interopRequireDefault(require("./StickyActionsC
 
 var _RowSizeDropdownStory = require("./RowSizeDropdownStory");
 
-var _LeftPanelStory = require("./LeftPanelStory");
-
 var _SelectAllWithToggleStory = require("./SelectAllWithToggleStory");

package/lib/components/Datagrid/useFiltering.js

@@ -15,6 +15,8 @@ var _react = require("react");
 
 var _Filtering = require("./Datagrid/addons/Filtering");
 
+var _constants = require("./Datagrid/addons/Filtering/constants");
+
 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; }
@@ -72,15 +74,21 @@ var useFiltering = function useFiltering(hooks) {
   hooks.useInstance.push(function (instance) {
     var filterProps = instance.filterProps,
         setAllFilters = instance.setAllFilters,
-        headers = instance.headers;
+        setFilter = instance.setFilter,
+        headers = instance.headers,
+        data = instance.data;
     var defaultProps = {
-      variation: 'flyout'
+      variation: 'flyout',
+      updateMethod: _constants.BATCH,
+      panelIconDescription: 'Open filter panel'
     };
 
     var getFilterFlyoutProps = function getFilterFlyoutProps() {
       return _objectSpread(_objectSpread(_objectSpread({}, defaultProps), filterProps), {}, {
         setAllFilters: setAllFilters,
-        headers: headers
+        setFilter: setFilter,
+        headers: headers,
+        data: data
       });
     };
 

package/lib/components/Datagrid/utils/DatagridActions.js

@@ -11,6 +11,8 @@ exports.DatagridActions = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@carbon/react");
@@ -23,6 +25,8 @@ var _settings = require("../../../settings");
 
 var _ButtonMenu = require("../../ButtonMenu");
 
+var _Filtering = require("../Datagrid/addons/Filtering");
+
 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; }
@@ -36,6 +40,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var DatagridActions = function DatagridActions(datagridState) {
+  var _useContext = (0, _react.useContext)(_Filtering.FilterContext),
+      setLeftPanelOpen = _useContext.setLeftPanelOpen;
+
   var selectedFlatRows = datagridState.selectedFlatRows,
       setGlobalFilter = datagridState.setGlobalFilter,
       CustomizeColumnsButton = datagridState.CustomizeColumnsButton,
@@ -44,7 +51,8 @@ var DatagridActions = function DatagridActions(datagridState) {
       useDenseHeader = datagridState.useDenseHeader,
       filterProps = datagridState.filterProps,
       getFilterFlyoutProps = datagridState.getFilterFlyoutProps,
-      FilterFlyout = datagridState.FilterFlyout;
+      FilterFlyout = datagridState.FilterFlyout,
+      data = datagridState.data;
 
   var downloadCsv = function downloadCsv() {
     alert('Downloading...');
@@ -66,6 +74,28 @@ var DatagridActions = function DatagridActions(datagridState) {
     return (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'flyout' && /*#__PURE__*/_react.default.createElement(FilterFlyout, getFilterFlyoutProps());
   };
 
+  var renderFilterPanelButton = function renderFilterPanelButton() {
+    return (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' && /*#__PURE__*/_react.default.createElement(_react2.Button, {
+      kind: "ghost",
+      hasIconOnly: true,
+      tooltipPosition: "bottom",
+      renderIcon: function renderIcon(props) {
+        return /*#__PURE__*/_react.default.createElement(_icons.Filter, (0, _extends2.default)({
+          size: 16
+        }, props));
+      },
+      iconDescription: filterProps.panelIconDescription,
+      className: "".concat(blockClass, "-filter-panel-open-button"),
+      onClick: function onClick() {
+        return setLeftPanelOpen(function (open) {
+          return !open;
+        });
+      },
+      disabled: data.length === 0,
+      tooltipAlignment: "start"
+    });
+  };
+
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       modalOpen = _useState2[0],
@@ -90,7 +120,7 @@ var DatagridActions = function DatagridActions(datagridState) {
   var items = ['Option 1', 'Option 2', 'Option 3'];
   return isNothingSelected && (useDenseHeader && useDenseHeader ? /*#__PURE__*/_react.default.createElement(_react2.TableToolbarContent, {
     size: "sm"
-  }, !mobileToolbar ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+  }, !mobileToolbar ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderFilterPanelButton(), /*#__PURE__*/_react.default.createElement("div", {
     style: style
   }, /*#__PURE__*/_react.default.createElement(_react2.Button, {
     kind: "ghost",
@@ -99,16 +129,16 @@ var DatagridActions = function DatagridActions(datagridState) {
     renderIcon: _icons.Download,
     iconDescription: 'Download CSV',
     onClick: downloadCsv
-  })), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
+  })), renderFilterFlyout(), CustomizeColumnsButton && /*#__PURE__*/_react.default.createElement("div", {
+    style: style
+  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null)), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
     style: style,
     className: "".concat(blockClass, "__toolbar-divider")
   }, /*#__PURE__*/_react.default.createElement(_react2.Button, {
     kind: "ghost",
     renderIcon: _icons.Add,
     iconDescription: 'Action'
-  }, "Ghost button")), CustomizeColumnsButton && /*#__PURE__*/_react.default.createElement("div", {
-    style: style
-  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null))) : /*#__PURE__*/_react.default.createElement(_react2.OverflowMenu, {
+  }, "Ghost button"))) : /*#__PURE__*/_react.default.createElement(_react2.OverflowMenu, {
     ariaLabel: "Tools",
     size: "md",
     flipped: true
@@ -135,7 +165,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     itemText: "Create",
     hasDivider: true,
     requireTitle: true
-  }))) : !mobileToolbar ? /*#__PURE__*/_react.default.createElement(_react2.TableToolbarContent, null, /*#__PURE__*/_react.default.createElement(_react2.TableToolbarSearch, {
+  }))) : !mobileToolbar ? /*#__PURE__*/_react.default.createElement(_react2.TableToolbarContent, null, renderFilterPanelButton(), /*#__PURE__*/_react.default.createElement(_react2.TableToolbarSearch, {
     size: "xl",
     id: "columnSearch",
     persistent: true,
@@ -143,7 +173,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     onChange: function onChange(e) {
       return setGlobalFilter(e.target.value);
     }
-  }), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
+  }), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement("div", {
     style: style
   }, /*#__PURE__*/_react.default.createElement(_react2.Button, {
     kind: "ghost",
@@ -163,7 +193,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     onClick: downloadCsv
   })), CustomizeColumnsButton && /*#__PURE__*/_react.default.createElement("div", {
     style: style
-  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null)), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenu, {
+  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null)), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenu, {
     label: "Primary button",
     renderIcon: _icons.ChevronDown,
     menuOptionsClass: "".concat(blockClass, "__toolbar-options")
@@ -176,7 +206,7 @@ var DatagridActions = function DatagridActions(datagridState) {
   }), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenuItem, {
     itemText: "Option 3",
     onClick: (0, _addonActions.action)("Click on ButtonMenu Option 3")
-  }))) : /*#__PURE__*/_react.default.createElement(_react2.TableToolbarContent, null, /*#__PURE__*/_react.default.createElement(_react2.TableToolbarSearch, {
+  }))) : /*#__PURE__*/_react.default.createElement(_react2.TableToolbarContent, null, renderFilterPanelButton(), /*#__PURE__*/_react.default.createElement(_react2.TableToolbarSearch, {
     size: "xl",
     id: "columnSearch",
     persistent: true,
@@ -184,7 +214,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     onChange: function onChange(e) {
       return setGlobalFilter(e.target.value);
     }
-  }), /*#__PURE__*/_react.default.createElement(_react2.OverflowMenu, {
+  }), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement(_react2.OverflowMenu, {
     ariaLabel: "Tools",
     size: "lg",
     flipped: true,

package/lib/components/OptionsTile/OptionsTile.js

@@ -273,11 +273,11 @@ var OptionsTile = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   }), renderTitle()), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__content"),
     ref: contentRef
-  }, isLocked && /*#__PURE__*/_react.default.createElement("p", {
+  }, /*#__PURE__*/_react.default.createElement(_react2.Layer, null, isLocked && /*#__PURE__*/_react.default.createElement("p", {
     className: "".concat(blockClass, "__locked-text")
   }, /*#__PURE__*/_react.default.createElement(_icons.Locked, {
     size: 16
-  }), lockedText), children)) : /*#__PURE__*/_react.default.createElement("div", {
+  }), lockedText), children))) : /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__static-content")
   }, renderTitle()));
 }); // Return a placeholder if not released and not enabled by feature flag

package/lib/components/Tearsheet/Tearsheet.js

@@ -194,6 +194,11 @@ Tearsheet.propTypes = _objectSpread({
    */
   open: _propTypes.default.bool,
 
+  /**
+   * The DOM node the tearsheet should be rendered within. Defaults to document.body.
+   */
+  portalTarget: _propTypes.default.node,
+
   /**
    * The main title of the tearsheet, displayed in the header area.
    */

package/lib/components/Tearsheet/TearsheetNarrow.js

@@ -156,6 +156,11 @@ TearsheetNarrow.propTypes = _objectSpread({
    */
   open: _propTypes.default.bool,
 
+  /**
+   * The DOM node the tearsheet should be rendered within. Defaults to document.body.
+   */
+  portalTarget: _propTypes.default.node,
+
   /**
    * The main title of the tearsheet, displayed in the header area.
    */

package/lib/components/Tearsheet/TearsheetShell.js

@@ -430,7 +430,7 @@ TearsheetShell.propTypes = _objectSpread({
   open: _propTypes.default.bool,
 
   /**
-   * portal target for the all tags modal
+   * The DOM node the tearsheet should be rendered within. Defaults to document.body.
    */
   portalTarget: _propTypes.default.node,
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -94,5 +94,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "2d00db04e59349f364cc19790a25abbe6760aad9"
+  "gitHead": "383f81a5557b5dc2608685de4b4454beabb755c5"
 }

package/scss/components/Datagrid/styles/_datagrid.scss

@@ -368,26 +368,20 @@
   flex-direction: row;
 }
 
-.#{$block-class}__datagridLeftPanel {
-  display: flex;
-  width: 388px; // as per UX specs.
-  background-color: $layer-01;
-}
-
-.#{$block-class}__leftPanel-position {
-  display: inherit;
+.#{$block-class}__table-container-inner {
+  overflow: hidden;
+  flex: 1;
 }
 
 .#{$block-class}__datagridWithPanel {
   position: relative;
   display: flex;
-  width: 100%;
   height: 100%;
   flex-direction: column;
 
   .#{$block-class}__grid-container {
     display: flex;
-    overflow: hidden;
+    overflow: visible;
     flex-direction: column;
   }
 
@@ -395,15 +389,18 @@
     width: 100%;
   }
 
-  .#{$block-class}__datagridLeftPanel {
-    flex: 0 0 auto;
+  .#{$block-class}__table-container {
+    display: flex;
+    overflow: visible;
+    background-color: $layer-01;
   }
 
-  .#{c4p-settings.$carbon-prefix}--data-table-content {
-    flex: 1 1 0%;
+  .#{$block-class}__table-container .#{$block-class}__filter-summary {
+    border-bottom: 1px solid $layer-03;
   }
-  .#{$block-class}__table-container {
-    overflow: hidden;
+
+  .#{c4p-settings.$pkg-prefix}--datagrid__table-simple {
+    height: 100%;
   }
 }
 
@@ -413,6 +410,7 @@
   overflow: auto;
   width: 100%;
   max-height: 100%;
+  overflow-y: auto;
 }
 
 .#{$block-class}__carbon-row-expanded {
@@ -447,8 +445,9 @@
   }
 
   .#{$block-class}__table-toolbar {
-    flex: 0 0 auto;
+    flex: 1 0 auto;
   }
+
   .#{c4p-settings.$carbon-prefix}--table-toolbar {
     background: transparent;
   }

package/scss/components/Datagrid/styles/_index.scss

@@ -15,6 +15,7 @@
 @use './addons/CustomizeColumnsTearsheet';
 @use './addons/RowSizeDropdown';
 @use './addons/FilterFlyout';
+@use './addons/FilterPanel';
 @use './useSelectAllToggle';
 @use './useExpandedRow';
 @use './draggableElement';