@carbon/ibm-products 1.15.0 → 1.18.0

package/es/components/DataSpreadsheet/hooks/useSpreadsheetMouseUp.js

@@ -0,0 +1,153 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+
+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; }
+
+/**
+ * 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 { useEffect } from 'react';
+import { px } from '@carbon/layout';
+import { pkg } from '../../../settings';
+import { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
+export var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
+  var currentMatcher = _ref.currentMatcher,
+      setSelectionAreas = _ref.setSelectionAreas,
+      setClickAndHoldActive = _ref.setClickAndHoldActive,
+      setValidStartingPoint = _ref.setValidStartingPoint,
+      validStartingPoint = _ref.validStartingPoint,
+      _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
+      ref = _ref.ref,
+      setHeaderCellHoldActive = _ref.setHeaderCellHoldActive,
+      setColumnOrder = _ref.setColumnOrder,
+      visibleColumns = _ref.visibleColumns,
+      setActiveCellCoordinates = _ref.setActiveCellCoordinates,
+      activeCellCoordinates = _ref.activeCellCoordinates,
+      rows = _ref.rows,
+      defaultColumn = _ref.defaultColumn;
+  useEffect(function () {
+    var handleMouseUp = function handleMouseUp(event) {
+      // Remove the cloned selection area on mouse up
+      if (!validStartingPoint) {
+        setHeaderCellHoldActive(false);
+        var selectionAreaCloneElement = ref.current.querySelector(".".concat(blockClass, "__selection-area--element-cloned"));
+
+        if (!selectionAreaCloneElement) {
+          return;
+        } // Mouse up while a cloned selection area exists/a column is being reordered
+
+
+        if (selectionAreaCloneElement) {
+          var closestCell = event.target.closest(".".concat(blockClass, "--interactive-cell-element"));
+          var newColumnIndex = closestCell === null || closestCell === void 0 ? void 0 : closestCell.getAttribute('data-column-index');
+          var originalColumnIndex = selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 ? void 0 : selectionAreaCloneElement.getAttribute('data-column-index-original');
+          var columnToMoveToElement = ref.current.querySelector("[data-row-index=\"header\"][data-column-index=\"".concat(newColumnIndex, "\"]")); // Mouse up element was not part of the spreadsheet component
+
+          if (!columnToMoveToElement) {
+            return;
+          }
+
+          var selectionAreaToMove = ref.current.querySelector("[data-matcher-id=\"".concat(currentMatcher, "\"]"));
+          var spreadsheetPosition = ref.current.getBoundingClientRect();
+          var newIndexPosition = columnToMoveToElement.getBoundingClientRect();
+          var relativeNewPosition = newIndexPosition.left - spreadsheetPosition.left;
+          var cloneColumnWidth = selectionAreaCloneElement.offsetWidth;
+          var columnsWidthUpToNewIndex = 0;
+          var newIndexLessThanStarting = newColumnIndex < originalColumnIndex;
+          visibleColumns.forEach(function (item, index) {
+            if (newIndexLessThanStarting && index === visibleColumns.length - 1) {
+              return;
+            }
+
+            if (index <= newColumnIndex) {
+              columnsWidthUpToNewIndex += (item === null || item === void 0 ? void 0 : item.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width);
+            }
+          });
+          var updatedSelectionAreaPlacement = newIndexLessThanStarting ? relativeNewPosition : columnsWidthUpToNewIndex - cloneColumnWidth + (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth);
+          selectionAreaToMove.style.left = px(updatedSelectionAreaPlacement);
+          setSelectionAreas(function (prev) {
+            var selectionAreaClone = deepCloneObject(prev);
+
+            if (originalColumnIndex === newColumnIndex) {
+              return prev;
+            }
+
+            var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
+              return item.matcher === currentMatcher;
+            });
+
+            if (indexOfItemToUpdate === -1) {
+              return prev;
+            }
+
+            selectionAreaClone[indexOfItemToUpdate].header.index = Number(newColumnIndex);
+            selectionAreaClone[indexOfItemToUpdate].point1.column = Number(newColumnIndex);
+            selectionAreaClone[indexOfItemToUpdate].point2.column = Number(newColumnIndex);
+            return selectionAreaClone;
+          });
+          var columnIdArray = visibleColumns.map(function (column) {
+            return column.id;
+          });
+
+          var columnIdArrayClone = _toConsumableArray(columnIdArray); // Remove one element at the original index
+
+
+          columnIdArrayClone.splice(originalColumnIndex, 1); // Add one element at the new index
+
+          columnIdArrayClone.splice(newColumnIndex, 0, columnIdArray[originalColumnIndex]);
+          setColumnOrder(columnIdArrayClone); // Function provided by useTable (react-table) hook to reorder columns
+
+          var newCellCoords = _objectSpread(_objectSpread({}, activeCellCoordinates), {}, {
+            column: Number(newColumnIndex)
+          });
+
+          setActiveCellCoordinates(newCellCoords); // Remove the cloned column and indicator elements
+
+          var indicatorLineElement = ref.current.querySelector(".".concat(blockClass, "__reorder-indicator-line"));
+          indicatorLineElement === null || indicatorLineElement === void 0 ? void 0 : indicatorLineElement.remove();
+          selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 ? void 0 : selectionAreaCloneElement.remove();
+        }
+      } // Mouse up was on a spreadsheet body cell which is a valid
+      // start/end point for creating a selection area
+
+
+      if (validStartingPoint) {
+        setClickAndHoldActive(false);
+        setValidStartingPoint(false);
+        var cellButton = event.target.closest(".".concat(blockClass, "__body--td"));
+
+        if (cellButton) {
+          var endCellCoordinates = {
+            row: Number(cellButton.getAttribute('data-row-index')),
+            column: Number(cellButton.getAttribute('data-column-index'))
+          };
+          setSelectionAreas(function (prev) {
+            var selectionAreaClone = deepCloneObject(prev);
+            var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
+              return item.matcher === currentMatcher;
+            }); // No items in the array have an object that matches the value of currentMatcher
+
+            if (indexOfItemToUpdate === -1) {
+              return prev;
+            }
+
+            selectionAreaClone[indexOfItemToUpdate].point2 = endCellCoordinates;
+            selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
+            return selectionAreaClone;
+          });
+        }
+      }
+    };
+
+    document.addEventListener('mouseup', handleMouseUp);
+    return function () {
+      document.removeEventListener('mouseup', handleMouseUp);
+    };
+  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn]);
+};

package/es/components/DataSpreadsheet/utils/checkSelectedHeaderCell.js

@@ -0,0 +1,16 @@
+/**
+ * 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 { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
+export var checkSelectedHeaderCell = function checkSelectedHeaderCell(headerIndex, selectionAreas, headerType) {
+  var areasCloned = deepCloneObject(selectionAreas);
+  var isSelectedHeader = areasCloned.some(function (area) {
+    var _area$header, _area$header2;
+
+    return (area === null || area === void 0 ? void 0 : (_area$header = area.header) === null || _area$header === void 0 ? void 0 : _area$header.type) === headerType && headerIndex === (area === null || area === void 0 ? void 0 : (_area$header2 = area.header) === null || _area$header2 === void 0 ? void 0 : _area$header2.index);
+  });
+  return isSelectedHeader;
+};

package/es/components/DataSpreadsheet/utils/createCellSelectionArea.js

@@ -14,7 +14,8 @@ export var createCellSelectionArea = function createCellSelectionArea(_ref) {
       defaultColumn = _ref.defaultColumn,
       selectionAreas = _ref.selectionAreas,
       setSelectionAreas = _ref.setSelectionAreas,
-      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea;
+      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea,
+      visibleColumns = _ref.visibleColumns;
 
   var _getSelectionAreaPoin = getSelectionAreaPoints(area),
       lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
@@ -28,24 +29,28 @@ export var createCellSelectionArea = function createCellSelectionArea(_ref) {
     activeCellElement.setAttribute('data-selection-id', area.matcher);
   }
 
-  var point1Element = document.querySelector("[data-row-index=\"".concat(area.point1.row, "\"][data-column-index=\"").concat(area.point1.column, "\"]")) || document.querySelector(".".concat(blockClass, "__body--td")); // if we can't find the point1 element (this can happen in the case where a virtualized row is not present anymore in the DOM), we get the default height/width of the first body cell we find
+  var selectionAreaVariableWidth = 0;
+  visibleColumns.forEach(function (item, index) {
+    if (index >= lowestColumnIndex && index <= greatestColumnIndex) {
+      selectionAreaVariableWidth += (item === null || item === void 0 ? void 0 : item.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width);
+    }
+  });
+  var point1Element = document.querySelector("[data-row-index=\"".concat(area.point1.row, "\"][data-column-index=\"").concat(area.point1.column, "\"]")) || document.querySelector(".".concat(blockClass, "__body--td")); // if we can't find the point1 element (this can happen in the case where a virtualized row is not present anymore in the DOM), we get the default height of the first body cell we find
 
-  var selectionAreaCellWidth = point1Element.offsetWidth;
   var selectionAreaCellHeight = point1Element.offsetHeight;
-  var selectionAreaTotalWidth = selectionAreaCellWidth * (greatestColumnIndex - lowestColumnIndex + 1);
   var selectionAreaTotalHeight = selectionAreaCellHeight * (greatestRowIndex - lowestRowIndex + 1);
   var bodyContainer = document.querySelector(".".concat(blockClass, "__list--container")).firstElementChild;
   var placementElement = bodyContainer.querySelector("[data-row-index=\"".concat(lowestRowIndex, "\"][data-column-index=\"").concat(lowestColumnIndex, "\"]"));
   var relativePosition = {
     top: placementElement ? placementElement.getBoundingClientRect().top - bodyContainer.getBoundingClientRect().top : lowestRowIndex === 0 ? 0 : selectionAreaCellHeight * lowestRowIndex,
     // calculate top value here if virtualized row is not in DOM
-    left: placementElement ? placementElement.getBoundingClientRect().left - bodyContainer.getBoundingClientRect().left : lowestColumnIndex === 0 ? 0 + (defaultColumn.rowHeaderWidth - 4) : selectionAreaCellWidth * lowestColumnIndex + (defaultColumn.rowHeaderWidth - 4) // calculate left value here if virtualized row is not in DOM, accounting for row header cell width (including borders)
+    left: placementElement ? placementElement.getBoundingClientRect().left - bodyContainer.getBoundingClientRect().left : lowestColumnIndex === 0 ? 0 + (defaultColumn.rowHeaderWidth - 4) : defaultColumn.width * lowestColumnIndex + (defaultColumn.rowHeaderWidth - 4) // calculate left value here if virtualized row is not in DOM, accounting for row header cell width (including borders)
 
   };
   var selectionAreaElement = document.querySelector("[data-matcher-id=\"".concat(area.matcher, "\"]")) || document.createElement('div');
   selectionAreaElement.classList.add("".concat(blockClass, "__selection-area--element"));
   selectionAreaElement.setAttribute('data-matcher-id', area.matcher);
-  selectionAreaElement.style.width = px(selectionAreaTotalWidth);
+  selectionAreaElement.style.width = px(selectionAreaVariableWidth);
   selectionAreaElement.style.height = px(selectionAreaTotalHeight);
   selectionAreaElement.style.left = px(relativePosition.left);
   selectionAreaElement.style.top = px(relativePosition.top);

package/es/components/DataSpreadsheet/utils/generateData.js

@@ -24,28 +24,36 @@ var range = function range(len) {
   return arr;
 };
 
-var newPet = function newPet() {
-  return {
+var newPet = function newPet(extraColumns) {
+  var extraDataProps = extraColumns && {
+    ownerName: petNames[Math.floor(Math.random() * petNames.length)],
+    weight: Math.floor(Math.random() * 40)
+  };
+  var defaultPet = {
     petType: pets[Math.floor(Math.random() * pets.length)],
     firstName: petNames[Math.floor(Math.random() * petNames.length)],
     age: Math.floor(Math.random() * 30),
     visits: Math.floor(Math.random() * 40),
     health: Math.floor(Math.random() * 100)
   };
-};
 
-export var generateData = function generateData() {
-  for (var _len = arguments.length, lens = new Array(_len), _key = 0; _key < _len; _key++) {
-    lens[_key] = arguments[_key];
+  if (extraColumns) {
+    return _objectSpread(_objectSpread({}, defaultPet), extraDataProps);
   }
 
+  return defaultPet;
+};
+
+export var generateData = function generateData(_ref) {
+  var rows = _ref.rows,
+      extraColumns = _ref.extraColumns;
+
   var makeDataLevel = function makeDataLevel() {
     var depth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    var lens = [rows];
     var len = lens[depth];
     return range(len).map(function () {
-      return _objectSpread(_objectSpread({}, newPet()), {}, {
-        subRows: lens[depth + 1] ? makeDataLevel(depth + 1) : undefined
-      });
+      return _objectSpread({}, newPet(extraColumns));
     });
   };
 

package/es/components/DataSpreadsheet/utils/getSpreadsheetWidth.js

@@ -0,0 +1,30 @@
+/**
+ * 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 { px } from '@carbon/layout';
+export var getSpreadsheetWidth = function getSpreadsheetWidth(_ref) {
+  var type = _ref.type,
+      headerGroup = _ref.headerGroup,
+      scrollBarSizeValue = _ref.scrollBarSizeValue,
+      totalVisibleColumns = _ref.totalVisibleColumns,
+      defaultColumn = _ref.defaultColumn,
+      totalColumnsWidth = _ref.totalColumnsWidth;
+  var additionalWidth = scrollBarSizeValue + defaultColumn.rowHeaderWidth;
+
+  if (!totalVisibleColumns) {
+    if (type === 'header') {
+      return px(parseInt(headerGroup.getHeaderGroupProps().style.width) + additionalWidth);
+    }
+
+    if (type !== 'header') {
+      return totalColumnsWidth + additionalWidth;
+    }
+  }
+
+  if (totalVisibleColumns) {
+    return totalVisibleColumns * (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width) + additionalWidth;
+  }
+};

package/es/components/DataSpreadsheet/utils/handleHeaderCellSelection.js

@@ -63,10 +63,14 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref)
 
     if (isHoldingCommandKey) {
       var selectionsFromHeaderCell = selectionsClone.filter(function (item) {
-        return item.header.type;
+        var _item$header;
+
+        return (_item$header = item.header) === null || _item$header === void 0 ? void 0 : _item$header.type;
       });
       var previouslyCreatedHeaderSelection = selectionsFromHeaderCell.filter(function (item) {
-        return item.header.type === type;
+        var _item$header2;
+
+        return ((_item$header2 = item.header) === null || _item$header2 === void 0 ? void 0 : _item$header2.type) === type;
       });
       var isHeaderPartOfPreviousSelection = checkActiveHeaderCell(index, previouslyCreatedHeaderSelection, type); // Prevents row/column header selections from being created multiple times
 

package/es/components/DataSpreadsheet/utils/moveColumnIndicatorLine.js

@@ -0,0 +1,34 @@
+/**
+ * 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 { px } from '@carbon/layout';
+import { pkg } from '../../../settings';
+export var moveColumnIndicatorLine = function moveColumnIndicatorLine(_ref) {
+  var _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
+      clonedSelectionElement = _ref.clonedSelectionElement,
+      ref = _ref.ref,
+      spreadsheetCoords = _ref.spreadsheetCoords;
+  var closestCell = event.target.closest(".".concat(blockClass, "--interactive-cell-element"));
+  var newColumnIndex = closestCell === null || closestCell === void 0 ? void 0 : closestCell.getAttribute('data-column-index');
+  var originalColumnIndex = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-column-index-original');
+  var closestCellCoords = closestCell.getBoundingClientRect();
+  var indicatorLineElement = ref.current.querySelector(".".concat(blockClass, "__reorder-indicator-line"));
+  var matcherId = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-matcher-id');
+  var selectionAreaOrigin = ref.current.querySelector("[data-matcher-id=\"".concat(matcherId, "\"]"));
+
+  if (Number(newColumnIndex) > Number(originalColumnIndex)) {
+    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2);
+  }
+
+  if (Number(newColumnIndex) < Number(originalColumnIndex)) {
+    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left);
+  }
+
+  if (Number(newColumnIndex) === Number(originalColumnIndex)) {
+    indicatorLineElement.style.left = selectionAreaOrigin.style.left;
+  }
+};

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

@@ -1,16 +1,16 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["getTableProps", "withVirtualScroll", "DatagridPagination", "isFetching", "tableId", "CustomizeColumnsModal", "leftPanel", "fullHeightDatagrid", "verticalAlign", "variableRowHeight", "className"];
+var _excluded = ["datagridState"];
 
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020 - 2021
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * 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.
  */
 import React from 'react';
+import PropTypes from 'prop-types';
 import { DataTable } from 'carbon-components-react';
 import cx from 'classnames';
 import DatagridHead from './DatagridHead';
@@ -18,13 +18,22 @@ import DatagridBody from './DatagridBody';
 import DatagridToolbar from './DatagridToolbar';
 import { getDevtoolsProps } from '../../../global/js/utils/devtools';
 import { pkg } from '../../../settings';
+import pconsole from '../../../global/js/utils/pconsole';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var componentName = 'Datagrid';
 var TableContainer = DataTable.TableContainer,
     Table = DataTable.Table;
-var Datagrid = /*#__PURE__*/React.forwardRef(function (datagridState, ref) {
+export var Datagrid = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _getTableProps;
 
+  var datagridState = _ref.datagridState,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  if (!datagridState) {
+    pconsole.warn('Datagrid was not passed datagridState which is required to render this component.');
+    return null;
+  }
+
   var _datagridState$getTab = datagridState.getTableProps,
       getTableProps = _datagridState$getTab === void 0 ? function () {} : _datagridState$getTab,
       withVirtualScroll = datagridState.withVirtualScroll,
@@ -37,9 +46,7 @@ var Datagrid = /*#__PURE__*/React.forwardRef(function (datagridState, ref) {
       _datagridState$vertic = datagridState.verticalAlign,
       verticalAlign = _datagridState$vertic === void 0 ? 'center' : _datagridState$vertic,
       variableRowHeight = datagridState.variableRowHeight,
-      className = datagridState.className,
-      rest = _objectWithoutProperties(datagridState, _excluded);
-
+      className = datagridState.className;
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
   var dataGrid = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContainer, {
     className: cx("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '')
@@ -67,4 +74,9 @@ Datagrid = pkg.checkComponentEnabled(Datagrid, componentName); // The display na
 // is used in preference to relying on function.name.
 
 Datagrid.displayName = componentName;
-export default Datagrid;
+Datagrid.propTypes = {
+  /**
+   * The data grid state, much of it being supplied by the useDatagrid hook
+   */
+  datagridState: PropTypes.object.isRequired
+};

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

@@ -1,11 +1,8 @@
-import _extends from "@babel/runtime/helpers/extends";
-
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020, 2021
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * 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.
  */
 import React from 'react';
 import { DataTable } from 'carbon-components-react';
@@ -16,14 +13,9 @@ var DatagridHead = function DatagridHead(datagridState) {
       headerGroups = _datagridState$header === void 0 ? [] : _datagridState$header,
       headRef = datagridState.headRef,
       HeaderRow = datagridState.HeaderRow;
-  return /*#__PURE__*/React.createElement(TableHead, null, headerGroups.map(function (headerGroup, index) {
-    return (
-      /*#__PURE__*/
-      // doesn't support header grouping.
-      React.createElement("div", _extends({}, headerGroup.getHeaderGroupProps(), {
-        ref: headRef,
-        key: "header_".concat(index)
-      }), HeaderRow(datagridState))
+  return /*#__PURE__*/React.createElement(TableHead, null, headerGroups.map(function (headerGroup) {
+    return (// doesn't support header grouping.
+      HeaderRow(datagridState, headRef, headerGroup)
     );
   }));
 };

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

@@ -1,12 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020, 2021
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * 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';
@@ -16,10 +15,11 @@ import { selectionColumnId } from '../common-column-ids';
 import { pkg } from '../../../settings';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 
-var HeaderRow = function HeaderRow(datagridState) {
-  return /*#__PURE__*/React.createElement(TableRow, {
-    className: "".concat(blockClass, "__head")
-  }, datagridState.headers.filter(function (_ref) {
+var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
+  return /*#__PURE__*/React.createElement(TableRow, _extends({}, headerGroup.getHeaderGroupProps(), {
+    className: cx("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
+    ref: headRef
+  }), datagridState.headers.filter(function (_ref) {
     var isVisible = _ref.isVisible;
     return isVisible;
   }).map(function (header) {

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

@@ -1,5 +1,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"];
 
 /*
@@ -13,6 +14,7 @@ var _excluded = ["children"];
 import React from 'react';
 import { DataTable, SkeletonText } from 'carbon-components-react';
 import { selectionColumnId } from '../common-column-ids';
+import cx from 'classnames';
 import { pkg } from '../../../settings';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var TableRow = DataTable.TableRow,
@@ -21,9 +23,17 @@ var TableRow = DataTable.TableRow,
 var DatagridRow = function DatagridRow(datagridState) {
   var row = datagridState.row;
   return /*#__PURE__*/React.createElement(TableRow, _extends({
-    className: "".concat(blockClass, "__carbon-row")
+    className: cx("".concat(blockClass, "__carbon-row"), _defineProperty({}, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded))
   }, row.getRowProps(), {
-    key: row.id
+    key: row.id,
+    onMouseEnter: function onMouseEnter(event) {
+      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"));
+    },
+    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) {
     var cellProps = cell.getCellProps();
 

package/es/components/Datagrid/Datagrid/index.js

@@ -1,8 +1,7 @@
-/*
- * 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, 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 } from './Datagrid';
+export { Datagrid } from './Datagrid';

package/es/components/Datagrid/index.js

@@ -5,7 +5,7 @@
  * US Government Users Restricted Rights - Use, duplication or disclosure
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
-export { default as Datagrid } from './Datagrid';
+export { Datagrid } from './Datagrid';
 export { default as useDatagrid } from './useDatagrid';
 export { default as useInfiniteScroll } from './useInfiniteScroll';
 export { default as useNestedRows } from './useNestedRows';

package/es/components/Datagrid/useNestedRows.js

@@ -11,7 +11,7 @@ var blockClass = "".concat(pkg.prefix, "--datagrid");
 
 var useNestedRows = function useNestedRows(hooks) {
   useRowExpander(hooks);
-  var marginLeft = 32;
+  var marginLeft = 24;
 
   var getRowProps = function getRowProps(props, _ref) {
     var row = _ref.row;
@@ -25,7 +25,7 @@ var useNestedRows = function useNestedRows(hooks) {
     return [props, {
       style: {
         marginLeft: "".concat(row.depth > 0 ? marginLeft : 0, "px"),
-        paddingLeft: "".concat(row.depth > 1 ? marginLeft * (row.depth - 1) : 0, "px"),
+        paddingLeft: "".concat(row.depth > 1 ? marginLeft * (row.depth - 1) + marginLeft : row.depth === 1 ? marginLeft : 0, "px"),
         maxWidth: "calc(100% - ".concat(marginLeft * row.depth, "px)")
       }
     }];
@@ -40,7 +40,7 @@ var useNestedRows = function useNestedRows(hooks) {
     }) === 0;
     return [props, {
       style: {
-        marginRight: isFirstCell ? "-".concat(marginLeft * cell.row.depth, "px") : ''
+        marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "-".concat(marginLeft * (cell.row.depth + 1), "px") : '')
       }
     }];
   };

package/es/components/Datagrid/useRowExpander.js

@@ -20,7 +20,7 @@ var useRowExpander = function useRowExpander(hooks) {
         var row = _ref.row;
         return row.canExpand && /*#__PURE__*/React.createElement("span", row.getToggleRowExpandedProps(), row.isExpanded ? /*#__PURE__*/React.createElement(ChevronUp16, null) : /*#__PURE__*/React.createElement(ChevronDown16, null));
       },
-      width: 32,
+      width: 48,
       disableResizing: true,
       disableSortBy: true,
       Header: ''

package/es/components/ExportModal/ExportModal.js

@@ -14,7 +14,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 // 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, { useState, useRef, forwardRef } from 'react';
+import React, { useState, useRef, forwardRef, useEffect } from 'react';
 import { Button, ComposedModal, ModalHeader, ModalFooter, ModalBody, TextInput, RadioButton, RadioButtonGroup, FormGroup, Loading, PasswordInput } from 'carbon-components-react';
 import cx from 'classnames';
 import { ErrorFilled16, CheckmarkFilled16 } from '@carbon/icons-react';
@@ -30,8 +30,6 @@ var defaults = {
   validExtensions: Object.freeze([])
 };
 export var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _preformattedExtensio;
-
   var body = _ref.body,
       className = _ref.className,
       error = _ref.error,
@@ -60,7 +58,7 @@ export var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
       validExtensions = _ref$validExtensions === void 0 ? defaults.validExtensions : _ref$validExtensions,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  var _useState = useState(filename),
+  var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 2),
       name = _useState2[0],
       setName = _useState2[1];
@@ -71,11 +69,18 @@ export var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
       setDirtyInput = _useState4[1]; // by default (if it exists) use the first extension in the extension array
 
 
-  var _useState5 = useState(preformattedExtensions === null || preformattedExtensions === void 0 ? void 0 : (_preformattedExtensio = preformattedExtensions[0]) === null || _preformattedExtensio === void 0 ? void 0 : _preformattedExtensio.extension),
+  var _useState5 = useState(''),
       _useState6 = _slicedToArray(_useState5, 2),
       extension = _useState6[0],
       setExtension = _useState6[1];
 
+  useEffect(function () {
+    var _preformattedExtensio;
+
+    setName(filename);
+    setExtension(preformattedExtensions === null || preformattedExtensions === void 0 ? void 0 : (_preformattedExtensio = preformattedExtensions[0]) === null || _preformattedExtensio === void 0 ? void 0 : _preformattedExtensio.extension);
+  }, [filename, preformattedExtensions]);
+
   var onNameChangeHandler = function onNameChangeHandler(evt) {
     setName(evt.target.value);
   };