@carbon/ibm-products 1.14.0 → 1.17.0

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

@@ -1,3 +1,9 @@
+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; }
+
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -5,6 +11,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
+import uuidv4 from '../../../global/js/utils/uuidv4';
+import { selectAllCells } from './selectAllCells';
+export var includesResourceKey = function includesResourceKey(arr, usingMac) {
+  if (usingMac) {
+    return includesMeta(arr);
+  }
+
+  if (!usingMac) {
+    return includesControl(arr);
+  }
+};
 export var includesShift = function includesShift(arr) {
   if (arr.includes('ShiftLeft') || arr.includes('ShiftRight')) {
     return true;
@@ -30,7 +47,7 @@ var includesControl = function includesControl(arr) {
 };
 
 export var handleMultipleKeys = function handleMultipleKeys(_ref) {
-  var _selectionAreasClone$;
+  var _selectionAreasClone$, _selectionAreasClone$2, _selectionAreasClone$3;
 
   var activeCellCoordinates = _ref.activeCellCoordinates,
       event = _ref.event,
@@ -39,15 +56,21 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
       currentMatcher = _ref.currentMatcher,
       rows = _ref.rows,
       setSelectionAreas = _ref.setSelectionAreas,
-      columns = _ref.columns;
+      columns = _ref.columns,
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates,
+      spreadsheetRef = _ref.spreadsheetRef,
+      removeCellSelections = _ref.removeCellSelections,
+      blockClass = _ref.blockClass,
+      setCurrentMatcher = _ref.setCurrentMatcher,
+      usingMac = _ref.usingMac;
   var selectionAreasClone = deepCloneObject(selectionAreas);
   var indexOfCurrentArea = selectionAreasClone.findIndex(function (item) {
     return item.matcher === currentMatcher;
   });
-  var pointToUpdate = (_selectionAreasClone$ = selectionAreasClone[indexOfCurrentArea]) !== null && _selectionAreasClone$ !== void 0 && _selectionAreasClone$.point2 ? selectionAreasClone[indexOfCurrentArea].point2 : selectionAreasClone[indexOfCurrentArea].point1; // Down + Shift
+  var pointToUpdate = (_selectionAreasClone$ = selectionAreasClone[indexOfCurrentArea]) !== null && _selectionAreasClone$ !== void 0 && _selectionAreasClone$.point2 ? (_selectionAreasClone$2 = selectionAreasClone[indexOfCurrentArea]) === null || _selectionAreasClone$2 === void 0 ? void 0 : _selectionAreasClone$2.point2 : (_selectionAreasClone$3 = selectionAreasClone[indexOfCurrentArea]) === null || _selectionAreasClone$3 === void 0 ? void 0 : _selectionAreasClone$3.point1; // Down + Shift
 
   if (includesShift(keysPressedList) && keysPressedList.includes('ArrowDown') && keysPressedList.length === 2) {
-    if (rows.length - 1 === pointToUpdate.row) {
+    if (rows.length - 1 === (pointToUpdate === null || pointToUpdate === void 0 ? void 0 : pointToUpdate.row) || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
       return;
     }
 
@@ -62,7 +85,7 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
 
 
   if (includesShift(keysPressedList) && keysPressedList.includes('ArrowRight') && keysPressedList.length === 2) {
-    if (columns.length - 1 === pointToUpdate.column) {
+    if (columns.length - 1 === (pointToUpdate === null || pointToUpdate === void 0 ? void 0 : pointToUpdate.column) || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
       return;
     }
 
@@ -77,7 +100,7 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
 
 
   if (includesShift(keysPressedList) && keysPressedList.includes('ArrowUp') && keysPressedList.length === 2) {
-    if (pointToUpdate.row === 0) {
+    if ((pointToUpdate === null || pointToUpdate === void 0 ? void 0 : pointToUpdate.row) === 0 || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
       return;
     }
 
@@ -92,7 +115,7 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
 
 
   if (includesShift(keysPressedList) && keysPressedList.includes('ArrowLeft') && keysPressedList.length === 2) {
-    if (pointToUpdate.column === 0) {
+    if ((pointToUpdate === null || pointToUpdate === void 0 ? void 0 : pointToUpdate.column) === 0 || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
       return;
     }
 
@@ -106,7 +129,7 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
   } // CMD + a (select all)
 
 
-  if (includesMeta(keysPressedList) && keysPressedList.includes('KeyA')) {
+  if (includesResourceKey(keysPressedList, usingMac) && keysPressedList.includes('KeyA')) {
     event.preventDefault();
     var selectionPoint1 = {
       row: 0,
@@ -115,7 +138,20 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
     var selectionPoint2 = {
       row: rows.length - 1,
       column: columns.length - 1
-    };
+    }; // If indexOfCurrentArea is -1, it means the active cell is in a cell header position
+
+    if (indexOfCurrentArea === -1) {
+      selectAllCells({
+        ref: spreadsheetRef,
+        setCurrentMatcher: setCurrentMatcher,
+        setSelectionAreas: setSelectionAreas,
+        rows: rows,
+        columns: columns,
+        activeCellCoordinates: activeCellCoordinates,
+        updateActiveCellCoordinates: updateActiveCellCoordinates
+      });
+    }
+
     selectionAreasClone[indexOfCurrentArea].point1 = selectionPoint1;
     selectionAreasClone[indexOfCurrentArea].point2 = selectionPoint2;
     selectionAreasClone[indexOfCurrentArea].areaCreated = false;
@@ -126,12 +162,35 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
   if (includesControl(keysPressedList) && keysPressedList.includes('Space')) {
     var _selectionPoint = {
       row: 0,
-      column: activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column
+      column: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' ? 0 : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column
     };
     var _selectionPoint2 = {
       row: rows.length - 1,
-      column: activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column
-    };
+      column: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' ? 0 : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column
+    }; // If indexOfCurrentArea is -1, it means the active cell is in a cell header position
+
+    if (indexOfCurrentArea === -1) {
+      var tempMatcher = uuidv4();
+      var newSelectionArea = {
+        point1: _selectionPoint,
+        point2: _selectionPoint2,
+        areaCreated: false,
+        matcher: tempMatcher
+      };
+
+      var coordinatesClone = _objectSpread({}, activeCellCoordinates);
+
+      updateActiveCellCoordinates({
+        coords: coordinatesClone,
+        updatedValue: {
+          column: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' ? 0 : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column,
+          row: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' ? 0 : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row
+        }
+      });
+      setCurrentMatcher(tempMatcher);
+      return setSelectionAreas([newSelectionArea]);
+    }
+
     selectionAreasClone[indexOfCurrentArea].point1 = _selectionPoint;
     selectionAreasClone[indexOfCurrentArea].point2 = _selectionPoint2;
     selectionAreasClone[indexOfCurrentArea].areaCreated = false;
@@ -141,16 +200,95 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
 
   if (includesShift(keysPressedList) && keysPressedList.includes('Space')) {
     var _selectionPoint3 = {
-      row: activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row,
+      row: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' ? 0 : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row,
       column: 0
     };
     var _selectionPoint4 = {
-      row: activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row,
+      row: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' ? 0 : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row,
       column: columns.length - 1
-    };
+    }; // If indexOfCurrentArea is -1, it means the active cell is in a cell header position
+
+    if (indexOfCurrentArea === -1) {
+      var _tempMatcher = uuidv4();
+
+      var _newSelectionArea = {
+        point1: _selectionPoint3,
+        point2: _selectionPoint4,
+        areaCreated: false,
+        matcher: _tempMatcher
+      };
+
+      var _coordinatesClone = _objectSpread({}, activeCellCoordinates);
+
+      updateActiveCellCoordinates({
+        coords: _coordinatesClone,
+        updatedValue: {
+          column: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' ? 0 : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column,
+          row: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' ? 0 : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row
+        }
+      });
+      setCurrentMatcher(_tempMatcher);
+      return setSelectionAreas([_newSelectionArea]);
+    }
+
     selectionAreasClone[indexOfCurrentArea].point1 = _selectionPoint3;
     selectionAreasClone[indexOfCurrentArea].point2 = _selectionPoint4;
     selectionAreasClone[indexOfCurrentArea].areaCreated = false;
     setSelectionAreas(selectionAreasClone);
+  } // CMD + HOME (Selects first cell in first row)
+
+
+  if (includesResourceKey(keysPressedList, usingMac) && keysPressedList.includes('Home')) {
+    var scrollElement = spreadsheetRef.current.querySelector(".".concat(blockClass, "__list--container"));
+    scrollElement.scrollTop = 0;
+
+    var _coordinatesClone2 = _objectSpread({}, activeCellCoordinates);
+
+    removeCellSelections({
+      spreadsheetRef: spreadsheetRef
+    });
+    updateActiveCellCoordinates({
+      coords: _coordinatesClone2,
+      updatedValue: {
+        column: 0,
+        row: 0
+      }
+    });
+  } // CMD + END (Selects last cell in last row)
+
+
+  if (includesResourceKey(keysPressedList, usingMac) && keysPressedList.includes('End')) {
+    var _scrollElement = spreadsheetRef.current.querySelector(".".concat(blockClass, "__list--container"));
+
+    _scrollElement.scrollTop = _scrollElement.scrollHeight;
+
+    var _coordinatesClone3 = _objectSpread({}, activeCellCoordinates);
+
+    removeCellSelections({
+      spreadsheetRef: spreadsheetRef
+    });
+    var lastCellExists = !!rows[(rows === null || rows === void 0 ? void 0 : rows.length) - 1].cells[(columns === null || columns === void 0 ? void 0 : columns.length) - 1];
+
+    var updateToLastCell = function updateToLastCell() {
+      updateActiveCellCoordinates({
+        coords: _coordinatesClone3,
+        updatedValue: {
+          column: columns.length - 1,
+          row: rows.length - 1
+        }
+      });
+    }; // With the spreadsheet supporting virtualized data, it's possible that the last cell
+    // has never been rendered yet, if that's the case we scroll to the bottom of the spreadsheet
+    // and add a timeout to wait for the last row to render to the DOM before updating the active cell coordinates.
+    // If we're able to verify that the last row has been rendered, no timeout is used.
+
+
+    if (lastCellExists) {
+      updateToLastCell();
+    } else {
+      setTimeout(function () {
+        updateToLastCell();
+      }, 1);
+    }
   }
 };

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

@@ -0,0 +1,53 @@
+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; }
+
+/**
+ * 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 { removeCellSelections } from './removeCellSelections';
+import uuidv4 from '../../../global/js/utils/uuidv4';
+export var selectAllCells = function selectAllCells(_ref) {
+  var activeCellCoordinates = _ref.activeCellCoordinates,
+      columns = _ref.columns,
+      setCurrentMatcher = _ref.setCurrentMatcher,
+      setSelectionAreas = _ref.setSelectionAreas,
+      ref = _ref.ref,
+      rows = _ref.rows,
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
+  removeCellSelections({
+    spreadsheetRef: ref
+  });
+  var selectionPoint1 = {
+    row: 0,
+    column: 0
+  };
+  var selectionPoint2 = {
+    row: rows.length - 1,
+    column: columns.length - 1
+  };
+  var tempMatcher = uuidv4();
+  var newSelectionArea = {
+    point1: selectionPoint1,
+    point2: selectionPoint2,
+    areaCreated: false,
+    matcher: tempMatcher
+  };
+
+  var coordinatesClone = _objectSpread({}, activeCellCoordinates);
+
+  updateActiveCellCoordinates({
+    coords: coordinatesClone,
+    updatedValue: {
+      column: 0,
+      row: 0
+    }
+  });
+  setCurrentMatcher(tempMatcher);
+  return setSelectionAreas([newSelectionArea]);
+};

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);
   };