@carbon/ibm-products 1.38.0 → 1.39.0

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

@@ -0,0 +1,38 @@
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// This functions takes the filters passed in and makes an object to track it's state
+export var getInitialStateFromFilters = function getInitialStateFromFilters(filters) {
+  var initialFilterState = {};
+  filters.forEach(function (_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
+        };
+      });
+    } else if (type === 'date') {
+      initialFilterState[column] = [undefined, undefined];
+    } else if (type === 'number') {
+      initialFilterState[column] = '';
+    } else if (type === 'radio') {
+      initialFilterState[column] = '';
+    } else if (type === 'dropdown') {
+      initialFilterState[column] = '';
+    }
+  });
+  return initialFilterState;
+};

package/es/components/Datagrid/index.js

@@ -22,4 +22,5 @@ export { default as useCustomizeColumns } from './useCustomizeColumns';
 export { default as useSelectAllWithToggle } from './useSelectAllToggle';
 export { default as useColumnCenterAlign } from './useColumnCenterAlign';
 export { default as useColumnOrder } from './useColumnOrder';
-export { default as useInlineEdit } from './useInlineEdit';
+export { default as useInlineEdit } from './useInlineEdit';
+export { default as useFiltering } from './useFiltering';

package/es/components/Datagrid/useFiltering.js

@@ -0,0 +1,83 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+// @flow
+/*
+ * Licensed Materials - Property of IBM
+ * 5724-Q36
+ * (c) Copyright IBM Corp. 2022
+ * US Government Users Restricted Rights - Use, duplication or disclosure
+ * restricted by GSA ADP Schedule Contract with IBM Corp.
+ */
+import { useMemo } from 'react';
+var useFiltering = function useFiltering(hooks) {
+  var filterTypes = useMemo(function () {
+    return {
+      date: function date(rows, id, _ref) {
+        var _ref2 = _slicedToArray(_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
+    });
+  });
+};
+export default useFiltering;

package/es/components/Datagrid/useNestedRows.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /*
  * Licensed Materials - Property of IBM
  * 5724-Q36
@@ -6,15 +7,17 @@
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
 import { pkg } from '../../settings';
+import cx from 'classnames';
 import useNestedRowExpander from './useNestedRowExpander';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   useNestedRowExpander(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: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _cx))
     }];
   };
   var getRowStyles = function getRowStyles(props, _ref2) {
@@ -22,7 +25,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)")
       }
     }];
@@ -40,8 +43,14 @@ 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);
 };
 export default useNestedRows;

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

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /**
  * Copyright IBM Corp. 2020, 2022
  *
@@ -5,12 +6,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React from 'react';
-import { DataTable, Button } from 'carbon-components-react';
-import { Download16, Filter16, Add16, Restart16 } from '@carbon/icons-react';
+import React, { useLayoutEffect, useMemo, useState } from 'react';
+import { Button, DataTable, OverflowMenu, OverflowMenuItem, ComposedModal, ModalBody, ModalFooter, ModalHeader, Dropdown } from 'carbon-components-react';
+import { Add16, ChevronDown16, Download16, Restart16 } from '@carbon/icons-react';
 import { action } from '@storybook/addon-actions';
 import { pkg } from '../../../settings';
 import { ButtonMenu, ButtonMenuItem } from '../../ButtonMenu';
+import { FilterFlyout } from '../Datagrid/addons/Filtering';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 export var DatagridActions = function DatagridActions(datagridState) {
   var selectedFlatRows = datagridState.selectedFlatRows,
@@ -18,7 +20,9 @@ export 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...');
   };
@@ -27,19 +31,42 @@ export 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 = useMemo(function () {
+    return selectedFlatRows.length === 0;
+  }, [selectedFlatRows]);
+  var style = 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.createElement(FilterFlyout, getFilterFlyoutProps());
   };
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    modalOpen = _useState2[0],
+    setModalOpen = _useState2[1];
+  var _useState3 = useState(window.innerWidth),
+    _useState4 = _slicedToArray(_useState3, 2),
+    size = _useState4[0],
+    setSize = _useState4[1];
+  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.createElement(TableToolbarContent, {
     size: "sm"
-  }, /*#__PURE__*/React.createElement("div", {
+  }, !mobileToolbar ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: style
   }, /*#__PURE__*/React.createElement(Button, {
     kind: "ghost",
@@ -48,16 +75,7 @@ export var DatagridActions = function DatagridActions(datagridState) {
     renderIcon: Download16,
     iconDescription: 'Download CSV',
     onClick: downloadCsv
-  })), /*#__PURE__*/React.createElement("div", {
-    style: style
-  }, /*#__PURE__*/React.createElement(Button, {
-    kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: Filter16,
-    iconDescription: 'Left panel',
-    onClick: leftPanelClick
-  })), /*#__PURE__*/React.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/React.createElement("div", {
+  })), renderFilterFlyout(), /*#__PURE__*/React.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/React.createElement("div", {
     style: style,
     className: "".concat(blockClass, "__toolbar-divider")
   }, /*#__PURE__*/React.createElement(Button, {
@@ -66,14 +84,34 @@ export var DatagridActions = function DatagridActions(datagridState) {
     iconDescription: 'Action'
   }, "Ghost button")), CustomizeColumnsButton && /*#__PURE__*/React.createElement("div", {
     style: style
-  }, /*#__PURE__*/React.createElement(CustomizeColumnsButton, null))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
-    kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: Filter16,
-    iconDescription: 'Left panel',
-    onClick: leftPanelClick
-  }), /*#__PURE__*/React.createElement(TableToolbarContent, null, /*#__PURE__*/React.createElement(TableToolbarSearch, {
+  }, /*#__PURE__*/React.createElement(CustomizeColumnsButton, null))) : /*#__PURE__*/React.createElement(OverflowMenu, {
+    ariaLabel: "Tools",
+    size: "md",
+    flipped: true
+  }, /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Filter",
+    hasDivider: true,
+    requireTitle: true,
+    onClick: function onClick() {
+      return setModalOpen(true);
+    }
+  }), /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Export",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Settings",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Import items",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Create",
+    hasDivider: true,
+    requireTitle: true
+  }))) : !mobileToolbar ? /*#__PURE__*/React.createElement(TableToolbarContent, null, /*#__PURE__*/React.createElement(TableToolbarSearch, {
     size: "xl",
     id: "columnSearch",
     persistent: true,
@@ -81,7 +119,7 @@ export var DatagridActions = function DatagridActions(datagridState) {
     onChange: function onChange(e) {
       return setGlobalFilter(e.target.value);
     }
-  }), /*#__PURE__*/React.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/React.createElement("div", {
+  }), renderFilterFlyout(), /*#__PURE__*/React.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/React.createElement("div", {
     style: style
   }, /*#__PURE__*/React.createElement(Button, {
     kind: "ghost",
@@ -113,5 +151,68 @@ export var DatagridActions = function DatagridActions(datagridState) {
   }), /*#__PURE__*/React.createElement(ButtonMenuItem, {
     itemText: "Option 3",
     onClick: action("Click on ButtonMenu Option 3")
-  })))));
+  }))) : /*#__PURE__*/React.createElement(TableToolbarContent, null, /*#__PURE__*/React.createElement(TableToolbarSearch, {
+    size: "xl",
+    id: "columnSearch",
+    persistent: true,
+    placeHolderText: searchForAColumn,
+    onChange: function onChange(e) {
+      return setGlobalFilter(e.target.value);
+    }
+  }), /*#__PURE__*/React.createElement(OverflowMenu, {
+    ariaLabel: "Tools",
+    size: "lg",
+    flipped: true,
+    renderIcon: ChevronDown16,
+    className: "".concat(blockClass, "__toolbar-menu__trigger"),
+    menuOptionsClass: "".concat(blockClass, "__toolbar-options")
+  }, /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Filter",
+    hasDivider: true,
+    requireTitle: true,
+    onClick: function onClick() {
+      return setModalOpen(true);
+    }
+  }), /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Export",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Settings",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Import items",
+    hasDivider: true,
+    requireTitle: true
+  }), /*#__PURE__*/React.createElement(OverflowMenuItem, {
+    itemText: "Create",
+    hasDivider: true,
+    requireTitle: true
+  })), modalOpen && /*#__PURE__*/React.createElement(ComposedModal, {
+    size: "lg",
+    open: modalOpen && modalOpen,
+    onClose: function onClose() {
+      return setModalOpen(false);
+    },
+    className: "".concat(blockClass, "__mobile-toolbar-modal")
+  }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement("h4", null, "Filters")), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(Dropdown, {
+    initialSelectedItem: items[2],
+    items: items,
+    titleText: "Label",
+    id: "filter1"
+  }), /*#__PURE__*/React.createElement(Dropdown, {
+    initialSelectedItem: items[2],
+    items: items,
+    titleText: "Label",
+    id: "filter2"
+  }), /*#__PURE__*/React.createElement(Dropdown, {
+    initialSelectedItem: items[2],
+    items: items,
+    titleText: "Label",
+    id: "filter3"
+  })), /*#__PURE__*/React.createElement(ModalFooter, {
+    primaryButtonText: "Apply",
+    secondaryButtonText: "Cancel"
+  }))));
 };

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

@@ -10,7 +10,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React from 'react';
 import namor from 'namor';
-import { StatusIcon } from '../../StatusIcon';
 import { inlineEditSelectItems } from './getInlineEditColumns';
 var getRandomInteger = function getRandomInteger(min, max, decimalPlaces) {
   var roundedMin = Math.ceil(min);
@@ -44,24 +43,27 @@ export var range = function range(len) {
   }
   return arr;
 };
-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.createElement(StatusIcon, iconProps);
+
+/** This function is only to create a random data point when the person joined */
+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();
@@ -80,6 +82,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.generate({
       words: 1,
       numbers: 0
@@ -160,12 +165,11 @@ var newPerson = function newPerson() {
       words: 1,
       numbers: 0
     }),
-    status: statusChance > 0.66 ? 'relationship' : statusChance > 0.33 ? 'complicated' : 'single',
     chartType: initialChartTypeIndex === 0 ? inlineEditSelectItems[0] : initialChartTypeIndex === 1 ? inlineEditSelectItems[1] : 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()
   };
 };
 export var newPersonWithTwoLines = function newPersonWithTwoLines() {
@@ -183,4 +187,7 @@ export var newPersonWithTwoLines = function newPersonWithTwoLines() {
     }),
     age: Math.floor(Math.random() * 30)
   };
+};
+var randomDate = function randomDate(start, end) {
+  return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
 };

package/lib/components/ActionBar/ActionBarOverflowItems.js

@@ -51,6 +51,7 @@ var ActionBarOverflowItems = function ActionBarOverflowItems(_ref) {
     // div equivalent below is based on Carbon 10.25.0
     return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
       className: "".concat(blockClass, "__item"),
+      onClick: item.props.onClick,
       itemText: /*#__PURE__*/_react.default.createElement("div", {
         className: "".concat(blockClass, "__item-content"),
         "aria-describedby": "".concat(internalId.current, "-").concat(index, "--item-label")

package/lib/components/CreateFullPage/CreateFullPage.js

@@ -187,7 +187,10 @@ var CreateFullPage = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
     className: "".concat(blockClass, "__modal"),
     size: "sm",
     open: modalIsOpen,
-    "aria-label": modalTitle
+    "aria-label": modalTitle,
+    onClose: function onClose() {
+      setModalIsOpen(false);
+    }
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalHeader, {
     title: modalTitle
   }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalBody, null, /*#__PURE__*/_react.default.createElement("p", null, modalDescription)), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {

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

@@ -15,6 +15,7 @@ var _settings = require("../../../settings");
 var _pconsole = _interopRequireDefault(require("../../../global/js/utils/pconsole"));
 var _InlineEditContext = require("./addons/InlineEdit/InlineEditContext");
 var _DatagridContent = require("./DatagridContent");
+var _FilterProvider = require("./addons/Filtering/FilterProvider");
 var _excluded = ["datagridState"];
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var componentName = 'Datagrid';
@@ -30,9 +31,12 @@ var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     isFetching = datagridState.isFetching,
     tableId = datagridState.tableId,
     leftPanel = datagridState.leftPanel,
-    className = datagridState.className;
+    className = datagridState.className,
+    filters = datagridState.state.filters;
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
-  return /*#__PURE__*/_react.default.createElement(_InlineEditContext.InlineEditProvider, null, /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
+  return /*#__PURE__*/_react.default.createElement(_FilterProvider.FilterProvider, {
+    filters: filters
+  }, /*#__PURE__*/_react.default.createElement(_InlineEditContext.InlineEditProvider, null, /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     id: tableId,
     ref: ref,
     className: (0, _classnames.default)(className, blockClass, withVirtualScroll ? "".concat(blockClass, "__datagridWrap") : "".concat(blockClass, "__datagridWrap-simple"), !isFetching && rows.length === 0 ? "".concat(blockClass, "__empty-state") : '')
@@ -42,7 +46,7 @@ var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     datagridState: datagridState
   })), leftPanel === undefined && /*#__PURE__*/_react.default.createElement(_DatagridContent.DatagridContent, {
     datagridState: datagridState
-  })));
+  }))));
 });
 
 // Return a placeholder if not released and not enabled by feature flag

package/lib/components/Datagrid/Datagrid/DatagridRow.js

@@ -11,8 +11,9 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _carbonComponentsReact = require("carbon-components-react");
-var _commonColumnIds = require("../common-column-ids");
+var _layout = require("@carbon/layout");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _commonColumnIds = require("../common-column-ids");
 var _settings = require("../../../settings");
 var _InlineEditContext = require("./addons/InlineEdit/InlineEditContext/InlineEditContext");
 var _getCellIdAsObject = require("./addons/InlineEdit/InlineEditContext/getCellIdAsObject");
@@ -22,22 +23,54 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var TableRow = _carbonComponentsReact.DataTable.TableRow,
   TableCell = _carbonComponentsReact.DataTable.TableCell;
+var rowHeights = {
+  xs: 24,
+  sm: 32,
+  md: 40,
+  lg: 48,
+  xl: 64
+};
 
 // eslint-disable-next-line react/prop-types
 var DatagridRow = function DatagridRow(datagridState) {
   var _cx;
-  var row = datagridState.row;
+  var row = datagridState.row,
+    rowSize = datagridState.rowSize,
+    withNestedRows = datagridState.withNestedRows;
   var _useContext = (0, _react.useContext)(_InlineEditContext.InlineEditContext),
     state = _useContext.state;
   var activeCellId = state.activeCellId;
   var activeCellObject = activeCellId && (0, _getCellIdAsObject.getCellIdAsObject)(activeCellId);
+  var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
+    var isExpanded = _ref.isExpanded,
+      subRows = _ref.subRows;
+    var size = 0;
+    if (isExpanded && subRows) {
+      size += subRows.length;
+      subRows.forEach(function (child) {
+        size += getVisibleNestedRowCount(child);
+      });
+    }
+    return size;
+  };
   return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
     className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-hover-active"), activeCellObject && row.index === activeCellObject.row), _cx))
   }, row.getRowProps(), {
     key: row.id,
     onMouseEnter: function onMouseEnter(event) {
+      var _hoverRow$style, _hoverRow$style2, _hoverRow$style3;
+      if (!withNestedRows) {
+        return;
+      }
+      var subRowCount = getVisibleNestedRowCount(row);
+      var totalNestedRowIndicatorHeight = (0, _layout.px)(subRowCount * rowHeights[rowSize]);
       var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
       hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.add("".concat(blockClass, "__carbon-row-expanded-hover-active"));
+      var rowExpanderButton = hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.querySelector(".".concat(blockClass, "__row-expander"));
+      var rowSizeValue = rowSize || 'lg';
+      hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style = hoverRow.style) === null || _hoverRow$style === void 0 ? void 0 : _hoverRow$style.setProperty("--".concat(blockClass, "--indicator-height"), totalNestedRowIndicatorHeight);
+      hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style2 = hoverRow.style) === null || _hoverRow$style2 === void 0 ? void 0 : _hoverRow$style2.setProperty("--".concat(blockClass, "--row-height"), (0, _layout.px)(rowHeights[rowSizeValue]));
+      hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style3 = hoverRow.style) === null || _hoverRow$style3 === void 0 ? void 0 : _hoverRow$style3.setProperty("--".concat(blockClass, "--indicator-offset-amount"), (0, _layout.px)((rowExpanderButton === null || rowExpanderButton === void 0 ? void 0 : rowExpanderButton.offsetLeft) || 0));
     },
     onMouseLeave: function onMouseLeave(event) {
       var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));

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

@@ -15,6 +15,9 @@ var _reactResizeDetector = require("react-resize-detector");
 var _ButtonMenu = require("../../ButtonMenu");
 var _settings = require("../../../settings");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _FilterSummary = require("../../FilterSummary");
+var _FilterProvider = require("./addons/Filtering/FilterProvider");
+var _constants = require("./addons/Filtering/constants");
 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; }
 /**
@@ -139,13 +142,25 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
     ref = _useResizeDetector.ref;
   var DatagridActions = datagridState.DatagridActions,
     DatagridBatchActions = datagridState.DatagridBatchActions,
-    batchActions = datagridState.batchActions;
+    batchActions = datagridState.batchActions,
+    state = datagridState.state;
+  var _useContext = (0, _react.useContext)(_FilterProvider.FilterContext),
+    filterTags = _useContext.filterTags,
+    EventEmitter = _useContext.EventEmitter;
+  var renderFilterSummary = function renderFilterSummary() {
+    return state.filters.length > 0 && /*#__PURE__*/_react.default.createElement(_FilterSummary.FilterSummary, {
+      filters: filterTags,
+      clearFilters: function clearFilters() {
+        return EventEmitter.dispatch(_constants.CLEAR_FILTERS);
+      }
+    });
+  };
   return batchActions && DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
     className: "".concat(blockClass, "__table-toolbar")
-  }, /*#__PURE__*/_react.default.createElement(TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref)), renderFilterSummary()) : DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__table-toolbar")
-  }, /*#__PURE__*/_react.default.createElement(TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
+  }, /*#__PURE__*/_react.default.createElement(TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActions && DatagridBatchActions(datagridState)), renderFilterSummary()) : null;
 };
 var _default = DatagridToolbar;
 exports.default = _default;