@carbon/ibm-products 2.0.0-rc.9 → 2.0.1

package/es/components/Datagrid/Datagrid/DatagridContent.js

@@ -1,9 +1,16 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+/**
+ * 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 React, { useContext, useEffect, useRef } from 'react';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import { DataTable } from '@carbon/react';
+import { TableContainer, Table } from '@carbon/react';
 import { px } from '@carbon/layout';
 import DatagridHead from './DatagridHead';
 import DatagridBody from './DatagridBody';
@@ -11,66 +18,67 @@ import DatagridToolbar from './DatagridToolbar';
 import { handleGridKeyPress } from './addons/InlineEdit/handleGridKeyPress';
 import { carbon, pkg } from '../../../settings';
 import { InlineEditContext } from './addons/InlineEdit/InlineEditContext';
+import { FilterContext, FilterPanel } from './addons/Filtering';
 import { handleGridFocus } from './addons/InlineEdit/handleGridFocus';
 import { useClickOutside } from '../../../global/js/hooks';
 import { useMultipleKeyTracking } from '../../DataSpreadsheet/hooks';
-var TableContainer = DataTable.TableContainer,
-    Table = DataTable.Table;
+import { FilterSummary } from '../../FilterSummary';
+import { CLEAR_FILTERS } from './addons/Filtering/constants';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 export var DatagridContent = function DatagridContent(_ref) {
   var _cx4;
-
   var datagridState = _ref.datagridState;
-
   var _useContext = useContext(InlineEditContext),
-      state = _useContext.state,
-      dispatch = _useContext.dispatch;
-
-  var activeCellId = state.activeCellId;
+    inlineEditState = _useContext.state,
+    dispatch = _useContext.dispatch;
+  var _useContext2 = useContext(FilterContext),
+    filterTags = _useContext2.filterTags,
+    EventEmitter = _useContext2.EventEmitter,
+    panelOpen = _useContext2.panelOpen;
+  var activeCellId = inlineEditState.activeCellId,
+    gridActive = inlineEditState.gridActive,
+    editId = inlineEditState.editId;
   var _datagridState$getTab = datagridState.getTableProps,
-      getTableProps = _datagridState$getTab === void 0 ? function () {} : _datagridState$getTab,
-      withVirtualScroll = datagridState.withVirtualScroll,
-      DatagridPagination = datagridState.DatagridPagination,
-      isFetching = datagridState.isFetching,
-      CustomizeColumnsModal = datagridState.CustomizeColumnsModal,
-      leftPanel = datagridState.leftPanel,
-      fullHeightDatagrid = datagridState.fullHeightDatagrid,
-      _datagridState$vertic = datagridState.verticalAlign,
-      verticalAlign = _datagridState$vertic === void 0 ? 'center' : _datagridState$vertic,
-      variableRowHeight = datagridState.variableRowHeight,
-      gridTitle = datagridState.gridTitle,
-      gridDescription = datagridState.gridDescription,
-      useDenseHeader = datagridState.useDenseHeader,
-      withInlineEdit = datagridState.withInlineEdit,
-      tableId = datagridState.tableId,
-      DatagridActions = datagridState.DatagridActions,
-      totalColumnsWidth = datagridState.totalColumnsWidth;
+    getTableProps = _datagridState$getTab === void 0 ? function () {} : _datagridState$getTab,
+    getFilterFlyoutProps = datagridState.getFilterFlyoutProps,
+    withVirtualScroll = datagridState.withVirtualScroll,
+    DatagridPagination = datagridState.DatagridPagination,
+    isFetching = datagridState.isFetching,
+    CustomizeColumnsTearsheet = datagridState.CustomizeColumnsTearsheet,
+    filterProps = datagridState.filterProps,
+    fullHeightDatagrid = datagridState.fullHeightDatagrid,
+    _datagridState$vertic = datagridState.verticalAlign,
+    verticalAlign = _datagridState$vertic === void 0 ? 'center' : _datagridState$vertic,
+    variableRowHeight = datagridState.variableRowHeight,
+    gridTitle = datagridState.gridTitle,
+    gridDescription = datagridState.gridDescription,
+    useDenseHeader = datagridState.useDenseHeader,
+    withInlineEdit = datagridState.withInlineEdit,
+    tableId = datagridState.tableId,
+    DatagridActions = datagridState.DatagridActions,
+    totalColumnsWidth = datagridState.totalColumnsWidth,
+    gridRef = datagridState.gridRef,
+    state = datagridState.state;
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
-  var gridActive = state.gridActive,
-      editId = state.editId;
   var gridAreaRef = useRef();
   var multiKeyTrackingRef = useRef();
   useClickOutside(gridAreaRef, function (target) {
     if (!withInlineEdit) {
       return;
-    } // We return from here if we find a parent element with the selector below
+    }
+    // We return from here if we find a parent element with the selector below
     // because that element was initially part of the grid area but was removed
     // and swapped out with an input, i.e. text, number, selection, or date picker
-
-
     if (target.closest(".".concat(blockClass, "__inline-edit-button")) || target.closest(".".concat(blockClass, "__inline-edit--select"))) {
       return;
     }
-
     dispatch({
       type: 'REMOVE_GRID_ACTIVE_FOCUS',
       payload: activeCellId
     });
   });
-
   var renderTable = function renderTable() {
     var _getTableProps;
-
     return /*#__PURE__*/React.createElement(Table, _extends({}, getTableProps(), {
       className: cx(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), _defineProperty({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), _defineProperty({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), _defineProperty({}, "".concat(blockClass, "__table-grid-active"), gridActive), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
       role: withInlineEdit && 'grid',
@@ -79,67 +87,82 @@ export var DatagridContent = function DatagridContent(_ref) {
         return handleGridKeyPress({
           event: event,
           dispatch: dispatch,
-          state: state,
           instance: datagridState,
           keysPressedList: keysPressedList,
+          state: inlineEditState,
           usingMac: usingMac
         });
       } : null,
       onFocus: withInlineEdit ? function () {
-        return handleGridFocus(state, dispatch);
+        return handleGridFocus(inlineEditState, dispatch);
       } : null
-    }), /*#__PURE__*/React.createElement(DatagridHead, datagridState), /*#__PURE__*/React.createElement(DatagridBody, _extends({}, datagridState, {
+    }), !withVirtualScroll ? /*#__PURE__*/React.createElement(DatagridHead, datagridState) : null, /*#__PURE__*/React.createElement(DatagridBody, _extends({}, datagridState, {
       rows: rows
     })));
   };
-
   var _useMultipleKeyTracki = useMultipleKeyTracking({
-    ref: withInlineEdit ? multiKeyTrackingRef : null,
-    containerHasFocus: gridActive,
-    isEditing: !!editId
-  }),
-      keysPressedList = _useMultipleKeyTracki.keysPressedList,
-      usingMac = _useMultipleKeyTracki.usingMac; // Provides a width for the region outline for useInlineEdit
-
+      ref: withInlineEdit ? multiKeyTrackingRef : null,
+      containerHasFocus: gridActive,
+      isEditing: !!editId
+    }),
+    keysPressedList = _useMultipleKeyTracki.keysPressedList,
+    usingMac = _useMultipleKeyTracki.usingMac;
 
+  // Provides a width for the region outline for useInlineEdit
   useEffect(function () {
     if (!withInlineEdit) {
       return;
     }
-
     var gridElement = document.querySelector("#".concat(tableId));
     var tableHeader = gridElement === null || gridElement === void 0 ? void 0 : gridElement.querySelector(".".concat(carbon.prefix, "--data-table-header"));
     gridElement.style.setProperty("--".concat(blockClass, "--grid-width"), px(totalColumnsWidth + 32));
-
     if (gridActive) {
       gridElement.style.setProperty("--".concat(blockClass, "--grid-header-height"), px((tableHeader === null || tableHeader === void 0 ? void 0 : tableHeader.clientHeight) || 0));
     }
   }, [withInlineEdit, tableId, totalColumnsWidth, datagridState, gridActive]);
+  var renderFilterSummary = function renderFilterSummary() {
+    return state.filters.length > 0 && /*#__PURE__*/React.createElement(FilterSummary, {
+      className: "".concat(blockClass, "__filter-summary"),
+      filters: filterTags,
+      clearFilters: function clearFilters() {
+        return EventEmitter.dispatch(CLEAR_FILTERS);
+      }
+    });
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContainer, {
     className: cx("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : '', (_cx4 = {}, _defineProperty(_cx4, "".concat(blockClass, "__grid-container-grid-active"), gridActive), _defineProperty(_cx4, "".concat(blockClass, "__grid-container-inline-edit"), withInlineEdit), _defineProperty(_cx4, "".concat(blockClass, "__grid-container-grid-active--without-toolbar"), withInlineEdit && !DatagridActions), _cx4)),
     title: gridTitle,
     description: gridDescription
   }, /*#__PURE__*/React.createElement(DatagridToolbar, datagridState), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass, "__table-container"),
+    className: cx("".concat(blockClass, "__table-container"), _defineProperty({}, "".concat(blockClass, "__table-container--filter-open"), panelOpen)),
     ref: gridAreaRef
-  }, leftPanel && leftPanel.isOpen && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass, "__datagridLeftPanel")
-  }, leftPanel.panelContent), withInlineEdit ? /*#__PURE__*/React.createElement("div", {
+  }, (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' && /*#__PURE__*/React.createElement(FilterPanel, _extends({
+    updateMethod: "batch"
+  }, getFilterFlyoutProps(), {
+    title: filterProps.panelTitle,
+    filterSections: filterProps.sections
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__table-container-inner")
+  }, renderFilterSummary(), withInlineEdit ? /*#__PURE__*/React.createElement("div", {
     ref: multiKeyTrackingRef
-  }, renderTable()) : renderTable())), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/React.createElement(DatagridPagination, datagridState), CustomizeColumnsModal && /*#__PURE__*/React.createElement(CustomizeColumnsModal, {
+  }, renderTable()) : withVirtualScroll ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__virtualScrollContainer"),
+    ref: gridRef
+  }, renderTable()) : renderTable()))), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/React.createElement(DatagridPagination, datagridState), CustomizeColumnsTearsheet && /*#__PURE__*/React.createElement(CustomizeColumnsTearsheet, {
     instance: datagridState
   }));
 };
 DatagridContent.propTypes = {
   datagridState: PropTypes.shape({
     getTableProps: PropTypes.func,
+    getFilterFlyoutProps: PropTypes.func,
     withVirtualScroll: PropTypes.bool,
     DatagridActions: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
     DatagridPagination: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
-    CustomizeColumnsModal: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
+    CustomizeColumnsTearsheet: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
     isFetching: PropTypes.bool,
-    leftPanel: PropTypes.object,
     fullHeightDatagrid: PropTypes.bool,
+    filterProps: PropTypes.object,
     variableRowHeight: PropTypes.bool,
     useDenseHeader: PropTypes.bool,
     withInlineEdit: PropTypes.bool,
@@ -149,6 +172,10 @@ DatagridContent.propTypes = {
     page: PropTypes.arrayOf(PropTypes.object),
     rows: PropTypes.arrayOf(PropTypes.object),
     tableId: PropTypes.string,
-    totalColumnsWidth: PropTypes.number
+    totalColumnsWidth: PropTypes.number,
+    gridRef: PropTypes.object,
+    setAllFilters: PropTypes.func,
+    getFilterProps: PropTypes.func,
+    state: PropTypes.object
   })
 };

package/es/components/Datagrid/Datagrid/DatagridEmptyBody.js

@@ -1,38 +1,41 @@
 import _extends from "@babel/runtime/helpers/extends";
-
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * Copyright IBM Corp. 2020, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 import React from 'react';
 import { pkg } from '../../../settings';
-import { DataTable } from '@carbon/react';
-import { NoDataEmptyState } from '../../EmptyStates/NoDataEmptyState';
+import { TableBody, TableRow, TableCell } from '@carbon/react';
+import { NoDataEmptyState, ErrorEmptyState, NotFoundEmptyState } from '../../EmptyStates';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
-var TableBody = DataTable.TableBody,
-    TableRow = DataTable.TableRow,
-    TableCell = DataTable.TableCell;
-
 var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
-      headers = datagridState.headers,
-      emptyStateTitle = datagridState.emptyStateTitle,
-      emptyStateDescription = datagridState.emptyStateDescription,
-      emptyStateSize = datagridState.emptyStateSize,
-      illustrationTheme = datagridState.illustrationTheme;
-  return /*#__PURE__*/React.createElement(TableBody, _extends({}, getTableBodyProps(), {
-    className: "".concat(blockClass, "__empty-state-body")
-  }), /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableCell, {
-    colSpan: headers.length
-  }, /*#__PURE__*/React.createElement(NoDataEmptyState, {
+    headers = datagridState.headers,
+    emptyStateTitle = datagridState.emptyStateTitle,
+    emptyStateDescription = datagridState.emptyStateDescription,
+    emptyStateSize = datagridState.emptyStateSize,
+    _datagridState$emptyS = datagridState.emptyStateType,
+    emptyStateType = _datagridState$emptyS === void 0 ? 'noData' : _datagridState$emptyS,
+    illustrationTheme = datagridState.illustrationTheme,
+    emptyStateAction = datagridState.emptyStateAction,
+    emptyStateLink = datagridState.emptyStateLink;
+  var emptyStateProps = {
     illustrationTheme: illustrationTheme,
     size: emptyStateSize,
     title: emptyStateTitle,
-    subtitle: emptyStateDescription
-  }))));
+    subtitle: emptyStateDescription,
+    action: emptyStateAction,
+    link: emptyStateLink
+  };
+  return /*#__PURE__*/React.createElement(TableBody, _extends({}, getTableBodyProps({
+    role: false
+  }), {
+    className: "".concat(blockClass, "__empty-state-body")
+  }), /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableCell, {
+    colSpan: headers.length
+  }, emptyStateType === 'error' && /*#__PURE__*/React.createElement(ErrorEmptyState, emptyStateProps), emptyStateType === 'noData' && /*#__PURE__*/React.createElement(NoDataEmptyState, emptyStateProps), emptyStateType === 'notFound' && /*#__PURE__*/React.createElement(NotFoundEmptyState, emptyStateProps))));
 };
-
 export default DatagridEmptyBody;

package/es/components/Datagrid/Datagrid/DatagridExpandedRow.js

@@ -5,21 +5,20 @@
  * US Government Users Restricted Rights - Use, duplication or disclosure
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
+
 import React from 'react';
 import { pkg } from '../../../settings';
-var blockClass = "".concat(pkg.prefix, "--datagrid"); // eslint-disable-next-line react/prop-types
+var blockClass = "".concat(pkg.prefix, "--datagrid");
 
+// eslint-disable-next-line react/prop-types
 var DatagridExpandedRow = function DatagridExpandedRow(PreviousRowRenderer, ExpandedRowContentComponent) {
   return function (datagridState) {
     var row = datagridState.row;
-
     var _ref = row || {},
-        expandedContentHeight = _ref.expandedContentHeight;
-
+      expandedContentHeight = _ref.expandedContentHeight;
     if (!row.isExpanded) {
       return PreviousRowRenderer(datagridState);
     }
-
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "__expanded-row")
     }, PreviousRowRenderer(datagridState), /*#__PURE__*/React.createElement("div", {
@@ -30,5 +29,4 @@ var DatagridExpandedRow = function DatagridExpandedRow(PreviousRowRenderer, Expa
     }, ExpandedRowContentComponent(datagridState)));
   };
 };
-
 export default DatagridExpandedRow;

package/es/components/Datagrid/Datagrid/DatagridHead.js

@@ -4,20 +4,19 @@
  * 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 React from 'react';
-import { DataTable } from '@carbon/react';
-var TableHead = DataTable.TableHead;
 
+import React from 'react';
+import { TableHead } from '@carbon/react';
 var DatagridHead = function DatagridHead(datagridState) {
   var _datagridState$header = datagridState.headerGroups,
-      headerGroups = _datagridState$header === void 0 ? [] : _datagridState$header,
-      headRef = datagridState.headRef,
-      HeaderRow = datagridState.HeaderRow;
+    headerGroups = _datagridState$header === void 0 ? [] : _datagridState$header,
+    headRef = datagridState.headRef,
+    HeaderRow = datagridState.HeaderRow;
   return /*#__PURE__*/React.createElement(TableHead, null, headerGroups.map(function (headerGroup) {
-    return (// doesn't support header grouping.
+    return (
+      // doesn't support header grouping.
       HeaderRow(datagridState, headRef, headerGroup)
     );
   }));
 };
-
 export default DatagridHead;

package/es/components/Datagrid/Datagrid/DatagridHeaderRow.js

@@ -1,22 +1,23 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 /**
  * Copyright IBM Corp. 2020, 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.
  */
+
 // @flow
 import React from 'react';
 import cx from 'classnames';
-import { DataTable } from '@carbon/react';
+import { TableHeader, TableRow } from '@carbon/react';
 import { selectionColumnId } from '../common-column-ids';
 import { pkg } from '../../../settings';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
-
 var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
-  return /*#__PURE__*/React.createElement(TableRow, _extends({}, headerGroup.getHeaderGroupProps(), {
+  return /*#__PURE__*/React.createElement(TableRow, _extends({}, headerGroup.getHeaderGroupProps({
+    role: false
+  }), {
     className: cx("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
     ref: headRef
   }), datagridState.headers.filter(function (_ref) {
@@ -24,15 +25,15 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
     return isVisible;
   }).map(function (header) {
     var _cx;
-
     if (header.id === selectionColumnId) {
       // render directly without the wrapper TableHeader
       return header.render('Header', {
         key: header.id
       });
     }
-
-    return /*#__PURE__*/React.createElement(TableHeader, _extends({}, header.getHeaderProps(), {
+    return /*#__PURE__*/React.createElement(TableHeader, _extends({}, header.getHeaderProps({
+      role: false
+    }), {
       className: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__resizableColumn"), header.getResizerProps), _defineProperty(_cx, "".concat(blockClass, "__isResizing"), header.isResizing), _defineProperty(_cx, "".concat(blockClass, "__sortableColumn"), header.canSort), _defineProperty(_cx, "".concat(blockClass, "__isSorted"), header.isSorted), _cx), header.getHeaderProps().className),
       key: header.id
     }), header.render('Header'), header.getResizerProps && /*#__PURE__*/React.createElement("div", _extends({}, header.getResizerProps(), {
@@ -40,18 +41,12 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
     })));
   }));
 };
-
-var TableHeader = DataTable.TableHeader,
-    TableRow = DataTable.TableRow;
-
 var useHeaderRow = function useHeaderRow(hooks) {
   var useInstance = function useInstance(instance) {
     Object.assign(instance, {
       HeaderRow: HeaderRow
     });
   };
-
   hooks.useInstance.push(useInstance);
 };
-
 export default useHeaderRow;

package/es/components/Datagrid/Datagrid/DatagridRefBody.js

@@ -1,10 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 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
@@ -15,16 +12,19 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React from 'react';
 import cx from 'classnames';
 import { pkg } from '../../../settings';
-var blockClass = "".concat(pkg.prefix, "--datagrid"); // TableBody from carbon is a functional component
+var blockClass = "".concat(pkg.prefix, "--datagrid");
+
+// TableBody from carbon is a functional component
 // hence no way to pass the ref to html element without changes in carbon side
 // define html directly here.
 // ref should be passed in thru getTableBodyProps
-
 var DatagridRefBody = function DatagridRefBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
-      rows = datagridState.rows,
-      prepareRow = datagridState.prepareRow;
-  return /*#__PURE__*/React.createElement("tbody", _extends({}, getTableBodyProps(), {
+    rows = datagridState.rows,
+    prepareRow = datagridState.prepareRow;
+  return /*#__PURE__*/React.createElement("tbody", _extends({}, getTableBodyProps({
+    role: false
+  }), {
     className: cx("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     prepareRow(row);
@@ -33,5 +33,4 @@ var DatagridRefBody = function DatagridRefBody(datagridState) {
     }));
   }));
 };
-
 export default DatagridRefBody;

package/es/components/Datagrid/Datagrid/DatagridRow.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["children"];
-
 /*
  * Licensed Materials - Property of IBM
  * 5724-Q36
@@ -11,93 +10,104 @@ var _excluded = ["children"];
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
 // @flow
-import React, { useContext } from 'react';
-import { DataTable, SkeletonText } from '@carbon/react';
+import React from 'react';
+import { TableRow, TableCell, SkeletonText } from '@carbon/react';
 import { px } from '@carbon/layout';
 import { selectionColumnId } from '../common-column-ids';
 import cx from 'classnames';
 import { pkg, carbon } from '../../../settings';
-import { InlineEditContext } from './addons/InlineEdit/InlineEditContext/InlineEditContext';
-import { getCellIdAsObject } from './addons/InlineEdit/InlineEditContext/getCellIdAsObject';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
-var TableRow = DataTable.TableRow,
-    TableCell = DataTable.TableCell;
 var rowHeights = {
   xs: 24,
   sm: 32,
   md: 40,
   lg: 48,
   xl: 64
-}; // eslint-disable-next-line react/prop-types
+};
 
+// eslint-disable-next-line react/prop-types
 var DatagridRow = function DatagridRow(datagridState) {
   var _cx;
-
   var row = datagridState.row,
-      rowSize = datagridState.rowSize,
-      withNestedRows = datagridState.withNestedRows;
-
-  var _useContext = useContext(InlineEditContext),
-      state = _useContext.state;
-
-  var activeCellId = state.activeCellId;
-  var activeCellObject = activeCellId && getCellIdAsObject(activeCellId);
-
+    rowSize = datagridState.rowSize,
+    withNestedRows = datagridState.withNestedRows;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
-        subRows = _ref.subRows;
+      subRows = _ref.subRows;
     var size = 0;
-
     if (isExpanded && subRows) {
       size += subRows.length;
       subRows.forEach(function (child) {
         size += getVisibleNestedRowCount(child);
       });
     }
-
     return size;
   };
-
+  var hoverHandler = function hoverHandler(event) {
+    var _hoverRow$style, _hoverRow$style2, _hoverRow$style3;
+    var subRowCount = getVisibleNestedRowCount(row);
+    var totalNestedRowIndicatorHeight = 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"), 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"), px((rowExpanderButton === null || rowExpanderButton === void 0 ? void 0 : rowExpanderButton.offsetLeft) || 0));
+  };
+  var focusRemover = function focusRemover() {
+    var elements = document.querySelectorAll(".".concat(blockClass, "__carbon-row-expanded"));
+    elements.forEach(function (el) {
+      el.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
+    });
+  };
   return /*#__PURE__*/React.createElement(TableRow, _extends({
-    className: cx("".concat(blockClass, "__carbon-row"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), _defineProperty(_cx, "".concat(carbon.prefix, "--data-table--selected"), row.isSelected), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-hover-active"), activeCellObject && row.index === activeCellObject.row), _cx))
-  }, row.getRowProps(), {
+    className: cx("".concat(blockClass, "__carbon-row"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), _defineProperty(_cx, "".concat(carbon.prefix, "--data-table--selected"), row.isSelected), _cx))
+  }, row.getRowProps({
+    role: false
+  }), {
     key: row.id,
     onMouseEnter: function onMouseEnter(event) {
-      var _hoverRow$style, _hoverRow$style2, _hoverRow$style3;
-
       if (!withNestedRows) {
         return;
       }
-
-      var subRowCount = getVisibleNestedRowCount(row);
-      var totalNestedRowIndicatorHeight = 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"), 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"), px((rowExpanderButton === null || rowExpanderButton === void 0 ? void 0 : rowExpanderButton.offsetLeft) || 0));
+      hoverHandler(event);
     },
     onMouseLeave: function onMouseLeave(event) {
       var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
       hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
+    },
+    onFocus: function onFocus(event) {
+      if (!withNestedRows) {
+        return;
+      }
+      hoverHandler(event);
+    },
+    onBlur: function onBlur() {
+      focusRemover();
+    },
+    onKeyUp: function onKeyUp(event) {
+      if (!withNestedRows) {
+        return;
+      }
+      if (event.key === 'Enter' || event.key === 'Space') {
+        focusRemover();
+        hoverHandler(event);
+      }
     }
   }), row.cells.map(function (cell, index) {
-    var cellProps = cell.getCellProps();
-
+    var cellProps = cell.getCellProps({
+      role: false
+    });
     var children = cellProps.children,
-        restProps = _objectWithoutProperties(cellProps, _excluded);
-
+      restProps = _objectWithoutProperties(cellProps, _excluded);
     var content = children || /*#__PURE__*/React.createElement(React.Fragment, null, !row.isSkeleton && cell.render('Cell'), row.isSkeleton && /*#__PURE__*/React.createElement(SkeletonText, null));
-
     if (cell && cell.column && cell.column.id === selectionColumnId) {
       // directly render component without the wrapping TableCell
       return cell.render('Cell', {
         key: cell.column.id
       });
     }
-
     return /*#__PURE__*/React.createElement(TableCell, _extends({
       className: cx("".concat(blockClass, "__cell"), _defineProperty({}, "".concat(blockClass, "__expandable-row-cell"), row.canExpand && index === 0))
     }, restProps, {
@@ -105,5 +115,4 @@ var DatagridRow = function DatagridRow(datagridState) {
     }), content);
   }));
 };
-
 export default DatagridRow;