@carbon/ibm-products 1.13.0 → 1.16.0

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

@@ -26,7 +26,6 @@ var useSpreadsheetOutsideClick = function useSpreadsheetOutsideClick(_ref) {
       setSelectionAreas = _ref.setSelectionAreas,
       removeActiveCell = _ref.removeActiveCell,
       setContainerHasFocus = _ref.setContainerHasFocus,
-      activeKeys = _ref.activeKeys,
       removeCellEditor = _ref.removeCellEditor;
   (0, _react.useEffect)(function () {
     var handleOutsideClick = function handleOutsideClick(event) {
@@ -42,14 +41,13 @@ var useSpreadsheetOutsideClick = function useSpreadsheetOutsideClick(_ref) {
       });
       setContainerHasFocus(false);
       removeCellEditor();
-      activeKeys.current = [];
     };
 
     document.addEventListener('click', handleOutsideClick);
     return function () {
       document.removeEventListener('click', handleOutsideClick);
     };
-  }, [spreadsheetRef, removeActiveCell, activeKeys, blockClass, setActiveCellCoordinates, setContainerHasFocus, setSelectionAreas, removeCellEditor]);
+  }, [spreadsheetRef, removeActiveCell, blockClass, setActiveCellCoordinates, setContainerHasFocus, setSelectionAreas, removeCellEditor]);
 };
 
 exports.useSpreadsheetOutsideClick = useSpreadsheetOutsideClick;

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

@@ -9,6 +9,8 @@ var _layout = require("@carbon/layout");
 
 var _deepCloneObject = require("../../../global/js/utils/deepCloneObject");
 
+var _getSelectionAreaPoints = require("./getSelectionAreaPoints");
+
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -16,21 +18,32 @@ var _deepCloneObject = require("../../../global/js/utils/deepCloneObject");
  * LICENSE file in the root directory of this source tree.
  */
 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 = (0, _getSelectionAreaPoints.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/lib/components/DataSpreadsheet/utils/generateData.js

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

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSelectionAreaPoints = void 0;
+
+/**
+ * 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 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
+  };
+};
+
+exports.getSelectionAreaPoints = getSelectionAreaPoints;

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

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSpreadsheetWidth = void 0;
+
+var _layout = require("@carbon/layout");
+
+/**
+ * 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 getSpreadsheetWidth = function getSpreadsheetWidth(_ref) {
+  var type = _ref.type,
+      headerGroup = _ref.headerGroup,
+      scrollBarSizeValue = _ref.scrollBarSizeValue,
+      totalVisibleColumns = _ref.totalVisibleColumns,
+      defaultColumn = _ref.defaultColumn,
+      totalColumnsWidth = _ref.totalColumnsWidth;
+  var additionalWidth = scrollBarSizeValue + defaultColumn.rowHeaderWidth;
+
+  if (!totalVisibleColumns) {
+    if (type === 'header') {
+      return (0, _layout.px)(parseInt(headerGroup.getHeaderGroupProps().style.width) + additionalWidth);
+    }
+
+    if (type !== 'header') {
+      return totalColumnsWidth + additionalWidth;
+    }
+  }
+
+  if (totalVisibleColumns) {
+    return totalVisibleColumns * (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width) + additionalWidth;
+  }
+};
+
+exports.getSpreadsheetWidth = getSpreadsheetWidth;

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

@@ -0,0 +1,127 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleActiveCellInSelectionEnter = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _getSelectionAreaPoints = require("./getSelectionAreaPoints");
+
+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 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 = (0, _getSelectionAreaPoints.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 = (0, _getSelectionAreaPoints.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 = (0, _getSelectionAreaPoints.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
+        });
+      }
+    }
+  }
+};
+
+exports.handleActiveCellInSelectionEnter = handleActiveCellInSelectionEnter;

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

@@ -0,0 +1,118 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleActiveCellInSelectionTab = void 0;
+
+var _getSelectionAreaPoints = require("./getSelectionAreaPoints");
+
+/**
+ * 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 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 = (0, _getSelectionAreaPoints.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 = (0, _getSelectionAreaPoints.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 = (0, _getSelectionAreaPoints.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
+        });
+      }
+    }
+  }
+};
+
+exports.handleActiveCellInSelectionTab = handleActiveCellInSelectionTab;

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

@@ -0,0 +1,94 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleEditSubmit = 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; }
+
+// Update the data
+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);
+      };
+
+      (0, _removeCellSelections.removeCellSelections)({
+        spreadsheetRef: spreadsheetRef
+      });
+      submitEditChanges();
+      var tempMatcher = (0, _uuidv.default)();
+      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;
+  };
+};
+
+exports.handleEditSubmit = handleEditSubmit;

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

@@ -7,10 +7,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleHeaderCellSelection = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _deepCloneObject = require("../../../global/js/utils/deepCloneObject");
+
 var _uuidv = _interopRequireDefault(require("../../../global/js/utils/uuidv4"));
 
 var _removeCellSelections = require("./removeCellSelections");
 
+var _checkActiveHeaderCell = require("./checkActiveHeaderCell");
+
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -28,8 +34,16 @@ var handleHeaderCellSelection = function handleHeaderCellSelection(_ref) {
       spreadsheetRef = _ref.spreadsheetRef,
       index = _ref.index,
       isKeyboard = _ref.isKeyboard,
-      setSelectionAreaData = _ref.setSelectionAreaData;
-  setSelectionAreaData([]);
+      setSelectionAreaData = _ref.setSelectionAreaData,
+      isHoldingCommandKey = _ref.isHoldingCommandKey;
+
+  if (!isHoldingCommandKey) {
+    setSelectionAreaData([]);
+    (0, _removeCellSelections.removeCellSelections)({
+      spreadsheetRef: spreadsheetRef
+    });
+  }
+
   var rowValue = isKeyboard ? activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row : index;
   var columnValue = isKeyboard ? activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column : index;
   var point1 = {
@@ -47,15 +61,37 @@ var handleHeaderCellSelection = function handleHeaderCellSelection(_ref) {
     column: type === 'column' ? columnValue : 0
   });
   setCurrentMatcher(tempMatcher);
-  (0, _removeCellSelections.removeCellSelections)({
-    spreadsheetRef: spreadsheetRef
-  });
-  setSelectionAreas([{
+  var newSelectionArea = {
     point1: point1,
     point2: point2,
     areaCreated: false,
-    matcher: tempMatcher
-  }]);
+    matcher: tempMatcher,
+    header: {
+      type: type,
+      index: index
+    }
+  };
+  setSelectionAreas(function (prev) {
+    var selectionsClone = (0, _deepCloneObject.deepCloneObject)(prev);
+
+    if (isHoldingCommandKey) {
+      var selectionsFromHeaderCell = selectionsClone.filter(function (item) {
+        return item.header.type;
+      });
+      var previouslyCreatedHeaderSelection = selectionsFromHeaderCell.filter(function (item) {
+        return item.header.type === type;
+      });
+      var isHeaderPartOfPreviousSelection = (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, previouslyCreatedHeaderSelection, type); // Prevents row/column header selections from being created multiple times
+
+      if (previouslyCreatedHeaderSelection.length && isHeaderPartOfPreviousSelection) {
+        return prev;
+      }
+
+      return [].concat((0, _toConsumableArray2.default)(prev), [newSelectionArea]);
+    }
+
+    return [newSelectionArea];
+  });
 };
 
 exports.handleHeaderCellSelection = handleHeaderCellSelection;