@carbon/ibm-products 2.0.0-rc.10 → 2.0.0-rc.11

package/es/components/Datagrid/useFiltering.js

@@ -0,0 +1,90 @@
+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; }
+
+/*
+ * 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,
+        headers = instance.headers;
+    var defaultProps = {
+      variation: 'flyout'
+    };
+
+    var getFilterFlyoutProps = function getFilterFlyoutProps() {
+      return _objectSpread(_objectSpread(_objectSpread({}, defaultProps), filterProps), {}, {
+        setAllFilters: setAllFilters,
+        headers: headers
+      });
+    };
+
+    Object.assign(instance, {
+      filterProps: _objectSpread(_objectSpread({}, defaultProps), instance.filterProps),
+      filterTypes: filterTypes,
+      getFilterFlyoutProps: getFilterFlyoutProps
+    });
+  });
+};
+
+export default useFiltering;

package/es/components/Datagrid/useParentDimensions.js

@@ -14,6 +14,7 @@ var useParentDimensions = function useParentDimensions(hooks) {
   var headRef = useRef();
   var innerListRef = useRef();
   var listRef = useRef();
+  var gridRef = useRef();
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -55,7 +56,8 @@ var useParentDimensions = function useParentDimensions(hooks) {
       headRef: headRef,
       innerListRef: innerListRef,
       handleResize: handleResize,
-      listRef: listRef
+      listRef: listRef,
+      gridRef: gridRef
     });
   };
 

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

@@ -8,10 +8,11 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  */
 import React, { useLayoutEffect, useState } from 'react';
 import { DataTable, Button, OverflowMenu, OverflowMenuItem, ComposedModal, ModalBody, ModalHeader, ModalFooter, Dropdown } from '@carbon/react';
-import { Download, Filter, Add, Restart, ChevronDown } from '@carbon/react/icons';
+import { Download, Add, Restart, ChevronDown } from '@carbon/react/icons';
 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,
@@ -19,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...');
@@ -32,10 +35,6 @@ export var DatagridActions = function DatagridActions(datagridState) {
     alert('refreshing...');
   };
 
-  var leftPanelClick = function leftPanelClick() {
-    alert('open/close left panel...');
-  };
-
   var searchForAColumn = 'Search';
   var isNothingSelected = selectedFlatRows.length === 0;
   var style = {
@@ -44,6 +43,10 @@ export var DatagridActions = function DatagridActions(datagridState) {
     }
   };
 
+  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],
@@ -77,16 +80,7 @@ export var DatagridActions = function DatagridActions(datagridState) {
     renderIcon: Download,
     iconDescription: 'Download CSV',
     onClick: downloadCsv
-  })), /*#__PURE__*/React.createElement("div", {
-    style: style
-  }, /*#__PURE__*/React.createElement(Button, {
-    kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: Filter,
-    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, {
@@ -122,14 +116,7 @@ export var DatagridActions = function DatagridActions(datagridState) {
     itemText: "Create",
     hasDivider: true,
     requireTitle: true
-  }))) : !mobileToolbar ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
-    kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: Filter,
-    iconDescription: 'Left panel',
-    onClick: leftPanelClick
-  }), /*#__PURE__*/React.createElement(TableToolbarContent, null, /*#__PURE__*/React.createElement(TableToolbarSearch, {
+  }))) : !mobileToolbar ? /*#__PURE__*/React.createElement(TableToolbarContent, null, /*#__PURE__*/React.createElement(TableToolbarSearch, {
     size: "xl",
     id: "columnSearch",
     persistent: true,
@@ -137,7 +124,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",
@@ -169,7 +156,7 @@ 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, {
+  }))) : /*#__PURE__*/React.createElement(TableToolbarContent, null, /*#__PURE__*/React.createElement(TableToolbarSearch, {
     size: "xl",
     id: "columnSearch",
     persistent: true,

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

@@ -85,5 +85,10 @@ export var ARG_TYPES = {
   customizeColumnsProps: {
     control: 'object',
     description: 'This is an object containing all of the props used with the column customization extension. _This value is set/passed inside of the `datagridState` object._'
+  },
+  filterProps: {
+    name: 'Filter props',
+    control: 'object',
+    description: 'This is an object for all the props passed into the filter flyout and filter panel'
   }
 };

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

@@ -89,8 +89,13 @@ export var getInlineEditColumns = function getInlineEditColumns() {
     accessor: 'visits',
     width: 120,
     inlineEdit: {
+      validator: function validator(n) {
+        return n && n < 10;
+      },
       type: 'number',
-      inputProps: {} // These props are passed to the Carbon component used for inline editing
+      inputProps: {
+        invalidText: 'Invalid number, must be 10 or greater'
+      } // These props are passed to the Carbon component used for inline editing
 
     }
   }, {

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

@@ -12,7 +12,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) {
@@ -54,27 +53,30 @@ export var range = function range(len) {
 
   return arr;
 };
+/** This function is only to create a random data point when the person joined */
 
-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);
+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();
@@ -93,6 +95,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
@@ -173,12 +178,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()
   };
 };
 
@@ -197,4 +201,8 @@ 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/es/components/FilterSummary/FilterSummary.js

@@ -0,0 +1,54 @@
+/**
+ * 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.
+ */
+import { Button } from '@carbon/react';
+import React from 'react';
+import PropTypes from 'prop-types';
+import cx from 'classnames';
+import { TagSet } from '../TagSet';
+import { pkg } from '../../settings';
+var blockClass = "".concat(pkg.prefix, "--filter-summary");
+var FilterSummary = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+  var _ref$className = _ref.className,
+      className = _ref$className === void 0 ? '' : _ref$className,
+      _ref$clearFiltersText = _ref.clearFiltersText,
+      clearFiltersText = _ref$clearFiltersText === void 0 ? 'Clear filters' : _ref$clearFiltersText,
+      _ref$clearFilters = _ref.clearFilters,
+      clearFilters = _ref$clearFilters === void 0 ? function () {} : _ref$clearFilters,
+      _ref$filters = _ref.filters,
+      filters = _ref$filters === void 0 ? [] : _ref$filters;
+  var tagFilters = filters.map(function (_ref2) {
+    var key = _ref2.key,
+        value = _ref2.value;
+    return {
+      type: 'gray',
+      label: "".concat(key, ": ").concat(value)
+    };
+  });
+  return /*#__PURE__*/React.createElement("div", {
+    ref: ref,
+    className: cx([blockClass, className])
+  }, /*#__PURE__*/React.createElement(TagSet, {
+    allTagsModalSearchLabel: "Search all tags",
+    allTagsModalSearchPlaceholderText: "Search all tags",
+    allTagsModalTitle: "All tags",
+    showAllTagsLabel: "View all tags",
+    tags: tagFilters
+  }), /*#__PURE__*/React.createElement(Button, {
+    kind: "ghost",
+    size: "sm",
+    onClick: clearFilters
+  }, clearFiltersText));
+});
+var componentName = 'FilterSummary';
+FilterSummary.displayName = componentName;
+FilterSummary.propTypes = {
+  className: PropTypes.string,
+  clearFilters: PropTypes.func.isRequired,
+  clearFiltersText: PropTypes.string,
+  filters: PropTypes.arrayOf(PropTypes.object).isRequired
+};
+export default FilterSummary;

package/es/components/FilterSummary/index.js

@@ -0,0 +1,7 @@
+/**
+ * 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.
+ */
+export { default as FilterSummary } from './FilterSummary';

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -236,10 +236,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
 
   var removeActiveCell = (0, _react.useCallback)(function () {
     var activeCellHighlight = spreadsheetRef.current.querySelector(".".concat(blockClass, "__active-cell--highlight"));
-
-    if (activeCellHighlight) {
-      activeCellHighlight.style.display = 'none';
-    }
+    activeCellHighlight.style.display = 'none';
   }, [spreadsheetRef]);
   var removeCellEditor = (0, _react.useCallback)(function () {
     setCellEditorValue('');

package/lib/components/DataSpreadsheet/utils/handleCellDeletion.js

@@ -16,6 +16,8 @@ var _rangeWithCallback = require("../../../global/js/utils/rangeWithCallback");
  * LICENSE file in the root directory of this source tree.
  */
 var handleCellDeletion = function handleCellDeletion(_ref) {
+  var _selectionAreaToEmpty, _selectionAreaToEmpty2, _selectionAreaToEmpty3, _selectionAreaToEmpty4, _selectionAreaToEmpty5, _selectionAreaToEmpty6, _selectionAreaToEmpty7, _selectionAreaToEmpty8;
+
   var activeCellCoordinates = _ref.activeCellCoordinates,
       selectionAreas = _ref.selectionAreas,
       currentMatcher = _ref.currentMatcher,
@@ -35,10 +37,10 @@ var handleCellDeletion = function handleCellDeletion(_ref) {
     return item.matcher === currentMatcher;
   });
   var selectionAreaToEmptyContents = selectionAreaClone[indexOfCurrentSelectionArea];
-  var lowestColumnIndex = Math.min(selectionAreaToEmptyContents.point1.column, selectionAreaToEmptyContents.point2.column);
-  var greatestColumnIndex = Math.max(selectionAreaToEmptyContents.point1.column, selectionAreaToEmptyContents.point2.column);
-  var lowestRowIndex = Math.min(selectionAreaToEmptyContents.point1.row, selectionAreaToEmptyContents.point2.row);
-  var greatestRowIndex = Math.max(selectionAreaToEmptyContents.point1.row, selectionAreaToEmptyContents.point2.row);
+  var lowestColumnIndex = Math.min(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty === void 0 ? void 0 : _selectionAreaToEmpty.column, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty2 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty2 === void 0 ? void 0 : _selectionAreaToEmpty2.column);
+  var greatestColumnIndex = Math.max(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty3 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty3 === void 0 ? void 0 : _selectionAreaToEmpty3.column, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty4 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty4 === void 0 ? void 0 : _selectionAreaToEmpty4.column);
+  var lowestRowIndex = Math.min(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty5 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty5 === void 0 ? void 0 : _selectionAreaToEmpty5.row, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty6 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty6 === void 0 ? void 0 : _selectionAreaToEmpty6.row);
+  var greatestRowIndex = Math.max(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty7 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty7 === void 0 ? void 0 : _selectionAreaToEmpty7.row, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty8 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty8 === void 0 ? void 0 : _selectionAreaToEmpty8.row);
   (0, _rangeWithCallback.rangeWithCallback)(lowestColumnIndex, greatestColumnIndex, function (columnIndex) {
     (0, _rangeWithCallback.rangeWithCallback)(lowestRowIndex, greatestRowIndex, function (rowIndex) {
       var cellProps = rows[rowIndex].cells[columnIndex];

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

@@ -27,6 +27,8 @@ 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';
@@ -46,9 +48,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") : '')
@@ -58,7 +63,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/DatagridContent.js

@@ -76,7 +76,8 @@ var DatagridContent = function DatagridContent(_ref) {
       withInlineEdit = datagridState.withInlineEdit,
       tableId = datagridState.tableId,
       DatagridActions = datagridState.DatagridActions,
-      totalColumnsWidth = datagridState.totalColumnsWidth;
+      totalColumnsWidth = datagridState.totalColumnsWidth,
+      gridRef = datagridState.gridRef;
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
   var gridActive = state.gridActive,
       editId = state.editId;
@@ -120,7 +121,7 @@ var DatagridContent = function DatagridContent(_ref) {
       onFocus: withInlineEdit ? function () {
         return (0, _handleGridFocus.handleGridFocus)(state, dispatch);
       } : null
-    }), /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState), /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
+    }), !withVirtualScroll ? /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState) : null, /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
       rows: rows
     })));
   };
@@ -158,6 +159,9 @@ var DatagridContent = function DatagridContent(_ref) {
     className: "".concat(blockClass, "__datagridLeftPanel")
   }, leftPanel.panelContent), withInlineEdit ? /*#__PURE__*/_react.default.createElement("div", {
     ref: multiKeyTrackingRef
+  }, renderTable()) : withVirtualScroll ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__virtualScrollContainer"),
+    ref: gridRef
   }, renderTable()) : renderTable())), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/_react.default.createElement(DatagridPagination, datagridState), CustomizeColumnsModal && /*#__PURE__*/_react.default.createElement(CustomizeColumnsModal, {
     instance: datagridState
   }));
@@ -183,6 +187,7 @@ DatagridContent.propTypes = {
     page: _propTypes.default.arrayOf(_propTypes.default.object),
     rows: _propTypes.default.arrayOf(_propTypes.default.object),
     tableId: _propTypes.default.string,
-    totalColumnsWidth: _propTypes.default.number
+    totalColumnsWidth: _propTypes.default.number,
+    gridRef: _propTypes.default.object
   })
 };

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

@@ -15,7 +15,7 @@ var _settings = require("../../../settings");
 
 var _react2 = require("@carbon/react");
 
-var _NoDataEmptyState = require("../../EmptyStates/NoDataEmptyState");
+var _EmptyStates = require("../../EmptyStates");
 
 /*
  * Licensed Materials - Property of IBM
@@ -35,16 +35,29 @@ var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
       emptyStateTitle = datagridState.emptyStateTitle,
       emptyStateDescription = datagridState.emptyStateDescription,
       emptyStateSize = datagridState.emptyStateSize,
-      illustrationTheme = datagridState.illustrationTheme;
+      _datagridState$emptyS = datagridState.emptyStateType,
+      emptyStateType = _datagridState$emptyS === void 0 ? 'noData' : _datagridState$emptyS,
+      illustrationTheme = datagridState.illustrationTheme,
+      emptyStateAction = datagridState.emptyStateAction,
+      emptyStateLink = datagridState.emptyStateLink;
   return /*#__PURE__*/_react.default.createElement(TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
     className: "".concat(blockClass, "__empty-state-body")
   }), /*#__PURE__*/_react.default.createElement(TableRow, null, /*#__PURE__*/_react.default.createElement(TableCell, {
     colSpan: headers.length
-  }, /*#__PURE__*/_react.default.createElement(_NoDataEmptyState.NoDataEmptyState, {
+  }, emptyStateType === 'error' && /*#__PURE__*/_react.default.createElement(_EmptyStates.ErrorEmptyState, {
     illustrationTheme: illustrationTheme,
     size: emptyStateSize,
     title: emptyStateTitle,
-    subtitle: emptyStateDescription
+    subtitle: emptyStateDescription,
+    action: emptyStateAction,
+    link: emptyStateLink
+  }), emptyStateType === 'noData' && /*#__PURE__*/_react.default.createElement(_EmptyStates.NoDataEmptyState, {
+    illustrationTheme: illustrationTheme,
+    size: emptyStateSize,
+    title: emptyStateTitle,
+    subtitle: emptyStateDescription,
+    action: emptyStateAction,
+    link: emptyStateLink
   }))));
 };
 

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

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@carbon/react");
 
@@ -27,16 +25,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _settings = require("../../../settings");
 
-var _InlineEditContext = require("./addons/InlineEdit/InlineEditContext/InlineEditContext");
-
-var _getCellIdAsObject = require("./addons/InlineEdit/InlineEditContext/getCellIdAsObject");
-
 var _excluded = ["children"];
-
-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 blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var TableRow = _react2.DataTable.TableRow,
     TableCell = _react2.DataTable.TableCell;
@@ -55,12 +44,6 @@ var DatagridRow = function DatagridRow(datagridState) {
       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;
@@ -77,7 +60,7 @@ var DatagridRow = function DatagridRow(datagridState) {
   };
 
   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))
+    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), _cx))
   }, row.getRowProps(), {
     key: row.id,
     onMouseEnter: function onMouseEnter(event) {

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

@@ -27,6 +27,12 @@ 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; }
@@ -164,13 +170,28 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
 
   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;