@carbon/ibm-products 1.14.0 → 1.17.0

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -39,8 +39,12 @@ var _createCellSelectionArea = require("./utils/createCellSelectionArea");
 
 var _checkActiveHeaderCell = require("./utils/checkActiveHeaderCell");
 
+var _checkSelectedHeaderCell = require("./utils/checkSelectedHeaderCell");
+
 var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
 
+var _getSpreadsheetWidth = require("./utils/getSpreadsheetWidth");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -73,7 +77,10 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
       setClickAndHoldActive = _ref.setClickAndHoldActive,
       currentMatcher = _ref.currentMatcher,
       setCurrentMatcher = _ref.setCurrentMatcher,
-      onSelectionAreaChange = _ref.onSelectionAreaChange;
+      onSelectionAreaChange = _ref.onSelectionAreaChange,
+      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea,
+      totalVisibleColumns = _ref.totalVisibleColumns;
+  var contentScrollRef = (0, _react.useRef)();
   var previousState = (0, _hooks.usePreviousValue)({
     selectionAreaData: selectionAreaData,
     clickAndHoldActive: clickAndHoldActive
@@ -131,18 +138,21 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
 
         if (!area.areaCreated && area.point1 && area.point2 && area.matcher) {
           (0, _createCellSelectionArea.createCellSelectionArea)({
+            ref: ref,
             area: area,
             blockClass: blockClass,
+            columns: columns,
             defaultColumn: defaultColumn,
             selectionAreas: selectionAreas,
-            setSelectionAreas: setSelectionAreas
+            setSelectionAreas: setSelectionAreas,
+            setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea
           });
         }
 
         return;
       });
     }
-  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData]);
+  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData, ref, activeCellCoordinates, setActiveCellInsideSelectionArea, columns]);
 
   var populateSelectionAreaCellData = function populateSelectionAreaCellData(_ref2) {
     var rowStart = _ref2.rowStart,
@@ -220,6 +230,9 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
       // meaning that selectionAreas should only have one item by default
 
       if (isHoldingCommandKey) {
+        var activeCellElement = ref.current.querySelector(".".concat(blockClass, "__active-cell--highlight"));
+        activeCellElement.setAttribute('data-selection-id', tempMatcher);
+        setActiveCellInsideSelectionArea(true);
         setActiveCellCoordinates(activeCoordinates);
         setCurrentMatcher(tempMatcher);
         setSelectionAreas(function (prev) {
@@ -250,6 +263,7 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
           setSelectionAreas(selectionAreaClone);
         }
       } else {
+        setActiveCellInsideSelectionArea(false);
         setActiveCellCoordinates(activeCoordinates); // remove all previous cell selections
 
         (0, _removeCellSelections.removeCellSelections)({
@@ -263,7 +277,22 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         setSelectionAreaData([]);
       }
     };
-  }, [currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher, ref, setSelectionAreaData]);
+  }, [currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher, ref, setSelectionAreaData, setActiveCellInsideSelectionArea]);
+
+  var handleBodyScroll = function handleBodyScroll() {
+    var headerRowElement = ref.current.querySelector("\n        .".concat(blockClass, "__header--container .").concat(blockClass, "__tr"));
+    headerRowElement.scrollLeft = contentScrollRef.current.scrollLeft;
+  };
+
+  (0, _react.useEffect)(function () {
+    contentScrollRef.current.addEventListener('scroll', function (event) {
+      return handleBodyScroll(event);
+    });
+    var contentScrollElementRef = contentScrollRef.current;
+    return function () {
+      contentScrollElementRef.removeEventListener('scroll', handleBodyScroll);
+    };
+  });
   var handleBodyCellHover = (0, _react.useCallback)(function (cell, columnIndex) {
     return function () {
       if (clickAndHoldActive) {
@@ -296,7 +325,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
     };
   }, [clickAndHoldActive, currentMatcher, setSelectionAreas]);
   var handleRowHeaderClick = (0, _react.useCallback)(function (index) {
-    return function () {
+    return function (event) {
+      var isHoldingCommandKey = event.metaKey || event.ctrlKey;
       (0, _handleHeaderCellSelection.handleHeaderCellSelection)({
         type: 'row',
         activeCellCoordinates: activeCellCoordinates,
@@ -307,7 +337,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         setSelectionAreas: setSelectionAreas,
         spreadsheetRef: ref,
         index: index,
-        setSelectionAreaData: setSelectionAreaData
+        setSelectionAreaData: setSelectionAreaData,
+        isHoldingCommandKey: isHoldingCommandKey
       });
     };
   }, [columns, ref, setSelectionAreas, setCurrentMatcher, setActiveCellCoordinates, activeCellCoordinates, rows, setSelectionAreaData]); // Builds the empty rows and calls `onDataUpdate` to set the new empty rows
@@ -344,35 +375,41 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
     var row = rows[index];
 
     if (rows && rows.length) {
+      var _cx;
+
       prepareRow(row);
       return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, row.getRowProps({
         style: style
       }), {
         className: (0, _classnames.default)("".concat(blockClass, "__tr")),
         "data-row-index": index,
-        "aria-rowindex": index
+        "aria-rowindex": index + 1
       }), /*#__PURE__*/_react.default.createElement("div", {
-        role: "rowheader"
+        role: "rowheader",
+        className: "".concat(blockClass, "__td-th--cell-container")
       }, /*#__PURE__*/_react.default.createElement("button", {
+        id: "".concat(blockClass, "__cell--").concat(index, "--header"),
         tabIndex: -1,
         "data-row-index": index,
         "data-column-index": "header",
         type: "button",
         onClick: handleRowHeaderClick(index),
-        className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row'))),
+        className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row')), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__td-th--selected-header"), (0, _checkSelectedHeaderCell.checkSelectedHeaderCell)(index, selectionAreas, 'row')), _cx)),
         style: {
-          width: (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth) - 4
+          width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
         }
       }, index + 1)), row.cells.map(function (cell, index) {
         return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
           key: "cell_".concat(index),
-          "aria-colindex": index
+          "aria-colindex": index + 1
         }, cell.getCellProps(), {
           role: "gridcell",
           style: _objectSpread(_objectSpread({}, cell.getCellProps().style), {}, {
-            display: 'grid'
+            display: 'grid',
+            minWidth: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width
           })
         }), /*#__PURE__*/_react.default.createElement("button", {
+          id: "".concat(blockClass, "__cell--").concat(cell.row.index, "--").concat(index),
           tabIndex: -1,
           "data-row-index": cell.row.index,
           "data-column-index": index,
@@ -384,7 +421,7 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         }, cell.render('Cell')));
       }));
     }
-  }, [prepareRow, rows, defaultColumn.rowHeaderWidth, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover]);
+  }, [prepareRow, rows, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover, defaultColumn]);
   var spreadsheetBodyRef = (0, _react.useRef)();
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: spreadsheetBodyRef,
@@ -394,7 +431,13 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
     height: 400,
     itemCount: rows.length || defaultEmptyRowCount,
     itemSize: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
-    width: totalColumnsWidth + scrollBarSize
+    width: (0, _getSpreadsheetWidth.getSpreadsheetWidth)({
+      scrollBarSizeValue: scrollBarSize,
+      totalVisibleColumns: totalVisibleColumns,
+      defaultColumn: defaultColumn,
+      totalColumnsWidth: totalColumnsWidth
+    }),
+    outerRef: contentScrollRef
   }, rows !== null && rows !== void 0 && rows.length ? RenderRow : RenderEmptyRows));
 });
 exports.DataSpreadsheetBody = DataSpreadsheetBody;
@@ -496,6 +539,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setActiveCellCoordinates: _propTypes.default.func,
 
+  /**
+   * Setter fn for active cell inside of selection area
+   */
+  setActiveCellInsideSelectionArea: _propTypes.default.func,
+
   /**
    * Setter fn for clickAndHold state value
    */
@@ -524,5 +572,11 @@ DataSpreadsheetBody.propTypes = {
   /**
    * The total columns width
    */
-  totalColumnsWidth: _propTypes.default.number
+  totalColumnsWidth: _propTypes.default.number,
+
+  /**
+   * The total number of columns to be initially visible, additional columns will be rendered and
+   * visible via horizontal scrollbar
+   */
+  totalVisibleColumns: _propTypes.default.number
 };

package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -21,15 +21,19 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _layout = require("@carbon/layout");
-
 var _settings = require("../../settings");
 
+var _hooks = require("../../global/js/hooks");
+
 var _checkActiveHeaderCell = require("./utils/checkActiveHeaderCell");
 
+var _checkSelectedHeaderCell = require("./utils/checkSelectedHeaderCell");
+
 var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
 
-var _hooks = require("../../global/js/hooks");
+var _selectAllCells = require("./utils/selectAllCells");
+
+var _getSpreadsheetWidth = require("./utils/getSpreadsheetWidth");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -52,7 +56,9 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
       setCurrentMatcher = _ref.setCurrentMatcher,
       setSelectionAreas = _ref.setSelectionAreas,
       setSelectionAreaData = _ref.setSelectionAreaData,
-      rows = _ref.rows;
+      rows = _ref.rows,
+      totalVisibleColumns = _ref.totalVisibleColumns,
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
 
   var _useState = (0, _react.useState)(0),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -74,7 +80,8 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
   }, [cellSize, ref, scrollBarSize, previousState === null || previousState === void 0 ? void 0 : previousState.cellSize]);
 
   var handleColumnHeaderClick = function handleColumnHeaderClick(index) {
-    return function () {
+    return function (event) {
+      var isHoldingCommandKey = event.metaKey || event.ctrlKey;
       (0, _handleHeaderCellSelection.handleHeaderCellSelection)({
         type: 'column',
         activeCellCoordinates: activeCellCoordinates,
@@ -85,47 +92,75 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
         setSelectionAreas: setSelectionAreas,
         spreadsheetRef: ref,
         index: index,
-        setSelectionAreaData: setSelectionAreaData
+        setSelectionAreaData: setSelectionAreaData,
+        isHoldingCommandKey: isHoldingCommandKey
       });
     };
   };
 
+  var handleSelectAllClick = function handleSelectAllClick() {
+    (0, _selectAllCells.selectAllCells)({
+      ref: ref,
+      setCurrentMatcher: setCurrentMatcher,
+      setSelectionAreas: setSelectionAreas,
+      rows: rows,
+      columns: columns,
+      activeCellCoordinates: activeCellCoordinates,
+      updateActiveCellCoordinates: updateActiveCellCoordinates
+    });
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(blockClass, "__header--container"))
+    className: (0, _classnames.default)("".concat(blockClass, "__header--container")),
+    role: "rowgroup"
   }, headerGroups.map(function (headerGroup, index) {
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
       key: "header_".concat(index)
     }, headerGroup.getHeaderGroupProps(), {
       style: _objectSpread(_objectSpread({}, headerGroup.getHeaderGroupProps().style), {}, {
-        width: (0, _layout.px)(parseInt(headerGroup.getHeaderGroupProps().style.width) + scrollBarSizeValue)
+        width: (0, _getSpreadsheetWidth.getSpreadsheetWidth)({
+          type: 'header',
+          headerGroup: headerGroup,
+          scrollBarSizeValue: scrollBarSizeValue,
+          totalVisibleColumns: totalVisibleColumns,
+          defaultColumn: defaultColumn
+        }),
+        overflow: 'hidden'
       }),
       className: "".concat(blockClass, "__tr")
     }), /*#__PURE__*/_react.default.createElement("div", {
       role: "columnheader",
+      className: "".concat(blockClass, "__select-all-cell-container"),
       style: {
-        width: (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth) - 4,
+        width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth,
         height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
       }
     }, /*#__PURE__*/_react.default.createElement("button", {
+      id: "".concat(blockClass, "__cell--header--header"),
       "data-row-index": "header",
       "data-column-index": "header",
       type: "button",
       tabIndex: -1,
+      onClick: handleSelectAllClick,
       className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__th--select-all"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header'))
     }, "\xA0")), headerGroup.headers.map(function (column, index) {
+      var _cx2;
+
       return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
         key: "column_".concat(index),
         role: "columnheader",
         className: "".concat(blockClass, "__columnheader")
       }, column.getHeaderProps()), /*#__PURE__*/_react.default.createElement("button", {
+        id: "".concat(blockClass, "__cell--header--").concat(index),
         "data-row-index": "header",
         "data-column-index": index,
         tabIndex: -1,
         onClick: handleColumnHeaderClick(index),
         style: {
-          height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
+          height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
+          width: (column === null || column === void 0 ? void 0 : column.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width)
         },
-        className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'column'))),
+        className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'column')), (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__th--selected-header"), (0, _checkSelectedHeaderCell.checkSelectedHeaderCell)(index, selectionAreas, 'column')), _cx2)),
         type: "button"
       }, column.render('Header')));
     }));
@@ -198,5 +233,16 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Setter fn for selectionAreas value
    */
-  setSelectionAreas: _propTypes.default.func
+  setSelectionAreas: _propTypes.default.func,
+
+  /**
+   * The total number of columns to be initially visible, additional columns will be rendered and
+   * visible via horizontal scrollbar
+   */
+  totalVisibleColumns: _propTypes.default.number,
+
+  /**
+   * Function used to update the active cell coordinates
+   */
+  updateActiveCellCoordinates: _propTypes.default.func
 };

package/lib/components/DataSpreadsheet/hooks/index.js

@@ -21,6 +21,12 @@ Object.defineProperty(exports, "useResetSpreadsheetFocus", {
     return _useResetSpreadsheetFocus.useResetSpreadsheetFocus;
   }
 });
+Object.defineProperty(exports, "useSpreadsheetEdit", {
+  enumerable: true,
+  get: function get() {
+    return _useSpreadsheetEdit.useSpreadsheetEdit;
+  }
+});
 Object.defineProperty(exports, "useSpreadsheetOutsideClick", {
   enumerable: true,
   get: function get() {
@@ -34,4 +40,6 @@ var _useMultipleKeyTracking = require("./useMultipleKeyTracking");
 
 var _useResetSpreadsheetFocus = require("./useResetSpreadsheetFocus");
 
-var _useSpreadsheetOutsideClick = require("./useSpreadsheetOutsideClick");
+var _useSpreadsheetOutsideClick = require("./useSpreadsheetOutsideClick");
+
+var _useSpreadsheetEdit = require("./useSpreadsheetEdit");

package/lib/components/DataSpreadsheet/hooks/useMultipleKeyTracking.js

@@ -15,6 +15,8 @@ var _react = require("react");
 
 var _hooks = require("../../../global/js/hooks");
 
+var _handleMultipleKeys = require("../utils/handleMultipleKeys");
+
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -30,15 +32,20 @@ var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
       containerHasFocus = _ref.containerHasFocus,
       isEditing = _ref.isEditing;
 
-  var _useState = (0, _react.useState)(hasFocus),
+  var _useState = (0, _react.useState)(''),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      windowFocused = _useState2[0],
-      setWindowFocused = _useState2[1];
+      usingMac = _useState2[0],
+      setUsingMac = _useState2[1];
 
-  var _useState3 = (0, _react.useState)([]),
+  var _useState3 = (0, _react.useState)(hasFocus),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      keysPressedList = _useState4[0],
-      setKeysPressedList = _useState4[1];
+      windowFocused = _useState4[0],
+      setWindowFocused = _useState4[1];
+
+  var _useState5 = (0, _react.useState)([]),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      keysPressedList = _useState6[0],
+      setKeysPressedList = _useState6[1];
 
   var previousState = (0, _hooks.usePreviousValue)({
     isEditing: isEditing,
@@ -47,6 +54,14 @@ var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
   // we need to clear out the keysPressedList
 
   (0, _react.useEffect)(function () {
+    var userAgentString = window.navigator.userAgent;
+
+    if (userAgentString.includes('Macintosh')) {
+      setUsingMac(true);
+    } else {
+      setUsingMac(false);
+    }
+
     setWindowFocused(hasFocus());
 
     var onWindowFocus = function onWindowFocus() {
@@ -72,6 +87,18 @@ var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
           // Prevent multiple keys of the same type being added to our keysPressedList array
           if (keysPressedList.includes(event.code)) {
             return;
+          } // Because keyup events are lost when using the Command key
+          // we need to remove the previously pressed keys so that we
+          // do not have keys in the pressed list that should not be
+
+
+          if ((0, _handleMultipleKeys.includesResourceKey)(keysPressedList, usingMac) && keysPressedList.length > 1) {
+            var clonedKeys = (0, _toConsumableArray2.default)(keysPressedList);
+            var filteredClonedKeys = clonedKeys.filter(function (item) {
+              return item === 'MetaLeft' || item === 'MetaRight';
+            });
+            filteredClonedKeys.push(event.code);
+            return setKeysPressedList((0, _toConsumableArray2.default)(new Set(filteredClonedKeys)));
           }
 
           var tempKeys = (0, _toConsumableArray2.default)(keysPressedList);
@@ -113,10 +140,11 @@ var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
         setKeysPressedList([]);
       }
     }
-  }, [keysPressedList, containerHasFocus, ref, isEditing, previousState === null || previousState === void 0 ? void 0 : previousState.isEditing, windowFocused, previousState === null || previousState === void 0 ? void 0 : previousState.windowFocused]);
+  }, [keysPressedList, containerHasFocus, ref, isEditing, previousState === null || previousState === void 0 ? void 0 : previousState.isEditing, windowFocused, previousState === null || previousState === void 0 ? void 0 : previousState.windowFocused, usingMac]);
   return {
     keysPressedList: keysPressedList,
-    windowFocused: windowFocused
+    windowFocused: windowFocused,
+    usingMac: usingMac
   };
 };
 

package/lib/components/DataSpreadsheet/hooks/useSpreadsheetEdit.js

@@ -0,0 +1,129 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useSpreadsheetEdit = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = require("react");
+
+var _layout = require("@carbon/layout");
+
+var _settings = require("../../../settings");
+
+var _hooks = require("../../../global/js/hooks");
+
+// /**
+//  * 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 useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
+  var isEditing = _ref.isEditing,
+      rows = _ref.rows,
+      activeCellCoordinates = _ref.activeCellCoordinates,
+      activeCellRef = _ref.activeCellRef,
+      cellEditorRef = _ref.cellEditorRef,
+      cellEditorRulerRef = _ref.cellEditorRulerRef,
+      columns = _ref.columns,
+      defaultColumn = _ref.defaultColumn,
+      cellEditorValue = _ref.cellEditorValue,
+      _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(_settings.pkg.prefix, "--data-spreadsheet") : _ref$blockClass;
+
+  var _useState = (0, _react.useState)(null),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      nextIndex = _useState2[0],
+      setNextIndex = _useState2[1];
+
+  var previousState = (0, _hooks.usePreviousValue)({
+    nextIndex: nextIndex
+  });
+  (0, _react.useEffect)(function () {
+    if (!(previousState !== null && previousState !== void 0 && previousState.nextIndex)) {
+      setNextIndex(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column);
+    }
+  }, [previousState === null || previousState === void 0 ? void 0 : previousState.nextIndex, activeCellCoordinates]);
+  (0, _react.useEffect)(function () {
+    var rulerWidth = cellEditorRulerRef.current.offsetWidth;
+    var cellEditorCurrentWidth = parseInt(cellEditorRef.current.style.width);
+
+    if (isEditing) {
+      var _rows$activeCellCoord, _cellProps$column, _cellEditorRef$curren;
+
+      var cellProps = (_rows$activeCellCoord = rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row]) === null || _rows$activeCellCoord === void 0 ? void 0 : _rows$activeCellCoord.cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column];
+      var activeCellLeftPosition = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.left;
+      var activeCellTopPosition = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.top;
+      cellEditorRef.current.style.left = activeCellLeftPosition;
+      cellEditorRef.current.style.top = activeCellTopPosition;
+      cellEditorRef.current.style.display = 'block';
+      cellEditorRef.current.style.height = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height;
+      cellEditorRef.current.style.paddingTop = "".concat((parseInt(activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height) - 16) / 2 - 1, "px"); // calculate paddingTop based on cellHeight which could be variable depending on the cellSize prop
+
+      cellEditorRef.current.style.textAlign = (cellProps === null || cellProps === void 0 ? void 0 : (_cellProps$column = cellProps.column) === null || _cellProps$column === void 0 ? void 0 : _cellProps$column.placement) === 'right' ? 'right' : 'left';
+      (_cellEditorRef$curren = cellEditorRef.current) === null || _cellEditorRef$curren === void 0 ? void 0 : _cellEditorRef$curren.focus();
+
+      if (rulerWidth < cellEditorCurrentWidth) {
+        var _columns$nextIndex;
+
+        var currentColumnWidth = ((_columns$nextIndex = columns[nextIndex]) === null || _columns$nextIndex === void 0 ? void 0 : _columns$nextIndex.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width); // If the contents of the cell editor is deleted past the point of the next column
+
+        if (rulerWidth < cellEditorCurrentWidth - currentColumnWidth) {
+          cellEditorRef.current.style.width = (0, _layout.px)(parseInt(cellEditorRef.current.style.width) - currentColumnWidth);
+          setNextIndex(function (prev) {
+            if (prev === 0) {
+              return prev;
+            }
+
+            return prev - 1;
+          });
+        } // Decrease cell editor width by increment of current column width
+
+      }
+
+      if (rulerWidth >= cellEditorCurrentWidth) {
+        var _columns;
+
+        setNextIndex(function (prev) {
+          if (prev === columns.length - 1) {
+            return prev;
+          }
+
+          return prev + 1;
+        });
+        var onLastColumnIndex = nextIndex + 1 === columns.length;
+        var nextColumnWidth = onLastColumnIndex ? 0 : ((_columns = columns[nextIndex + 1]) === null || _columns === void 0 ? void 0 : _columns.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width);
+        var startingRowPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row;
+        var totalRows = rows.length;
+        var totalCellEditorMaxHeight = (totalRows - startingRowPosition) * defaultColumn.rowHeight;
+        cellEditorRef.current.style.maxHeight = (0, _layout.px)(totalCellEditorMaxHeight);
+        cellEditorRef.current.style.width = (0, _layout.px)(nextColumnWidth + cellEditorCurrentWidth);
+        cellEditorRef.current.style.height = (0, _layout.px)(cellEditorRef.current.scrollHeight); // adds dynamic height to cell editor
+        // Cell editor has reached max height, we need to add the scrolling back.
+        // We also need to subtract 1 to account for the fact that the cell editor
+        // is placed one pixel below the cell being edited to account for the border
+
+        if (cellEditorRef.current.clientHeight === totalCellEditorMaxHeight - 1) {
+          cellEditorRef.current.style.overflow = 'auto';
+        } else {
+          cellEditorRef.current.style.overflow = 'hidden';
+        }
+      }
+    }
+
+    if (!isEditing) {
+      cellEditorRef.current.style.overflow = 'hidden';
+      cellEditorRef.current.style.display = 'none';
+      cellEditorRef.current.blur();
+      activeCellRef.current.focus();
+      setNextIndex(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column);
+    }
+  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, columns.length, defaultColumn, activeCellRef, cellEditorRef, cellEditorRulerRef, columns, blockClass, previousState === null || previousState === void 0 ? void 0 : previousState.cellEditorValue, nextIndex]);
+};
+
+exports.useSpreadsheetEdit = useSpreadsheetEdit;

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

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkSelectedHeaderCell = void 0;
+
+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 checkSelectedHeaderCell = function checkSelectedHeaderCell(headerIndex, selectionAreas, headerType) {
+  var areasCloned = (0, _deepCloneObject.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;
+};
+
+exports.checkSelectedHeaderCell = checkSelectedHeaderCell;