@carbon/ibm-products 2.0.0-rc.2 → 2.0.0-rc.20

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

@@ -9,39 +9,31 @@ exports.Datagrid = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _react2 = require("@carbon/react");
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _DatagridHead = _interopRequireDefault(require("./DatagridHead"));
-
-var _DatagridBody = _interopRequireDefault(require("./DatagridBody"));
-
-var _DatagridToolbar = _interopRequireDefault(require("./DatagridToolbar"));
-
 var _devtools = require("../../../global/js/utils/devtools");
 
 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';
-var TableContainer = _react2.DataTable.TableContainer,
-    Table = _react2.DataTable.Table;
 
 var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var _getTableProps;
-
   var datagridState = _ref.datagridState,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
 
@@ -51,47 +43,27 @@ var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     return null;
   }
 
-  var _datagridState$getTab = datagridState.getTableProps,
-      getTableProps = _datagridState$getTab === void 0 ? function () {} : _datagridState$getTab,
-      withVirtualScroll = datagridState.withVirtualScroll,
+  var withVirtualScroll = datagridState.withVirtualScroll,
       DatagridPagination = datagridState.DatagridPagination,
       isFetching = datagridState.isFetching,
       tableId = datagridState.tableId,
-      CustomizeColumnsModal = datagridState.CustomizeColumnsModal,
-      leftPanel = datagridState.leftPanel,
-      fullHeightDatagrid = datagridState.fullHeightDatagrid,
-      _datagridState$vertic = datagridState.verticalAlign,
-      verticalAlign = _datagridState$vertic === void 0 ? 'center' : _datagridState$vertic,
-      variableRowHeight = datagridState.variableRowHeight,
+      filterProps = datagridState.filterProps,
       className = datagridState.className,
-      gridTitle = datagridState.gridTitle,
-      gridDescription = datagridState.gridDescription,
-      useDenseHeader = datagridState.useDenseHeader;
+      filters = datagridState.state.filters;
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
-
-  var dataGrid = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(TableContainer, {
-    className: (0, _classnames.default)("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : ''),
-    title: gridTitle,
-    description: gridDescription
-  }, /*#__PURE__*/_react.default.createElement(_DatagridToolbar.default, datagridState), /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "__table-container")
-  }, leftPanel && leftPanel.isOpen && /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "__datagridLeftPanel")
-  }, leftPanel.panelContent), /*#__PURE__*/_react.default.createElement(Table, (0, _extends2.default)({}, getTableProps(), {
-    className: (0, _classnames.default)(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), (0, _defineProperty2.default)({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className)
-  }), /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState), /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
-    rows: rows
-  }))))), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && DatagridPagination(datagridState), CustomizeColumnsModal && /*#__PURE__*/_react.default.createElement(CustomizeColumnsModal, {
-    instance: datagridState
-  }));
-
-  return /*#__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") : '')
-  }, (0, _devtools.getDevtoolsProps)(componentName)), leftPanel && /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "__datagridWithPanel ").concat(blockClass, "__displayFlex ").concat(blockClass, "__leftPanel-position")
-  }, dataGrid), leftPanel === undefined && dataGrid);
+  }, (0, _devtools.getDevtoolsProps)(componentName)), (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__datagridWithPanel ").concat(blockClass, "__displayFlex")
+  }, /*#__PURE__*/_react.default.createElement(_DatagridContent.DatagridContent, {
+    datagridState: datagridState
+  })) : /*#__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

@@ -0,0 +1,230 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DatagridContent = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _react2 = require("@carbon/react");
+
+var _layout = require("@carbon/layout");
+
+var _DatagridHead = _interopRequireDefault(require("./DatagridHead"));
+
+var _DatagridBody = _interopRequireDefault(require("./DatagridBody"));
+
+var _DatagridToolbar = _interopRequireDefault(require("./DatagridToolbar"));
+
+var _handleGridKeyPress = require("./addons/InlineEdit/handleGridKeyPress");
+
+var _settings = require("../../../settings");
+
+var _InlineEditContext = require("./addons/InlineEdit/InlineEditContext");
+
+var _Filtering = require("./addons/Filtering");
+
+var _handleGridFocus = require("./addons/InlineEdit/handleGridFocus");
+
+var _hooks = require("../../../global/js/hooks");
+
+var _hooks2 = require("../../DataSpreadsheet/hooks");
+
+var _FilterSummary = require("../../FilterSummary");
+
+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; }
+
+/**
+ * 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.
+ */
+var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
+
+var DatagridContent = function DatagridContent(_ref) {
+  var _cx4;
+
+  var datagridState = _ref.datagridState;
+
+  var _useContext = (0, _react.useContext)(_InlineEditContext.InlineEditContext),
+      inlineEditState = _useContext.state,
+      dispatch = _useContext.dispatch;
+
+  var _useContext2 = (0, _react.useContext)(_Filtering.FilterContext),
+      filterTags = _useContext2.filterTags,
+      EventEmitter = _useContext2.EventEmitter,
+      leftPanelOpen = _useContext2.leftPanelOpen;
+
+  var activeCellId = inlineEditState.activeCellId,
+      gridActive = inlineEditState.gridActive,
+      editId = inlineEditState.editId;
+  var _datagridState$getTab = datagridState.getTableProps,
+      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 gridAreaRef = (0, _react.useRef)();
+  var multiKeyTrackingRef = (0, _react.useRef)();
+  (0, _hooks.useClickOutside)(gridAreaRef, function (target) {
+    if (!withInlineEdit) {
+      return;
+    } // 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.default.createElement(_react2.Table, (0, _extends2.default)({}, getTableProps(), {
+      className: (0, _classnames.default)(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), (0, _defineProperty2.default)({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-grid-active"), gridActive), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
+      role: withInlineEdit && 'grid',
+      tabIndex: withInlineEdit && 0,
+      onKeyDown: withInlineEdit ? function (event) {
+        return (0, _handleGridKeyPress.handleGridKeyPress)({
+          event: event,
+          dispatch: dispatch,
+          inlineEditState: inlineEditState,
+          instance: datagridState,
+          keysPressedList: keysPressedList,
+          usingMac: usingMac
+        });
+      } : null,
+      onFocus: withInlineEdit ? function () {
+        return (0, _handleGridFocus.handleGridFocus)(inlineEditState, dispatch);
+      } : null
+    }), !withVirtualScroll ? /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState) : null, /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
+      rows: rows
+    })));
+  };
+
+  var _useMultipleKeyTracki = (0, _hooks2.useMultipleKeyTracking)({
+    ref: withInlineEdit ? multiKeyTrackingRef : null,
+    containerHasFocus: gridActive,
+    isEditing: !!editId
+  }),
+      keysPressedList = _useMultipleKeyTracki.keysPressedList,
+      usingMac = _useMultipleKeyTracki.usingMac; // Provides a width for the region outline for useInlineEdit
+
+
+  (0, _react.useEffect)(function () {
+    if (!withInlineEdit) {
+      return;
+    }
+
+    var gridElement = document.querySelector("#".concat(tableId));
+    var tableHeader = gridElement === null || gridElement === void 0 ? void 0 : gridElement.querySelector(".".concat(_settings.carbon.prefix, "--data-table-header"));
+    gridElement.style.setProperty("--".concat(blockClass, "--grid-width"), (0, _layout.px)(totalColumnsWidth + 32));
+
+    if (gridActive) {
+      gridElement.style.setProperty("--".concat(blockClass, "--grid-header-height"), (0, _layout.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.default.createElement(_FilterSummary.FilterSummary, {
+      className: "".concat(blockClass, "__filter-summary"),
+      filters: filterTags,
+      clearFilters: function clearFilters() {
+        return EventEmitter.dispatch(_constants.CLEAR_FILTERS);
+      }
+    });
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_react2.TableContainer, {
+    className: (0, _classnames.default)("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : '', (_cx4 = {}, (0, _defineProperty2.default)(_cx4, "".concat(blockClass, "__grid-container-grid-active"), gridActive), (0, _defineProperty2.default)(_cx4, "".concat(blockClass, "__grid-container-inline-edit"), withInlineEdit), (0, _defineProperty2.default)(_cx4, "".concat(blockClass, "__grid-container-grid-active--without-toolbar"), withInlineEdit && !DatagridActions), _cx4)),
+    title: gridTitle,
+    description: gridDescription
+  }, /*#__PURE__*/_react.default.createElement(_DatagridToolbar.default, datagridState), /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)("".concat(blockClass, "__table-container"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-container--filter-open"), leftPanelOpen)),
+    ref: gridAreaRef
+  }, (filterProps === null || filterProps === void 0 ? void 0 : filterProps.variation) === 'panel' && /*#__PURE__*/_react.default.createElement(_Filtering.FilterPanel, (0, _extends2.default)({
+    updateMethod: "batch"
+  }, getFilterFlyoutProps(), {
+    title: filterProps.panelTitle,
+    filterSections: filterProps.sections
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__table-container-inner")
+  }, renderFilterSummary(), 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), CustomizeColumnsTearsheet && /*#__PURE__*/_react.default.createElement(CustomizeColumnsTearsheet, {
+    instance: datagridState
+  }));
+};
+
+exports.DatagridContent = DatagridContent;
+DatagridContent.propTypes = {
+  datagridState: _propTypes.default.shape({
+    getTableProps: _propTypes.default.func,
+    getFilterFlyoutProps: _propTypes.default.func,
+    withVirtualScroll: _propTypes.default.bool,
+    DatagridActions: _propTypes.default.oneOfType([_propTypes.default.element, _propTypes.default.func]),
+    DatagridPagination: _propTypes.default.oneOfType([_propTypes.default.element, _propTypes.default.func]),
+    CustomizeColumnsTearsheet: _propTypes.default.oneOfType([_propTypes.default.element, _propTypes.default.func]),
+    isFetching: _propTypes.default.bool,
+    fullHeightDatagrid: _propTypes.default.bool,
+    filterProps: _propTypes.default.object,
+    variableRowHeight: _propTypes.default.bool,
+    useDenseHeader: _propTypes.default.bool,
+    withInlineEdit: _propTypes.default.bool,
+    verticalAlign: _propTypes.default.string,
+    gridTitle: _propTypes.default.node,
+    gridDescription: _propTypes.default.node,
+    page: _propTypes.default.arrayOf(_propTypes.default.object),
+    rows: _propTypes.default.arrayOf(_propTypes.default.object),
+    tableId: _propTypes.default.string,
+    totalColumnsWidth: _propTypes.default.number,
+    gridRef: _propTypes.default.object,
+    setAllFilters: _propTypes.default.func,
+    getFilterProps: _propTypes.default.func,
+    state: _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
@@ -25,9 +25,6 @@ var _NoDataEmptyState = require("../../EmptyStates/NoDataEmptyState");
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
-var TableBody = _react2.DataTable.TableBody,
-    TableRow = _react2.DataTable.TableRow,
-    TableCell = _react2.DataTable.TableCell;
 
 var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
@@ -35,16 +32,29 @@ var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
       emptyStateTitle = datagridState.emptyStateTitle,
       emptyStateDescription = datagridState.emptyStateDescription,
       emptyStateSize = datagridState.emptyStateSize,
-      illustrationTheme = datagridState.illustrationTheme;
-  return /*#__PURE__*/_react.default.createElement(TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
+      _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(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
     className: "".concat(blockClass, "__empty-state-body")
-  }), /*#__PURE__*/_react.default.createElement(TableRow, null, /*#__PURE__*/_react.default.createElement(TableCell, {
+  }), /*#__PURE__*/_react.default.createElement(_react2.TableRow, null, /*#__PURE__*/_react.default.createElement(_react2.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/DatagridExpandedRow.js

@@ -24,13 +24,21 @@ var DatagridExpandedRow = function DatagridExpandedRow(PreviousRowRenderer, Expa
   return function (datagridState) {
     var row = datagridState.row;
 
+    var _ref = row || {},
+        expandedContentHeight = _ref.expandedContentHeight;
+
     if (!row.isExpanded) {
       return PreviousRowRenderer(datagridState);
     }
 
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "__expanded-row")
-    }, PreviousRowRenderer(datagridState), ExpandedRowContentComponent(datagridState));
+    }, PreviousRowRenderer(datagridState), /*#__PURE__*/_react.default.createElement("div", {
+      className: "".concat(blockClass, "__expanded-row-content"),
+      style: {
+        height: expandedContentHeight ? expandedContentHeight : null
+      }
+    }, ExpandedRowContentComponent(datagridState)));
   };
 };
 

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

@@ -17,14 +17,12 @@ var _react2 = require("@carbon/react");
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var TableHead = _react2.DataTable.TableHead;
-
 var DatagridHead = function DatagridHead(datagridState) {
   var _datagridState$header = datagridState.headerGroups,
       headerGroups = _datagridState$header === void 0 ? [] : _datagridState$header,
       headRef = datagridState.headRef,
       HeaderRow = datagridState.HeaderRow;
-  return /*#__PURE__*/_react.default.createElement(TableHead, null, headerGroups.map(function (headerGroup) {
+  return /*#__PURE__*/_react.default.createElement(_react2.TableHead, null, headerGroups.map(function (headerGroup) {
     return (// doesn't support header grouping.
       HeaderRow(datagridState, headRef, headerGroup)
     );

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

@@ -31,7 +31,7 @@ var _settings = require("../../../settings");
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
-  return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({}, headerGroup.getHeaderGroupProps(), {
+  return /*#__PURE__*/_react.default.createElement(_react2.TableRow, (0, _extends2.default)({}, headerGroup.getHeaderGroupProps(), {
     className: (0, _classnames.default)("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
     ref: headRef
   }), datagridState.headers.filter(function (_ref) {
@@ -47,7 +47,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       });
     }
 
-    return /*#__PURE__*/_react.default.createElement(TableHeader, (0, _extends2.default)({}, header.getHeaderProps(), {
+    return /*#__PURE__*/_react.default.createElement(_react2.TableHeader, (0, _extends2.default)({}, header.getHeaderProps(), {
       className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__resizableColumn"), header.getResizerProps), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__isResizing"), header.isResizing), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__sortableColumn"), header.canSort), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__isSorted"), header.isSorted), _cx), header.getHeaderProps().className),
       key: header.id
     }), header.render('Header'), header.getResizerProps && /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, header.getResizerProps(), {
@@ -56,9 +56,6 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
   }));
 };
 
-var TableHeader = _react2.DataTable.TableHeader,
-    TableRow = _react2.DataTable.TableRow;
-
 var useHeaderRow = function useHeaderRow(hooks) {
   var useInstance = function useInstance(instance) {
     Object.assign(instance, {

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

@@ -17,6 +17,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@carbon/react");
 
+var _layout = require("@carbon/layout");
+
 var _commonColumnIds = require("../common-column-ids");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -25,26 +27,62 @@ var _settings = require("../../../settings");
 
 var _excluded = ["children"];
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
-var TableRow = _react2.DataTable.TableRow,
-    TableCell = _react2.DataTable.TableCell; // eslint-disable-next-line react/prop-types
+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;
-  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(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx))
+  var row = datagridState.row,
+      rowSize = datagridState.rowSize,
+      withNestedRows = datagridState.withNestedRows;
+
+  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(_react2.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), _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"));
       hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
     }
-  }), row.cells.map(function (cell) {
+  }), row.cells.map(function (cell, index) {
     var cellProps = cell.getCellProps();
     var children = cellProps.children,
         restProps = (0, _objectWithoutProperties2.default)(cellProps, _excluded);
@@ -58,8 +96,8 @@ var DatagridRow = function DatagridRow(datagridState) {
       });
     }
 
-    return /*#__PURE__*/_react.default.createElement(TableCell, (0, _extends2.default)({
-      className: "".concat(blockClass, "__cell")
+    return /*#__PURE__*/_react.default.createElement(_react2.TableCell, (0, _extends2.default)({
+      className: (0, _classnames.default)("".concat(blockClass, "__cell"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__expandable-row-cell"), row.canExpand && index === 0))
     }, restProps, {
       key: cell.column.id
     }), content);

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

@@ -11,27 +11,36 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@carbon/react");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _settings = require("../../../settings");
 
 var _excluded = ["onChange"];
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var SelectAll = function SelectAll(datagridState) {
+  var _columns$;
+
   var isFetching = datagridState.isFetching,
       getToggleAllRowsSelectedProps = datagridState.getToggleAllRowsSelectedProps,
       getToggleAllPageRowsSelectedProps = datagridState.getToggleAllPageRowsSelectedProps,
       tableId = datagridState.tableId,
       hideSelectAll = datagridState.hideSelectAll,
       DatagridPagination = datagridState.DatagridPagination,
-      radio = datagridState.radio;
+      radio = datagridState.radio,
+      columns = datagridState.columns,
+      withStickyColumn = datagridState.withStickyColumn;
+  var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
 
   if (hideSelectAll || radio) {
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: "".concat(blockClass, "__head-hidden-select-all")
+      className: (0, _classnames.default)("".concat(blockClass, "__head-hidden-select-all"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft))
     });
   }
 
@@ -42,8 +51,8 @@ var SelectAll = function SelectAll(datagridState) {
       selectProps = (0, _objectWithoutProperties2.default)(_getProps, _excluded);
 
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "__head-select-all ").concat(blockClass, "__checkbox-cell")
-  }, /*#__PURE__*/_react.default.createElement(TableSelectAll, (0, _extends2.default)({}, selectProps, {
+    className: (0, _classnames.default)("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft))
+  }, /*#__PURE__*/_react.default.createElement(_react2.TableSelectAll, (0, _extends2.default)({}, selectProps, {
     name: "".concat(tableId, "-select-all-checkbox-name"),
     onSelect: onChange,
     disabled: isFetching || selectProps.disabled,
@@ -51,5 +60,4 @@ var SelectAll = function SelectAll(datagridState) {
   })));
 };
 
-exports.SelectAll = SelectAll;
-var TableSelectAll = _react2.DataTable.TableSelectAll;
+exports.SelectAll = SelectAll;