@carbon/ibm-products 1.38.0 → 1.39.0

package/lib/components/Datagrid/useFiltering.js

@@ -0,0 +1,83 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var useFiltering = function useFiltering(hooks) {
+  var filterTypes = (0, _react.useMemo)(function () {
+    return {
+      date: function date(rows, id, _ref) {
+        var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+          startDate = _ref2[0],
+          endDate = _ref2[1];
+        return rows.filter(function (row) {
+          var rowValue = row.values[id];
+          if (rowValue.getTime() <= endDate.getTime() && rowValue.getTime() >= startDate.getTime()) {
+            // In date range
+            return true;
+          } else {
+            // Not in date range
+            return false;
+          }
+        });
+      },
+      number: function number(rows, id, value) {
+        if (value === '') {
+          return rows;
+        }
+        var parsedValue = parseInt(value);
+        return rows.filter(function (row) {
+          var rowValue = row.values[id];
+          return rowValue === parsedValue;
+        });
+      },
+      checkbox: function checkbox(rows, id, value) {
+        // gets all the items that are selected and returns their value
+        var selectedItems = value.filter(function (item) {
+          return item.selected;
+        }).map(function (item) {
+          return item.value;
+        });
+
+        // if the user removed all checkboxes then display all rows
+        if (selectedItems.length === 0) {
+          return rows;
+        }
+        return rows.filter(function (row) {
+          var rowValue = row.values[id];
+          return selectedItems.includes(rowValue);
+        });
+      }
+    };
+  }, []);
+  hooks.useInstance.push(function (instance) {
+    var filterProps = instance.filterProps,
+      setAllFilters = instance.setAllFilters,
+      setFilter = instance.setFilter,
+      headers = instance.headers;
+    var defaultProps = {
+      variation: 'flyout'
+    };
+    var getFilterFlyoutProps = function getFilterFlyoutProps() {
+      return _objectSpread(_objectSpread(_objectSpread({}, defaultProps), filterProps), {}, {
+        setAllFilters: setAllFilters,
+        setFilter: setFilter,
+        headers: headers
+      });
+    };
+    Object.assign(instance, {
+      filterProps: _objectSpread(_objectSpread({}, defaultProps), instance.filterProps),
+      filterTypes: filterTypes,
+      getFilterFlyoutProps: getFilterFlyoutProps
+    });
+  });
+};
+var _default = useFiltering;
+exports.default = _default;

package/lib/components/Datagrid/useNestedRows.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _settings = require("../../settings");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _useNestedRowExpander = _interopRequireDefault(require("./useNestedRowExpander"));
 /*
  * Licensed Materials - Property of IBM
@@ -20,9 +22,10 @@ var useNestedRows = function useNestedRows(hooks) {
   (0, _useNestedRowExpander.default)(hooks);
   var marginLeft = 24;
   var getRowProps = function getRowProps(props, _ref) {
+    var _cx;
     var row = _ref.row;
     return [props, {
-      className: row.depth > 0 ? "".concat(blockClass, "__carbon-nested-row") : ''
+      className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _cx))
     }];
   };
   var getRowStyles = function getRowStyles(props, _ref2) {
@@ -30,7 +33,7 @@ var useNestedRows = function useNestedRows(hooks) {
     return [props, {
       style: {
         marginLeft: "".concat(row.depth > 0 ? marginLeft : 0, "px"),
-        paddingLeft: "".concat(row.depth > 1 ? marginLeft * (row.depth - 1) + marginLeft : row.depth === 1 ? marginLeft : 0, "px"),
+        paddingLeft: "".concat(row.depth === 2 ? marginLeft * (row.depth - 1) + marginLeft - 8 : row.depth > 2 ? marginLeft * (row.depth - 1) + marginLeft : row.depth === 1 ? marginLeft - 16 : 0, "px"),
         maxWidth: "calc(100% - ".concat(marginLeft * row.depth, "px)")
       }
     }];
@@ -48,9 +51,15 @@ var useNestedRows = function useNestedRows(hooks) {
       }
     }];
   };
+  var useInstance = function useInstance(instance) {
+    Object.assign(instance, {
+      withNestedRows: true
+    });
+  };
   hooks.getRowProps.push(getRowProps);
   hooks.getRowProps.push(getRowStyles);
   hooks.getCellProps.push(getCellProps);
+  hooks.useInstance.push(useInstance);
 };
 var _default = useNestedRows;
 exports.default = _default;

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

@@ -1,16 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DatagridActions = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
 var _carbonComponentsReact = require("carbon-components-react");
 var _iconsReact = require("@carbon/icons-react");
 var _addonActions = require("@storybook/addon-actions");
 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; }
 /**
  * Copyright IBM Corp. 2020, 2022
  *
@@ -25,7 +30,9 @@ var DatagridActions = function DatagridActions(datagridState) {
     CustomizeColumnsButton = datagridState.CustomizeColumnsButton,
     RowSizeDropdown = datagridState.RowSizeDropdown,
     rowSizeDropdownProps = datagridState.rowSizeDropdownProps,
-    useDenseHeader = datagridState.useDenseHeader;
+    useDenseHeader = datagridState.useDenseHeader,
+    filterProps = datagridState.filterProps,
+    getFilterFlyoutProps = datagridState.getFilterFlyoutProps;
   var downloadCsv = function downloadCsv() {
     alert('Downloading...');
   };
@@ -34,19 +41,42 @@ var DatagridActions = function DatagridActions(datagridState) {
   var refreshColumns = function refreshColumns() {
     alert('refreshing...');
   };
-  var leftPanelClick = function leftPanelClick() {
-    alert('open/close left panel...');
-  };
   var searchForAColumn = 'Search';
-  var isNothingSelected = selectedFlatRows.length === 0;
-  var style = {
-    'button:nth-child(1) > span:nth-child(1)': {
-      bottom: '-37px'
-    }
+  var isNothingSelected = (0, _react.useMemo)(function () {
+    return selectedFlatRows.length === 0;
+  }, [selectedFlatRows]);
+  var style = (0, _react.useMemo)(function () {
+    return {
+      'button:nthChild(1) > span:nthChild(1)': {
+        bottom: '-37px'
+      }
+    };
+  }, []);
+  var renderFilterFlyout = function renderFilterFlyout() {
+    return (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'flyout' && /*#__PURE__*/_react.default.createElement(_Filtering.FilterFlyout, getFilterFlyoutProps());
   };
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    modalOpen = _useState2[0],
+    setModalOpen = _useState2[1];
+  var _useState3 = (0, _react.useState)(window.innerWidth),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    size = _useState4[0],
+    setSize = _useState4[1];
+  (0, _react.useLayoutEffect)(function () {
+    function updateSize() {
+      setSize(window.innerWidth);
+    }
+    window.addEventListener('resize', updateSize);
+    return function () {
+      return window.removeEventListener('resize', updateSize);
+    };
+  }, []);
+  var mobileToolbar = size < 672 ? true : false;
+  var items = ['Option 1', 'Option 2', 'Option 3'];
   return isNothingSelected && (useDenseHeader && useDenseHeader ? /*#__PURE__*/_react.default.createElement(TableToolbarContent, {
     size: "sm"
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, !mobileToolbar ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     style: style
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
     kind: "ghost",
@@ -55,16 +85,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     renderIcon: _iconsReact.Download16,
     iconDescription: 'Download CSV',
     onClick: downloadCsv
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    style: style
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
-    kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: _iconsReact.Filter16,
-    iconDescription: 'Left panel',
-    onClick: leftPanelClick
-  })), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
+  })), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
     style: style,
     className: "".concat(blockClass, "__toolbar-divider")
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
@@ -73,14 +94,34 @@ var DatagridActions = function DatagridActions(datagridState) {
     iconDescription: 'Action'
   }, "Ghost button")), CustomizeColumnsButton && /*#__PURE__*/_react.default.createElement("div", {
     style: style
-  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
-    kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: _iconsReact.Filter16,
-    iconDescription: 'Left panel',
-    onClick: leftPanelClick
-  }), /*#__PURE__*/_react.default.createElement(TableToolbarContent, null, /*#__PURE__*/_react.default.createElement(TableToolbarSearch, {
+  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null))) : /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
+    ariaLabel: "Tools",
+    size: "md",
+    flipped: true
+  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Filter",
+    hasDivider: true,
+    requireTitle: true,
+    onClick: function onClick() {
+      return setModalOpen(true);
+    }
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Export",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Settings",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Import items",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Create",
+    hasDivider: true,
+    requireTitle: true
+  }))) : !mobileToolbar ? /*#__PURE__*/_react.default.createElement(TableToolbarContent, null, /*#__PURE__*/_react.default.createElement(TableToolbarSearch, {
     size: "xl",
     id: "columnSearch",
     persistent: true,
@@ -88,7 +129,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     onChange: function onChange(e) {
       return setGlobalFilter(e.target.value);
     }
-  }), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
+  }), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
     style: style
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
     kind: "ghost",
@@ -120,6 +161,69 @@ 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(TableToolbarContent, null, /*#__PURE__*/_react.default.createElement(TableToolbarSearch, {
+    size: "xl",
+    id: "columnSearch",
+    persistent: true,
+    placeHolderText: searchForAColumn,
+    onChange: function onChange(e) {
+      return setGlobalFilter(e.target.value);
+    }
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
+    ariaLabel: "Tools",
+    size: "lg",
+    flipped: true,
+    renderIcon: _iconsReact.ChevronDown16,
+    className: "".concat(blockClass, "__toolbar-menu__trigger"),
+    menuOptionsClass: "".concat(blockClass, "__toolbar-options")
+  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Filter",
+    hasDivider: true,
+    requireTitle: true,
+    onClick: function onClick() {
+      return setModalOpen(true);
+    }
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Export",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Settings",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Import items",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+    itemText: "Create",
+    hasDivider: true,
+    requireTitle: true
+  })), modalOpen && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ComposedModal, {
+    size: "lg",
+    open: modalOpen && modalOpen,
+    onClose: function onClose() {
+      return setModalOpen(false);
+    },
+    className: "".concat(blockClass, "__mobile-toolbar-modal")
+  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalHeader, null, /*#__PURE__*/_react.default.createElement("h4", null, "Filters")), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalBody, null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Dropdown, {
+    initialSelectedItem: items[2],
+    items: items,
+    titleText: "Label",
+    id: "filter1"
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Dropdown, {
+    initialSelectedItem: items[2],
+    items: items,
+    titleText: "Label",
+    id: "filter2"
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Dropdown, {
+    initialSelectedItem: items[2],
+    items: items,
+    titleText: "Label",
+    id: "filter3"
+  })), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalFooter, {
+    primaryButtonText: "Apply",
+    secondaryButtonText: "Cancel"
+  }))));
 };
 exports.DatagridActions = DatagridActions;

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

@@ -8,7 +8,6 @@ exports.range = exports.newPersonWithTwoLines = exports.makeData = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _namor = _interopRequireDefault(require("namor"));
-var _StatusIcon = require("../../StatusIcon");
 var _getInlineEditColumns = require("./getInlineEditColumns");
 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; }
@@ -45,25 +44,28 @@ var range = function range(len) {
   }
   return arr;
 };
+
+/** This function is only to create a random data point when the person joined */
 exports.range = range;
-var renderStatusIcon = function renderStatusIcon(statusChance) {
-  var iconProps = {
-    size: 'sm',
-    theme: 'light',
-    kind: statusChance > 0.66 ? 'critical' : statusChance > 0.33 ? 'minor-warning' : 'normal',
-    iconDescription: statusChance > 0.66 ? 'Critical' : statusChance > 0.33 ? 'Minor warning' : 'Normal'
-  };
-  return /*#__PURE__*/_react.default.createElement(_StatusIcon.StatusIcon, iconProps);
+var getRandomDateJoined = function getRandomDateJoined() {
+  return randomDate(new Date(2022, 0, 1), new Date());
+};
+var getPasswordStrength = function getPasswordStrength() {
+  var chance = Math.random();
+  return chance > 0.66 ? 'critical' : chance > 0.33 ? 'minor-warning' : 'normal';
 };
-var renderDocLink = function renderDocLink(statusChance) {
+var renderDocLink = function renderDocLink() {
+  var chance = Math.random();
   var docLinkObj = {
-    href: statusChance > 0.66 ? 'http://carbondesignsystem.com/' : statusChance > 0.33 ? 'https://pages.github.ibm.com/cdai-design/pal/' : 'http://carbon-for-ibm-products.netlify.app/',
-    text: statusChance > 0.66 ? 'Carbon Design System' : statusChance > 0.33 ? 'Carbon for IBM Products PAL' : 'Carbon for IBM Products storybook'
+    href: chance > 0.66 ? 'http://carbondesignsystem.com/' : chance > 0.33 ? 'https://pages.github.ibm.com/cdai-design/pal/' : 'http://carbon-for-ibm-products.netlify.app/',
+    text: chance > 0.66 ? 'Carbon Design System' : chance > 0.33 ? 'Carbon for IBM Products PAL' : 'Carbon for IBM Products storybook'
   };
   return docLinkObj;
 };
 var newPerson = function newPerson() {
   var statusChance = Math.random();
+  var roleChance = Math.random();
+  var activeChance = Math.random();
   var initialChartTypeIndex = getRandomInteger(0, 2);
   var activeSinceDate = new Date();
   var yesterdayDate = new Date();
@@ -82,6 +84,9 @@ var newPerson = function newPerson() {
     age: Math.floor(Math.random() * 30),
     visits: Math.floor(Math.random() * 100),
     progress: Math.floor(Math.random() * 100),
+    status: statusChance > 0.66 ? 'relationship' : statusChance > 0.33 ? 'complicated' : 'single',
+    role: roleChance > 0.66 ? 'developer' : roleChance > 0.33 ? 'designer' : 'researcher',
+    joined: getRandomDateJoined(),
     someone1: _namor.default.generate({
       words: 1,
       numbers: 0
@@ -162,12 +167,11 @@ var newPerson = function newPerson() {
       words: 1,
       numbers: 0
     }),
-    status: statusChance > 0.66 ? 'relationship' : statusChance > 0.33 ? 'complicated' : 'single',
     chartType: initialChartTypeIndex === 0 ? _getInlineEditColumns.inlineEditSelectItems[0] : initialChartTypeIndex === 1 ? _getInlineEditColumns.inlineEditSelectItems[1] : _getInlineEditColumns.inlineEditSelectItems[2],
-    activeSince: statusChance > 0.66 ? activeSinceDate : statusChance > 0.33 ? yesterdayDate : twoDaysAgoDate,
+    activeSince: activeChance > 0.66 ? activeSinceDate : activeChance > 0.33 ? yesterdayDate : twoDaysAgoDate,
     bonus: "$\r".concat(getRandomInteger(100, 500, 2)),
-    status_icon: renderStatusIcon(statusChance),
-    doc_link: renderDocLink(statusChance)
+    passwordStrength: getPasswordStrength(),
+    doc_link: renderDocLink()
   };
 };
 var newPersonWithTwoLines = function newPersonWithTwoLines() {
@@ -186,4 +190,7 @@ var newPersonWithTwoLines = function newPersonWithTwoLines() {
     age: Math.floor(Math.random() * 30)
   };
 };
-exports.newPersonWithTwoLines = newPersonWithTwoLines;
+exports.newPersonWithTwoLines = newPersonWithTwoLines;
+var randomDate = function randomDate(start, end) {
+  return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.38.0",
+  "version": "1.39.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -95,5 +95,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "655db040603130ab12d4bac8576771a04a690393"
+  "gitHead": "aa6bc71d9dc7286e586479f681a0de13ea58404b"
 }

package/scss/components/ActionSet/_action-set.scss

@@ -96,7 +96,9 @@
   .#{$block-class}.#{$carbon-prefix}--btn-set.#{$block-class}--max
     .#{$block-class}__action-button:not(.#{$block-class}__action-button--ghost),
   .#{$block-class}.#{$carbon-prefix}--btn-set.#{$block-class}--row-quadruple
-    .#{$block-class}__action-button:not(.#{$block-class}__action-button--ghost) {
+    .#{$block-class}__action-button:not(
+      .#{$block-class}__action-button--ghost
+    ) {
     max-width: rem(232px);
     flex: 0 1 25%;
   }

package/scss/components/AddSelect/_add-select.scss

@@ -157,7 +157,9 @@
   .#{$block-class} .#{$carbon-prefix}--structured-list-row,
   .#{$block-class}
     .#{$block-class}__selections.#{$carbon-prefix}--structured-list--selection
-    .#{$carbon-prefix}--structured-list-row:hover:not(.#{$carbon-prefix}--structured-list-row--header-row):not(.#{$carbon-prefix}--structured-list-row--selected) {
+    .#{$carbon-prefix}--structured-list-row:hover:not(
+      .#{$carbon-prefix}--structured-list-row--header-row
+    ):not(.#{$carbon-prefix}--structured-list-row--selected) {
     border-bottom: 0;
   }
 

package/scss/components/Datagrid/_datagrid.scss

@@ -36,7 +36,6 @@
 
   .#{$block-class}__datagridWrap-simple {
     display: flex;
-    overflow: hidden;
     width: 100%;
     flex-direction: column;
 

package/scss/components/Datagrid/_storybook-styles.scss

@@ -97,3 +97,7 @@ $block-class: #{$pkg-prefix}--datagrid;
 .#{$block-class}-story__hidden-column-id-snippet {
   padding-top: $spacing-07;
 }
+
+.#{$block-class}__mobile-toolbar-modal .#{$carbon-prefix}--dropdown__wrapper {
+  margin-bottom: $spacing-07;
+}

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

@@ -416,10 +416,20 @@
 }
 
 .#{$block-class}__carbon-row-expanded {
-  // Border applied to nested rows only on open chevron hover
-  &.#{$block-class}__carbon-row-expanded-hover-active
-    ~ .#{$block-class}__carbon-nested-row {
+  position: relative;
+  &.#{$block-class}__carbon-row-expanded-hover-active::before {
+    position: absolute;
+    z-index: 2;
+    /* stylelint-disable-next-line carbon/layout-token-use */
+    top: var(--#{$block-class}--row-height);
+    /* stylelint-disable-next-line carbon/layout-token-use */
+    left: calc(
+      var(--#{$block-class}--indicator-offset-amount) + #{$spacing-05}
+    );
+    width: 1px;
+    height: var(--#{$block-class}--indicator-height);
     border-left: 1px solid $interactive-01;
+    content: '';
   }
 }
 
@@ -473,7 +483,8 @@
 }
 
 .#{$block-class}
-  .#{$carbon-prefix}--data-table--selected:not(.#{$block-class}__active-row)::before {
+  .#{$carbon-prefix}--data-table--selected:not(.#{$block-class}__active-row)
+  ::before {
   position: absolute;
   left: 0;
   width: $spacing-02;
@@ -523,3 +534,35 @@
 .#{$block-class} .#{$pkg-prefix}--button-menu {
   height: $spacing-09;
 }
+
+.#{$carbon-prefix}--body--with-modal-open .#{$block-class}__grid-container {
+  overflow: hidden;
+  height: 100vh;
+}
+
+.#{$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger {
+  flex-shrink: 0;
+  background-color: $interactive-01;
+}
+
+.#{$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger svg {
+  fill: $ui-background;
+}
+
+.#{$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger:hover,
+.#{$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger.#{$carbon-prefix}--overflow-menu--open:hover,
+.#{$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger.#{$carbon-prefix}--overflow-menu--open {
+  background-color: $hover-primary;
+}
+
+.#{$block-class}__toolbar-options.#{$carbon-prefix}--overflow-menu-options::after {
+  background-color: transparent;
+}
+
+.#{$block-class}__mobile-toolbar-modal .#{$carbon-prefix}--modal-container {
+  position: absolute;
+}
+
+.#{$block-class} .#{$carbon-prefix}--modal {
+  width: 100%;
+}

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

@@ -15,6 +15,7 @@
 @import './useActionsColumn';
 @import './addons/CustomizeColumnsModal';
 @import './addons/RowSizeDropdown';
+@import './addons/FilterFlyout';
 @import './useSelectAllToggle';
 @import './useExpandedRow';
 @import './draggableElement';

package/scss/components/Datagrid/styles/_useInlineEdit.scss

@@ -108,7 +108,9 @@ $row-heights: (
     justify-content: flex-start;
   }
   // Always show renderIcon if inline edit columns are less than half of total columns
-  &:not(.#{$block-class}__inline-edit-button--edit-less-than-half-of-total-cols) {
+  &:not(
+      .#{$block-class}__inline-edit-button--edit-less-than-half-of-total-cols
+    ) {
     .#{$block-class}__inline-edit-button-icon {
       display: none;
     }
@@ -132,7 +134,9 @@ $row-heights: (
 }
 
 .#{$block-class}__inline-edit--outer-cell-button
-  .#{$block-class}__inline-edit-button.#{$block-class}__inline-edit-button--active:not([data-disabled='true']) {
+  .#{$block-class}__inline-edit-button.#{$block-class}__inline-edit-button--active:not(
+    [data-disabled='true']
+  ) {
   background-color: $active-ui;
   color: $text-01;
   cursor: text;
@@ -144,7 +148,9 @@ $row-heights: (
 }
 
 .#{$block-class}__inline-edit--outer-cell-button
-  .#{$block-class}__inline-edit-button--disabled:not(.#{$block-class}__inline-edit-button--edit-less-than-half-of-total-cols) {
+  .#{$block-class}__inline-edit-button--disabled:not(
+    .#{$block-class}__inline-edit-button--edit-less-than-half-of-total-cols
+  ) {
   color: $disabled-02;
   cursor: not-allowed;
 }