@carbon/ibm-products 1.14.0 → 1.17.0

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

@@ -1,18 +1,36 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.includesShift = exports.handleMultipleKeys = void 0;
+exports.includesShift = exports.includesResourceKey = exports.handleMultipleKeys = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _deepCloneObject = require("../../../global/js/utils/deepCloneObject");
 
-/**
- * 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 _uuidv = _interopRequireDefault(require("../../../global/js/utils/uuidv4"));
+
+var _selectAllCells = require("./selectAllCells");
+
+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) { (0, _defineProperty2.default)(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; }
+
+var includesResourceKey = function includesResourceKey(arr, usingMac) {
+  if (usingMac) {
+    return includesMeta(arr);
+  }
+
+  if (!usingMac) {
+    return includesControl(arr);
+  }
+};
+
+exports.includesResourceKey = includesResourceKey;
+
 var includesShift = function includesShift(arr) {
   if (arr.includes('ShiftLeft') || arr.includes('ShiftRight')) {
     return true;
@@ -40,7 +58,7 @@ var includesControl = function includesControl(arr) {
 };
 
 var handleMultipleKeys = function handleMultipleKeys(_ref) {
-  var _selectionAreasClone$;
+  var _selectionAreasClone$, _selectionAreasClone$2, _selectionAreasClone$3;
 
   var activeCellCoordinates = _ref.activeCellCoordinates,
       event = _ref.event,
@@ -49,15 +67,21 @@ 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 = (0, _deepCloneObject.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;
     }
 
@@ -72,7 +96,7 @@ 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;
     }
 
@@ -87,7 +111,7 @@ 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;
     }
 
@@ -102,7 +126,7 @@ 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;
     }
 
@@ -116,7 +140,7 @@ 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,
@@ -125,7 +149,20 @@ 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) {
+      (0, _selectAllCells.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;
@@ -136,12 +173,35 @@ 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 = (0, _uuidv.default)();
+      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;
@@ -151,17 +211,96 @@ 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 = (0, _uuidv.default)();
+
+      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/lib/components/DataSpreadsheet/utils/selectAllCells.js

@@ -0,0 +1,60 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.selectAllCells = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _removeCellSelections = require("./removeCellSelections");
+
+var _uuidv = _interopRequireDefault(require("../../../global/js/utils/uuidv4"));
+
+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) { (0, _defineProperty2.default)(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; }
+
+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;
+  (0, _removeCellSelections.removeCellSelections)({
+    spreadsheetRef: ref
+  });
+  var selectionPoint1 = {
+    row: 0,
+    column: 0
+  };
+  var selectionPoint2 = {
+    row: rows.length - 1,
+    column: columns.length - 1
+  };
+  var tempMatcher = (0, _uuidv.default)();
+  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]);
+};
+
+exports.selectAllCells = selectAllCells;

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.Datagrid = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -15,6 +15,8 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireDefault(require("react"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _carbonComponentsReact = require("carbon-components-react");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -29,15 +31,26 @@ var _devtools = require("../../../global/js/utils/devtools");
 
 var _settings = require("../../../settings");
 
-var _excluded = ["getTableProps", "withVirtualScroll", "DatagridPagination", "isFetching", "tableId", "CustomizeColumnsModal", "leftPanel", "fullHeightDatagrid", "verticalAlign", "variableRowHeight", "className"];
+var _pconsole = _interopRequireDefault(require("../../../global/js/utils/pconsole"));
+
+var _excluded = ["datagridState"];
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var componentName = 'Datagrid';
 var TableContainer = _carbonComponentsReact.DataTable.TableContainer,
     Table = _carbonComponentsReact.DataTable.Table;
 
-var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (datagridState, ref) {
+var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var _getTableProps;
 
+  var datagridState = _ref.datagridState,
+      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+
+  if (!datagridState) {
+    _pconsole.default.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,
@@ -50,8 +63,7 @@ var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (datagridState, r
       _datagridState$vertic = datagridState.verticalAlign,
       verticalAlign = _datagridState$vertic === void 0 ? 'center' : _datagridState$vertic,
       variableRowHeight = datagridState.variableRowHeight,
-      className = datagridState.className,
-      rest = (0, _objectWithoutProperties2.default)(datagridState, _excluded);
+      className = datagridState.className;
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
 
   var dataGrid = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(TableContainer, {
@@ -78,9 +90,14 @@ var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (datagridState, r
 }); // Return a placeholder if not released and not enabled by feature flag
 
 
-Datagrid = _settings.pkg.checkComponentEnabled(Datagrid, componentName); // The display name of the component, used by React. Note that displayName
+exports.Datagrid = Datagrid;
+exports.Datagrid = Datagrid = _settings.pkg.checkComponentEnabled(Datagrid, componentName); // The display name of the component, used by React. Note that displayName
 // is used in preference to relying on function.name.
 
 Datagrid.displayName = componentName;
-var _default = Datagrid;
-exports.default = _default;
+Datagrid.propTypes = {
+  /**
+   * The data grid state, much of it being supplied by the useDatagrid hook
+   */
+  datagridState: _propTypes.default.object.isRequired
+};

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

@@ -7,18 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _react = _interopRequireDefault(require("react"));
 
 var _carbonComponentsReact = require("carbon-components-react");
 
-/*
- * 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.
  */
 var TableHead = _carbonComponentsReact.DataTable.TableHead;
 
@@ -27,14 +24,9 @@ var DatagridHead = function DatagridHead(datagridState) {
       headerGroups = _datagridState$header === void 0 ? [] : _datagridState$header,
       headRef = datagridState.headRef,
       HeaderRow = datagridState.HeaderRow;
-  return /*#__PURE__*/_react.default.createElement(TableHead, null, headerGroups.map(function (headerGroup, index) {
-    return (
-      /*#__PURE__*/
-      // doesn't support header grouping.
-      _react.default.createElement("div", (0, _extends2.default)({}, headerGroup.getHeaderGroupProps(), {
-        ref: headRef,
-        key: "header_".concat(index)
-      }), HeaderRow(datagridState))
+  return /*#__PURE__*/_react.default.createElement(TableHead, null, headerGroups.map(function (headerGroup) {
+    return (// doesn't support header grouping.
+      HeaderRow(datagridState, headRef, headerGroup)
     );
   }));
 };

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

@@ -21,20 +21,20 @@ var _commonColumnIds = require("../common-column-ids");
 
 var _settings = require("../../../settings");
 
-/*
- * 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
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
-var HeaderRow = function HeaderRow(datagridState) {
-  return /*#__PURE__*/_react.default.createElement(TableRow, {
-    className: "".concat(blockClass, "__head")
-  }, datagridState.headers.filter(function (_ref) {
+var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
+  return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({}, headerGroup.getHeaderGroupProps(), {
+    className: (0, _classnames.default)("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
+    ref: headRef
+  }), datagridState.headers.filter(function (_ref) {
     var isVisible = _ref.isVisible;
     return isVisible;
   }).map(function (header) {

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

@@ -11,12 +11,16 @@ 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 _carbonComponentsReact = require("carbon-components-react");
 
 var _commonColumnIds = require("../common-column-ids");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _settings = require("../../../settings");
 
 var _excluded = ["children"];
@@ -27,9 +31,17 @@ var TableRow = _carbonComponentsReact.DataTable.TableRow,
 var DatagridRow = function DatagridRow(datagridState) {
   var row = datagridState.row;
   return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
-    className: "".concat(blockClass, "__carbon-row")
+    className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (0, _defineProperty2.default)({}, "".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();
     var children = cellProps.children,

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

@@ -1,15 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "default", {
+Object.defineProperty(exports, "Datagrid", {
   enumerable: true,
   get: function get() {
-    return _Datagrid.default;
+    return _Datagrid.Datagrid;
   }
 });
 
-var _Datagrid = _interopRequireDefault(require("./Datagrid"));
+var _Datagrid = require("./Datagrid");

package/lib/components/Datagrid/index.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "Datagrid", {
   enumerable: true,
   get: function get() {
-    return _Datagrid.default;
+    return _Datagrid.Datagrid;
   }
 });
 Object.defineProperty(exports, "useActionsColumn", {
@@ -96,7 +96,7 @@ Object.defineProperty(exports, "useStickyColumn", {
   }
 });
 
-var _Datagrid = _interopRequireDefault(require("./Datagrid"));
+var _Datagrid = require("./Datagrid");
 
 var _useDatagrid = _interopRequireDefault(require("./useDatagrid"));
 

package/lib/components/Datagrid/useNestedRows.js

@@ -22,7 +22,7 @@ var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var useNestedRows = function useNestedRows(hooks) {
   (0, _useRowExpander.default)(hooks);
-  var marginLeft = 32;
+  var marginLeft = 24;
 
   var getRowProps = function getRowProps(props, _ref) {
     var row = _ref.row;
@@ -36,7 +36,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)")
       }
     }];
@@ -51,7 +51,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/lib/components/Datagrid/useRowExpander.js

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

package/lib/components/ExportModal/ExportModal.js

@@ -51,8 +51,6 @@ var defaults = {
   validExtensions: Object.freeze([])
 };
 var ExportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var _preformattedExtensio;
-
   var body = _ref.body,
       className = _ref.className,
       error = _ref.error,
@@ -81,7 +79,7 @@ var ExportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       validExtensions = _ref$validExtensions === void 0 ? defaults.validExtensions : _ref$validExtensions,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
 
-  var _useState = (0, _react.useState)(filename),
+  var _useState = (0, _react.useState)(''),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       name = _useState2[0],
       setName = _useState2[1];
@@ -92,11 +90,18 @@ var ExportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       setDirtyInput = _useState4[1]; // by default (if it exists) use the first extension in the extension array
 
 
-  var _useState5 = (0, _react.useState)(preformattedExtensions === null || preformattedExtensions === void 0 ? void 0 : (_preformattedExtensio = preformattedExtensions[0]) === null || _preformattedExtensio === void 0 ? void 0 : _preformattedExtensio.extension),
+  var _useState5 = (0, _react.useState)(''),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       extension = _useState6[0],
       setExtension = _useState6[1];
 
+  (0, _react.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);
   };