@carbon/ibm-products 1.14.0 → 1.15.0

package/es/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -17,9 +17,10 @@ import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { px } from '@carbon/layout';
 import { pkg } from '../../settings';
+import { usePreviousValue } from '../../global/js/hooks';
 import { checkActiveHeaderCell } from './utils/checkActiveHeaderCell';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection';
-import { usePreviousValue } from '../../global/js/hooks';
+import { selectAllCells } from './utils/selectAllCells';
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
 export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var activeCellCoordinates = _ref.activeCellCoordinates,
@@ -33,7 +34,8 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
       setCurrentMatcher = _ref.setCurrentMatcher,
       setSelectionAreas = _ref.setSelectionAreas,
       setSelectionAreaData = _ref.setSelectionAreaData,
-      rows = _ref.rows;
+      rows = _ref.rows,
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -55,7 +57,8 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, 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;
       handleHeaderCellSelection({
         type: 'column',
         activeCellCoordinates: activeCellCoordinates,
@@ -66,13 +69,27 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
         setSelectionAreas: setSelectionAreas,
         spreadsheetRef: ref,
         index: index,
-        setSelectionAreaData: setSelectionAreaData
+        setSelectionAreaData: setSelectionAreaData,
+        isHoldingCommandKey: isHoldingCommandKey
       });
     };
   };
 
+  var handleSelectAllClick = function handleSelectAllClick() {
+    selectAllCells({
+      ref: ref,
+      setCurrentMatcher: setCurrentMatcher,
+      setSelectionAreas: setSelectionAreas,
+      rows: rows,
+      columns: columns,
+      activeCellCoordinates: activeCellCoordinates,
+      updateActiveCellCoordinates: updateActiveCellCoordinates
+    });
+  };
+
   return /*#__PURE__*/React.createElement("div", {
-    className: cx("".concat(blockClass, "__header--container"))
+    className: cx("".concat(blockClass, "__header--container")),
+    role: "rowgroup"
   }, headerGroups.map(function (headerGroup, index) {
     return /*#__PURE__*/React.createElement("div", _extends({
       key: "header_".concat(index)
@@ -88,10 +105,12 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
         height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
       }
     }, /*#__PURE__*/React.createElement("button", {
+      id: "".concat(blockClass, "__cell--header--header"),
       "data-row-index": "header",
       "data-column-index": "header",
       type: "button",
       tabIndex: -1,
+      onClick: handleSelectAllClick,
       className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__th--select-all"), _defineProperty({}, "".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) {
       return /*#__PURE__*/React.createElement("div", _extends({
@@ -99,6 +118,7 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
         role: "columnheader",
         className: "".concat(blockClass, "__columnheader")
       }, column.getHeaderProps()), /*#__PURE__*/React.createElement("button", {
+        id: "".concat(blockClass, "__cell--header--").concat(index),
         "data-row-index": "header",
         "data-column-index": index,
         tabIndex: -1,
@@ -178,5 +198,10 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Setter fn for selectionAreas value
    */
-  setSelectionAreas: PropTypes.func
+  setSelectionAreas: PropTypes.func,
+
+  /**
+   * Function used to update the active cell coordinates
+   */
+  updateActiveCellCoordinates: PropTypes.func
 };

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

@@ -7,4 +7,5 @@
 export { useMoveActiveCell } from './useMoveActiveCell';
 export { useMultipleKeyTracking } from './useMultipleKeyTracking';
 export { useResetSpreadsheetFocus } from './useResetSpreadsheetFocus';
-export { useSpreadsheetOutsideClick } from './useSpreadsheetOutsideClick';
+export { useSpreadsheetOutsideClick } from './useSpreadsheetOutsideClick';
+export { useSpreadsheetEdit } from './useSpreadsheetEdit';

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

@@ -9,6 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  */
 import { useEffect, useState } from 'react';
 import { usePreviousValue } from '../../../global/js/hooks';
+import { includesResourceKey } from '../utils/handleMultipleKeys';
 
 var hasFocus = function hasFocus() {
   return typeof document !== 'undefined' && document.hasFocus();
@@ -19,15 +20,20 @@ export var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
       containerHasFocus = _ref.containerHasFocus,
       isEditing = _ref.isEditing;
 
-  var _useState = useState(hasFocus),
+  var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 2),
-      windowFocused = _useState2[0],
-      setWindowFocused = _useState2[1];
+      usingMac = _useState2[0],
+      setUsingMac = _useState2[1];
 
-  var _useState3 = useState([]),
+  var _useState3 = useState(hasFocus),
       _useState4 = _slicedToArray(_useState3, 2),
-      keysPressedList = _useState4[0],
-      setKeysPressedList = _useState4[1];
+      windowFocused = _useState4[0],
+      setWindowFocused = _useState4[1];
+
+  var _useState5 = useState([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      keysPressedList = _useState6[0],
+      setKeysPressedList = _useState6[1];
 
   var previousState = usePreviousValue({
     isEditing: isEditing,
@@ -36,6 +42,14 @@ export var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
   // we need to clear out the keysPressedList
 
   useEffect(function () {
+    var userAgentString = window.navigator.userAgent;
+
+    if (userAgentString.includes('Macintosh')) {
+      setUsingMac(true);
+    } else {
+      setUsingMac(false);
+    }
+
     setWindowFocused(hasFocus());
 
     var onWindowFocus = function onWindowFocus() {
@@ -61,6 +75,19 @@ export 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 (includesResourceKey(keysPressedList, usingMac) && keysPressedList.length > 1) {
+            var clonedKeys = _toConsumableArray(keysPressedList);
+
+            var filteredClonedKeys = clonedKeys.filter(function (item) {
+              return item === 'MetaLeft' || item === 'MetaRight';
+            });
+            filteredClonedKeys.push(event.code);
+            return setKeysPressedList(_toConsumableArray(new Set(filteredClonedKeys)));
           }
 
           var tempKeys = _toConsumableArray(keysPressedList);
@@ -103,9 +130,10 @@ export 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/es/components/DataSpreadsheet/hooks/useSpreadsheetEdit.js

@@ -0,0 +1,68 @@
+// /**
+//  * Copyright IBM Corp. 2022, 2022
+//  *
+//  * This source code is licensed under the Apache-2.0 license found in the
+//  * LICENSE file in the root directory of this source tree.
+//  */
+import { useEffect } from 'react';
+import { px } from '@carbon/layout';
+export 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;
+  useEffect(function () {
+    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.width = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.width;
+      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();
+      var rulerWidth = cellEditorRulerRef.current.offsetWidth;
+      var cellWidth = activeCellRef.current.offsetWidth;
+
+      if (rulerWidth >= cellWidth) {
+        var widthMultiplier = Math.floor(rulerWidth / cellWidth) + 1;
+        var startingColumnPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column;
+        var startingRowPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row;
+        var totalColumns = columns.length;
+        var totalRows = rows.length;
+        var totalMultiplierPossible = totalColumns - startingColumnPosition;
+        var totalCellEditorMaxHeight = (totalRows - startingRowPosition) * defaultColumn.rowHeight;
+        cellEditorRef.current.style.maxHeight = px(totalCellEditorMaxHeight);
+        cellEditorRef.current.style.width = px(cellWidth * (widthMultiplier <= totalMultiplierPossible ? widthMultiplier : totalMultiplierPossible));
+        cellEditorRef.current.style.height = 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();
+    }
+  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, columns.length, defaultColumn, cellEditorValue, activeCellRef, cellEditorRef, cellEditorRulerRef]);
+};

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

@@ -6,22 +6,34 @@
  */
 import { px } from '@carbon/layout';
 import { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
+import { getSelectionAreaPoints } from './getSelectionAreaPoints';
 export var createCellSelectionArea = function createCellSelectionArea(_ref) {
-  var area = _ref.area,
+  var ref = _ref.ref,
+      area = _ref.area,
       blockClass = _ref.blockClass,
       defaultColumn = _ref.defaultColumn,
       selectionAreas = _ref.selectionAreas,
-      setSelectionAreas = _ref.setSelectionAreas;
-  var greatestRow = Math.max(area.point1.row, area.point2.row);
-  var greatestColumn = Math.max(area.point1.column, area.point2.column);
-  var lowestRowIndex = Math.min(area.point1.row, area.point2.row);
-  var lowestColumnIndex = Math.min(area.point1.column, area.point2.column);
+      setSelectionAreas = _ref.setSelectionAreas,
+      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea;
+
+  var _getSelectionAreaPoin = getSelectionAreaPoints(area),
+      lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
+      lowestRowIndex = _getSelectionAreaPoin.lowestRowIndex,
+      greatestColumnIndex = _getSelectionAreaPoin.greatestColumnIndex,
+      greatestRowIndex = _getSelectionAreaPoin.greatestRowIndex;
+
+  if (greatestRowIndex - lowestRowIndex > 0 || greatestColumnIndex - lowestColumnIndex > 0) {
+    setActiveCellInsideSelectionArea(true);
+    var activeCellElement = ref.current.querySelector(".".concat(blockClass, "__active-cell--highlight"));
+    activeCellElement.setAttribute('data-selection-id', area.matcher);
+  }
+
   var point1Element = document.querySelector("[data-row-index=\"".concat(area.point1.row, "\"][data-column-index=\"").concat(area.point1.column, "\"]")) || document.querySelector(".".concat(blockClass, "__body--td")); // if we can't find the point1 element (this can happen in the case where a virtualized row is not present anymore in the DOM), we get the default height/width of the first body cell we find
 
   var selectionAreaCellWidth = point1Element.offsetWidth;
   var selectionAreaCellHeight = point1Element.offsetHeight;
-  var selectionAreaTotalWidth = selectionAreaCellWidth * (greatestColumn - lowestColumnIndex + 1);
-  var selectionAreaTotalHeight = selectionAreaCellHeight * (greatestRow - lowestRowIndex + 1);
+  var selectionAreaTotalWidth = selectionAreaCellWidth * (greatestColumnIndex - lowestColumnIndex + 1);
+  var selectionAreaTotalHeight = selectionAreaCellHeight * (greatestRowIndex - lowestRowIndex + 1);
   var bodyContainer = document.querySelector(".".concat(blockClass, "__list--container")).firstElementChild;
   var placementElement = bodyContainer.querySelector("[data-row-index=\"".concat(lowestRowIndex, "\"][data-column-index=\"").concat(lowestColumnIndex, "\"]"));
   var relativePosition = {

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

@@ -0,0 +1,18 @@
+/**
+ * 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.
+ */
+export var getSelectionAreaPoints = function getSelectionAreaPoints(area) {
+  var greatestRowIndex = Math.max(area.point1.row, area.point2.row);
+  var greatestColumnIndex = Math.max(area.point1.column, area.point2.column);
+  var lowestRowIndex = Math.min(area.point1.row, area.point2.row);
+  var lowestColumnIndex = Math.min(area.point1.column, area.point2.column);
+  return {
+    greatestRowIndex: greatestRowIndex,
+    greatestColumnIndex: greatestColumnIndex,
+    lowestColumnIndex: lowestColumnIndex,
+    lowestRowIndex: lowestRowIndex
+  };
+};

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

@@ -0,0 +1,121 @@
+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 { getSelectionAreaPoints } from './getSelectionAreaPoints';
+export var handleActiveCellInSelectionEnter = function handleActiveCellInSelectionEnter(_ref) {
+  var activeCellInsideSelectionArea = _ref.activeCellInsideSelectionArea,
+      activeCellCoordinates = _ref.activeCellCoordinates,
+      activeCellRef = _ref.activeCellRef,
+      selectionAreas = _ref.selectionAreas,
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
+
+  if (!activeCellInsideSelectionArea) {
+    return;
+  }
+
+  var activeCellSelectionId = activeCellRef.current.getAttribute('data-selection-id');
+  var activeCellIndexInSelectionAreas = selectionAreas.findIndex(function (item) {
+    return item.matcher === activeCellSelectionId;
+  });
+  var selectionAreaToNavigate = selectionAreas[activeCellIndexInSelectionAreas];
+
+  var _getSelectionAreaPoin = getSelectionAreaPoints(selectionAreaToNavigate),
+      lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
+      lowestRowIndex = _getSelectionAreaPoin.lowestRowIndex,
+      greatestColumnIndex = _getSelectionAreaPoin.greatestColumnIndex,
+      greatestRowIndex = _getSelectionAreaPoin.greatestRowIndex; // Move active cell down one row if possible
+
+
+  var coordinatesClone = _objectSpread({}, activeCellCoordinates);
+
+  if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) < greatestRowIndex) {
+    updateActiveCellCoordinates({
+      coords: coordinatesClone,
+      updatedValue: {
+        row: (coordinatesClone === null || coordinatesClone === void 0 ? void 0 : coordinatesClone.row) + 1
+      },
+      optOutOfSelectionAreaUpdate: true
+    });
+  } // Move active cell to next column of selection area if it exists
+  // If not, find the next selection area and update active cell to
+  // be the first cell in that selection
+
+
+  if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === greatestRowIndex) {
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) < greatestColumnIndex) {
+      updateActiveCellCoordinates({
+        coords: coordinatesClone,
+        updatedValue: {
+          column: (coordinatesClone === null || coordinatesClone === void 0 ? void 0 : coordinatesClone.column) + 1,
+          row: lowestRowIndex
+        },
+        optOutOfSelectionAreaUpdate: true
+      });
+    } // Move to next selection area if there is one, or back to
+    // the beginning of the current selection
+
+
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === greatestColumnIndex) {
+      if (selectionAreas.length > 1) {
+        if (selectionAreas[activeCellIndexInSelectionAreas + 1]) {
+          // Update activeCellRef data-selection-id attribute to the matcher of the next selection area
+          activeCellRef.current.setAttribute('data-selection-id', selectionAreas[activeCellIndexInSelectionAreas + 1].matcher);
+          var nextSelectionArea = selectionAreas[activeCellIndexInSelectionAreas + 1];
+
+          var _getSelectionAreaPoin2 = getSelectionAreaPoints(nextSelectionArea),
+              _lowestColumnIndex = _getSelectionAreaPoin2.lowestColumnIndex,
+              _lowestRowIndex = _getSelectionAreaPoin2.lowestRowIndex;
+
+          updateActiveCellCoordinates({
+            coords: coordinatesClone,
+            updatedValue: {
+              column: _lowestColumnIndex,
+              row: _lowestRowIndex
+            },
+            optOutOfSelectionAreaUpdate: true
+          });
+          return;
+        } else {
+          // There are multiple selection areas and the active cell is in the last one
+          // So we need to move the active cell to the first cell in the first selection area
+          activeCellRef.current.setAttribute('data-selection-id', selectionAreas[0].matcher);
+          var firstSelectionArea = selectionAreas[0];
+
+          var _getSelectionAreaPoin3 = getSelectionAreaPoints(firstSelectionArea),
+              _lowestColumnIndex2 = _getSelectionAreaPoin3.lowestColumnIndex,
+              _lowestRowIndex2 = _getSelectionAreaPoin3.lowestRowIndex;
+
+          updateActiveCellCoordinates({
+            coords: coordinatesClone,
+            updatedValue: {
+              column: _lowestColumnIndex2,
+              row: _lowestRowIndex2
+            },
+            optOutOfSelectionAreaUpdate: true
+          });
+        }
+      } // Only one selection area, go back to first cell in the selection
+
+
+      if (selectionAreas.length === 1) {
+        return updateActiveCellCoordinates({
+          coords: coordinatesClone,
+          updatedValue: {
+            column: lowestColumnIndex,
+            row: lowestRowIndex
+          },
+          optOutOfSelectionAreaUpdate: true
+        });
+      }
+    }
+  }
+};

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

@@ -0,0 +1,108 @@
+/**
+ * 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 { getSelectionAreaPoints } from './getSelectionAreaPoints';
+export var handleActiveCellInSelectionTab = function handleActiveCellInSelectionTab(_ref) {
+  var activeCellInsideSelectionArea = _ref.activeCellInsideSelectionArea,
+      activeCellCoordinates = _ref.activeCellCoordinates,
+      activeCellRef = _ref.activeCellRef,
+      selectionAreas = _ref.selectionAreas,
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
+
+  if (!activeCellInsideSelectionArea) {
+    return;
+  }
+
+  var activeCellSelectionId = activeCellRef.current.getAttribute('data-selection-id');
+  var activeCellIndexInSelectionAreas = selectionAreas.findIndex(function (item) {
+    return item.matcher === activeCellSelectionId;
+  });
+  var selectionAreaToNavigate = selectionAreas[activeCellIndexInSelectionAreas];
+
+  var _getSelectionAreaPoin = getSelectionAreaPoints(selectionAreaToNavigate),
+      lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
+      lowestRowIndex = _getSelectionAreaPoin.lowestRowIndex,
+      greatestColumnIndex = _getSelectionAreaPoin.greatestColumnIndex,
+      greatestRowIndex = _getSelectionAreaPoin.greatestRowIndex; // Move active cell to next column in selection area
+
+
+  if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) < greatestColumnIndex) {
+    updateActiveCellCoordinates({
+      updatedValue: {
+        column: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) + 1
+      },
+      optOutOfSelectionAreaUpdate: true
+    });
+  } // Move active cell to next row of selection area if it exists
+  // If not, find the next selection area and update active cell to
+  // be the first cell in that selection
+
+
+  if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === greatestColumnIndex) {
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) < greatestRowIndex) {
+      updateActiveCellCoordinates({
+        updatedValue: {
+          column: lowestColumnIndex,
+          row: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) + 1
+        },
+        optOutOfSelectionAreaUpdate: true
+      });
+    } // Move to next selection area if there is on, or back to
+    // the beginning of the current selection
+
+
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === greatestRowIndex) {
+      if (selectionAreas.length > 1) {
+        if (selectionAreas[activeCellIndexInSelectionAreas + 1]) {
+          // Update activeCellRef data-selection-id attribute to the matcher of the next selection area
+          activeCellRef.current.setAttribute('data-selection-id', selectionAreas[activeCellIndexInSelectionAreas + 1].matcher);
+          var nextSelectionArea = selectionAreas[activeCellIndexInSelectionAreas + 1];
+
+          var _getSelectionAreaPoin2 = getSelectionAreaPoints(nextSelectionArea),
+              _lowestColumnIndex = _getSelectionAreaPoin2.lowestColumnIndex,
+              _lowestRowIndex = _getSelectionAreaPoin2.lowestRowIndex;
+
+          updateActiveCellCoordinates({
+            updatedValue: {
+              column: _lowestColumnIndex,
+              row: _lowestRowIndex
+            },
+            optOutOfSelectionAreaUpdate: true
+          });
+          return;
+        } else {
+          // There are multiple selection areas and the active cell is in the last one
+          // So we need to move the active cell to the first cell in the first selection area
+          activeCellRef.current.setAttribute('data-selection-id', selectionAreas[0].matcher);
+          var firstSelectionArea = selectionAreas[0];
+
+          var _getSelectionAreaPoin3 = getSelectionAreaPoints(firstSelectionArea),
+              _lowestColumnIndex2 = _getSelectionAreaPoin3.lowestColumnIndex,
+              _lowestRowIndex2 = _getSelectionAreaPoin3.lowestRowIndex;
+
+          updateActiveCellCoordinates({
+            updatedValue: {
+              column: _lowestColumnIndex2,
+              row: _lowestRowIndex2
+            },
+            optOutOfSelectionAreaUpdate: true
+          });
+        }
+      } // Only one selection area, go back to first cell in the selection
+
+
+      if (selectionAreas.length === 1) {
+        return updateActiveCellCoordinates({
+          updatedValue: {
+            column: lowestColumnIndex,
+            row: lowestRowIndex
+          },
+          optOutOfSelectionAreaUpdate: true
+        });
+      }
+    }
+  }
+};

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

@@ -0,0 +1,87 @@
+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'; // Update the data
+
+export var handleEditSubmit = function handleEditSubmit(_ref) {
+  var activeCellCoordinates = _ref.activeCellCoordinates,
+      cellEditorRulerRef = _ref.cellEditorRulerRef,
+      columns = _ref.columns,
+      previousState = _ref.previousState,
+      removeCellEditor = _ref.removeCellEditor,
+      rows = _ref.rows,
+      setActiveCellCoordinates = _ref.setActiveCellCoordinates,
+      setCurrentMatcher = _ref.setCurrentMatcher,
+      setSelectionAreas = _ref.setSelectionAreas,
+      spreadsheetRef = _ref.spreadsheetRef,
+      updateData = _ref.updateData;
+  return function (event) {
+    var key = event.key;
+
+    var updateSelectionAreaOnCellEditSubmit = function updateSelectionAreaOnCellEditSubmit(_ref2) {
+      var type = _ref2.type;
+
+      var submitEditChanges = function submitEditChanges() {
+        var prevCoords = previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates;
+        var cellProps = rows[prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row].cells[prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.column];
+        removeCellEditor();
+        updateData(prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row, cellProps.column.id);
+      };
+
+      removeCellSelections({
+        spreadsheetRef: spreadsheetRef
+      });
+      submitEditChanges();
+      var tempMatcher = uuidv4();
+      var newSelectionArea = {
+        row: type === 'Enter' ? activeCellCoordinates.row === rows.length - 1 ? activeCellCoordinates.row : activeCellCoordinates.row + 1 : activeCellCoordinates.row,
+        column: type === 'Tab' ? activeCellCoordinates.column === columns.length - 1 ? activeCellCoordinates.column : activeCellCoordinates.column + 1 : activeCellCoordinates.column
+      };
+      setSelectionAreas([{
+        point1: newSelectionArea,
+        point2: newSelectionArea,
+        matcher: tempMatcher,
+        areaCreated: false
+      }]);
+      setCurrentMatcher(tempMatcher);
+      cellEditorRulerRef.current.textContent = '';
+    };
+
+    if (key === 'Enter') {
+      updateSelectionAreaOnCellEditSubmit({
+        type: 'Enter'
+      });
+      setActiveCellCoordinates(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          row: prev.row === rows.length - 1 ? prev.row : prev.row + 1 // do not move to next cell below if we're already in the last row
+
+        });
+      });
+    }
+
+    if (key === 'Tab') {
+      event.preventDefault();
+      updateSelectionAreaOnCellEditSubmit({
+        type: 'Tab'
+      });
+      setActiveCellCoordinates(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          column: prev.column === columns.length - 1 ? prev.column : prev.column + 1 // do not move to next cell below if we're already in the last column
+
+        });
+      });
+    }
+
+    return;
+  };
+};