@carbon/ibm-products 1.13.0 → 1.16.0

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -11,7 +11,7 @@ exports.DataSpreadsheet = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -23,8 +23,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactTable = require("react-table");
 
-var _layout = require("@carbon/layout");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -45,11 +43,9 @@ var _hooks = require("../../global/js/hooks");
 
 var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 
-var _useResetSpreadsheetFocus = require("./hooks/useResetSpreadsheetFocus");
-
-var _useSpreadsheetOutsideClick = require("./hooks/useSpreadsheetOutsideClick");
+var _deepCloneObject = require("../../global/js/utils/deepCloneObject");
 
-var _useMoveActiveCell = require("./hooks/useMoveActiveCell");
+var _hooks2 = require("./hooks");
 
 var _createActiveCellFn = require("./utils/createActiveCellFn");
 
@@ -61,11 +57,19 @@ var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
 
 var _removeCellSelections = require("./utils/removeCellSelections");
 
-var _excluded = ["cellSize", "className", "columns", "data", "defaultEmptyRowCount", "onDataUpdate", "id", "onActiveCellChange", "onSelectionAreaChange"];
+var _selectAllCells = require("./utils/selectAllCells");
+
+var _handleEditSubmit = require("./utils/handleEditSubmit");
+
+var _handleActiveCellInSelectionEnter = require("./utils/handleActiveCellInSelectionEnter");
+
+var _handleActiveCellInSelectionTab = require("./utils/handleActiveCellInSelectionTab");
+
+var _excluded = ["cellSize", "className", "columns", "data", "defaultEmptyRowCount", "onDataUpdate", "id", "onActiveCellChange", "onSelectionAreaChange", "totalVisibleColumns"];
 
 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; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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; }
 
 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; }
 
@@ -106,7 +110,9 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       onActiveCellChange = _ref$onActiveCellChan === void 0 ? defaults.onActiveCellChange : _ref$onActiveCellChan,
       _ref$onSelectionAreaC = _ref.onSelectionAreaChange,
       onSelectionAreaChange = _ref$onSelectionAreaC === void 0 ? defaults.onSelectionAreaChange : _ref$onSelectionAreaC,
+      totalVisibleColumns = _ref.totalVisibleColumns,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var multiKeyTrackingRef = (0, _react.useRef)();
   var localRef = (0, _react.useRef)();
   var spreadsheetRef = ref || localRef;
   var focusedElement = (0, _hooks.useActiveElement)();
@@ -151,18 +157,23 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       cellEditorValue = _useState16[0],
       setCellEditorValue = _useState16[1];
 
+  var _useState17 = (0, _react.useState)(false),
+      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
+      activeCellInsideSelectionArea = _useState18[0],
+      setActiveCellInsideSelectionArea = _useState18[1];
+
   var previousState = (0, _hooks.usePreviousValue)({
-    activeCellCoordinates: activeCellCoordinates
+    activeCellCoordinates: activeCellCoordinates,
+    isEditing: isEditing
   });
   var cellSizeValue = (0, _getCellSize.getCellSize)(cellSize);
   var cellEditorRef = (0, _react.useRef)();
 
-  var _useState17 = (0, _react.useState)(),
-      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-      activeCellContent = _useState18[0],
-      setActiveCellContent = _useState18[1];
+  var _useState19 = (0, _react.useState)(),
+      _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
+      activeCellContent = _useState20[0],
+      setActiveCellContent = _useState20[1];
 
-  var activeKeys = (0, _react.useRef)([]);
   var activeCellRef = (0, _react.useRef)();
   var cellEditorRulerRef = (0, _react.useRef)();
   var defaultColumn = (0, _react.useMemo)(function () {
@@ -172,6 +183,15 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       rowHeight: cellSizeValue
     };
   }, [cellSizeValue]);
+
+  var _useMultipleKeyTracki = (0, _hooks2.useMultipleKeyTracking)({
+    ref: multiKeyTrackingRef,
+    containerHasFocus: containerHasFocus,
+    isEditing: isEditing
+  }),
+      keysPressedList = _useMultipleKeyTracki.keysPressedList,
+      usingMac = _useMultipleKeyTracki.usingMac;
+
   var scrollBarSize = (0, _react.useMemo)(function () {
     return (0, _getScrollbarWidth.getScrollbarWidth)();
   }, []);
@@ -260,23 +280,21 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       });
     }
   }, [spreadsheetRef, rows, onActiveCellChange, previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates, defaultColumn]);
-  (0, _useResetSpreadsheetFocus.useResetSpreadsheetFocus)({
-    activeKeys: activeKeys,
+  (0, _hooks2.useResetSpreadsheetFocus)({
     focusedElement: focusedElement,
     removeActiveCell: removeActiveCell,
     setContainerHasFocus: setContainerHasFocus
   });
-  (0, _useSpreadsheetOutsideClick.useSpreadsheetOutsideClick)({
+  (0, _hooks2.useSpreadsheetOutsideClick)({
     spreadsheetRef: spreadsheetRef,
     setActiveCellCoordinates: setActiveCellCoordinates,
     setSelectionAreas: setSelectionAreas,
     removeActiveCell: removeActiveCell,
     removeCellSelections: _removeCellSelections.removeCellSelections,
     setContainerHasFocus: setContainerHasFocus,
-    activeKeys: activeKeys,
     removeCellEditor: removeCellEditor
   });
-  (0, _useMoveActiveCell.useMoveActiveCell)({
+  (0, _hooks2.useMoveActiveCell)({
     spreadsheetRef: spreadsheetRef,
     activeCellCoordinates: activeCellCoordinates,
     containerHasFocus: containerHasFocus,
@@ -285,6 +303,8 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
   var handleInitialArrowPress = (0, _react.useCallback)(function () {
     // If activeCellCoordinates is null then we need to set an initial value
     // which will place the activeCell on the select all cell/button
+    setActiveCellInsideSelectionArea(false);
+
     if (!activeCellCoordinates) {
       setActiveCellCoordinates({
         column: 'header',
@@ -295,16 +315,20 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     return;
   }, [activeCellCoordinates]);
   var updateActiveCellCoordinates = (0, _react.useCallback)(function (_ref3) {
-    var coords = _ref3.coords,
-        updatedValue = _ref3.updatedValue;
+    var _ref3$coords = _ref3.coords,
+        coords = _ref3$coords === void 0 ? _objectSpread({}, activeCellCoordinates) : _ref3$coords,
+        updatedValue = _ref3.updatedValue,
+        _ref3$optOutOfSelecti = _ref3.optOutOfSelectionAreaUpdate,
+        optOutOfSelectionAreaUpdate = _ref3$optOutOfSelecti === void 0 ? false : _ref3$optOutOfSelecti;
 
     var newActiveCell = _objectSpread(_objectSpread({}, coords), updatedValue);
 
     setActiveCellCoordinates(newActiveCell); // Only run if the active cell is _not_ a header cell. This will add a point1 object
     // to selectionAreas every time the active cell changes, allowing us to create cell
-    // selections using keyboard
+    // selections using keyboard. Opting out of the selection area updates here means
+    // that the active cell is being moved within a selection area
 
-    if (newActiveCell.row !== 'header' && newActiveCell.column !== 'header') {
+    if (newActiveCell.row !== 'header' && newActiveCell.column !== 'header' && !optOutOfSelectionAreaUpdate) {
       var tempMatcher = (0, _uuidv.default)();
       setSelectionAreas([{
         point1: newActiveCell,
@@ -312,11 +336,29 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       }]);
       setCurrentMatcher(tempMatcher);
     }
-  }, []);
+  }, [activeCellCoordinates]);
+  var handleHomeEndKey = (0, _react.useCallback)(function (_ref4) {
+    var type = _ref4.type;
+
+    var coordinatesClone = _objectSpread({}, activeCellCoordinates);
+
+    updateActiveCellCoordinates({
+      coords: coordinatesClone,
+      updatedValue: {
+        column: type === 'home' ? 0 : columns.length - 1
+      }
+    });
+    (0, _removeCellSelections.removeCellSelections)({
+      spreadsheetRef: spreadsheetRef
+    });
+  }, [activeCellCoordinates, updateActiveCellCoordinates, spreadsheetRef, columns.length]);
   var handleKeyPress = (0, _react.useCallback)(function (event) {
-    var _activeKeys$current, _activeKeys$current2;
+    var key = event.key;
+
+    if (isEditing) {
+      return;
+    } // Command keys need to be returned as there is default browser behavior with these keys
 
-    var key = event.key; // Command keys need to be returned as there is default browser behavior with these keys
 
     if (key === 'Meta' || key === 'Control') {
       return;
@@ -333,43 +375,90 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
 
 
     if (['ArrowLeft', 'ArrowUp', 'ArrowRight', 'ArrowDown'].indexOf(key) > -1) {
-      if (isEditing) {
-        return;
-      }
-
-      if (selectionAreas !== null && selectionAreas !== void 0 && selectionAreas.length && key !== 'Shift' && !activeKeys.current.includes('Shift')) {
+      if (selectionAreas !== null && selectionAreas !== void 0 && selectionAreas.length && keysPressedList.length < 2 && !(0, _handleMultipleKeys.includesShift)(keysPressedList)) {
         setSelectionAreas([]);
         setSelectionAreaData([]);
         (0, _removeCellSelections.removeCellSelections)({
           spreadsheetRef: spreadsheetRef
         });
       }
-    } // Update list of activeKeys
-
-
-    if (!((_activeKeys$current = activeKeys.current) !== null && _activeKeys$current !== void 0 && _activeKeys$current.includes(key))) {
-      var activeClone = (0, _toConsumableArray2.default)(activeKeys.current);
-      activeKeys.current = [].concat((0, _toConsumableArray2.default)(activeClone), [key]);
     }
 
-    if (((_activeKeys$current2 = activeKeys.current) === null || _activeKeys$current2 === void 0 ? void 0 : _activeKeys$current2.length) > 1) {
+    if (!isEditing && (keysPressedList === null || keysPressedList === void 0 ? void 0 : keysPressedList.length) > 1) {
       (0, _handleMultipleKeys.handleMultipleKeys)({
-        activeKeys: activeKeys,
+        activeCellCoordinates: activeCellCoordinates,
+        event: event,
+        keysPressedList: keysPressedList,
         selectionAreas: selectionAreas,
         currentMatcher: currentMatcher,
         rows: rows,
         setSelectionAreas: setSelectionAreas,
-        columns: columns
+        columns: columns,
+        updateActiveCellCoordinates: updateActiveCellCoordinates,
+        spreadsheetRef: spreadsheetRef,
+        removeCellSelections: _removeCellSelections.removeCellSelections,
+        blockClass: blockClass,
+        setCurrentMatcher: setCurrentMatcher,
+        usingMac: usingMac
       });
     } // Allow arrow key navigation if there are less than two activeKeys OR
     // if one of the activeCellCoordinates is in a header position
 
 
-    if (!activeKeys.current.includes('Shift') || activeCellCoordinates.row === 'header' || activeCellCoordinates.column === 'header') {
+    if (keysPressedList.length < 2 && !(0, _handleMultipleKeys.includesShift)(keysPressedList) || activeCellCoordinates.row === 'header' || activeCellCoordinates.column === 'header') {
       switch (key) {
+        // Enter
+        case 'Enter':
+          {
+            (0, _handleActiveCellInSelectionEnter.handleActiveCellInSelectionEnter)({
+              activeCellInsideSelectionArea: activeCellInsideSelectionArea,
+              activeCellCoordinates: activeCellCoordinates,
+              activeCellRef: activeCellRef,
+              selectionAreas: selectionAreas,
+              updateActiveCellCoordinates: updateActiveCellCoordinates
+            });
+            break;
+          }
+        // HOME
+
+        case 'Home':
+          {
+            if ((0, _handleMultipleKeys.includesResourceKey)(keysPressedList, usingMac)) {
+              return;
+            }
+
+            handleHomeEndKey({
+              type: 'home'
+            });
+            break;
+          }
+
+        case 'End':
+          {
+            if ((0, _handleMultipleKeys.includesResourceKey)(keysPressedList, usingMac)) {
+              return;
+            }
+
+            handleHomeEndKey({
+              type: 'end'
+            });
+            break;
+          }
         // Tab
+
         case 'Tab':
           {
+            if (activeCellInsideSelectionArea) {
+              event.preventDefault();
+              return (0, _handleActiveCellInSelectionTab.handleActiveCellInSelectionTab)({
+                activeCellInsideSelectionArea: activeCellInsideSelectionArea,
+                activeCellCoordinates: activeCellCoordinates,
+                activeCellRef: activeCellRef,
+                selectionAreas: selectionAreas,
+                updateActiveCellCoordinates: updateActiveCellCoordinates
+              });
+            }
+
             setSelectionAreas([]);
             removeActiveCell();
             removeCellEditor();
@@ -516,7 +605,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
           }
       }
     }
-  }, [updateActiveCellCoordinates, handleInitialArrowPress, activeCellCoordinates, removeActiveCell, columns, rows, spreadsheetRef, currentMatcher, isEditing, removeCellEditor, selectionAreas]);
+  }, [activeCellInsideSelectionArea, updateActiveCellCoordinates, handleInitialArrowPress, activeCellCoordinates, removeActiveCell, columns, rows, spreadsheetRef, currentMatcher, isEditing, removeCellEditor, selectionAreas, handleHomeEndKey, keysPressedList, usingMac]);
 
   var startEditMode = function startEditMode() {
     setIsEditing(true);
@@ -524,17 +613,51 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     var activeCellValue = activeCellFullData ? Object.values(activeCellFullData.row.values)[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column] : null;
     setCellEditorValue(activeCellValue);
     cellEditorRulerRef.current.textContent = activeCellValue;
-  };
+  }; // Sets the initial placement of the cell editor cursor at the end of the text area
+  // this is not done for us by default in Safari
+
+
+  (0, _react.useEffect)(function () {
+    if (isEditing && !(previousState !== null && previousState !== void 0 && previousState.isEditing)) {
+      cellEditorRef.current.setSelectionRange(cellEditorRulerRef.current.textContent.length, cellEditorRulerRef.current.textContent.length);
+      cellEditorRef.current.focus();
+    }
+  }, [isEditing, previousState === null || previousState === void 0 ? void 0 : previousState.isEditing]);
 
   var handleActiveCellClick = function handleActiveCellClick() {
     if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
       var indexValue = (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' ? activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row;
+
+      if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
+        return;
+      }
+
       handleRowColumnHeaderClick({
         isKeyboard: false,
         index: indexValue
       });
     }
 
+    return;
+  }; // Mouse down on active cell
+
+
+  var handleActiveCellMouseDown = function handleActiveCellMouseDown() {
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) !== 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header') {
+      var tempMatcher = (0, _uuidv.default)();
+      setClickAndHoldActive(true);
+      (0, _removeCellSelections.removeCellSelections)({
+        spreadsheetRef: spreadsheetRef
+      });
+      setSelectionAreas([{
+        point1: activeCellCoordinates,
+        matcher: tempMatcher
+      }]);
+      setCurrentMatcher(tempMatcher);
+      setSelectionAreaData([]);
+      setActiveCellInsideSelectionArea(false);
+    }
+
     return;
   }; // Go into edit mode if 'Enter' key is pressed on activeCellRef
 
@@ -542,7 +665,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
   var handleActiveCellKeyDown = function handleActiveCellKeyDown(event) {
     var key = event.key;
 
-    if (key === 'Enter') {
+    if (key === 'Enter' && !activeCellInsideSelectionArea) {
       if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) !== 'header') {
         startEditMode();
       }
@@ -555,10 +678,10 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     }
   };
 
-  var handleRowColumnHeaderClick = function handleRowColumnHeaderClick(_ref4) {
-    var isKeyboard = _ref4.isKeyboard,
-        _ref4$index = _ref4.index,
-        index = _ref4$index === void 0 ? null : _ref4$index;
+  var handleRowColumnHeaderClick = function handleRowColumnHeaderClick(_ref5) {
+    var isKeyboard = _ref5.isKeyboard,
+        _ref5$index = _ref5.index,
+        index = _ref5$index === void 0 ? null : _ref5$index;
     var handleHeaderCellProps = {
       activeCellCoordinates: activeCellCoordinates,
       rows: rows,
@@ -572,18 +695,30 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       index: index
     }; // Select an entire column
 
-    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header') {
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header') {
       (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
         type: 'column'
       }, handleHeaderCellProps));
     } // Select an entire row
 
 
-    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) !== 'header') {
       (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
         type: 'row'
       }, handleHeaderCellProps));
     }
+
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header') {
+      (0, _selectAllCells.selectAllCells)({
+        ref: spreadsheetRef,
+        setCurrentMatcher: setCurrentMatcher,
+        setSelectionAreas: setSelectionAreas,
+        rows: rows,
+        columns: columns,
+        activeCellCoordinates: activeCellCoordinates,
+        updateActiveCellCoordinates: updateActiveCellCoordinates
+      });
+    }
   }; // Go into edit mode if double click is detected on activeCellRef
 
 
@@ -591,131 +726,55 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     startEditMode();
   };
 
-  var updateSelectionAreaOnCellEditSubmit = function updateSelectionAreaOnCellEditSubmit(_ref5) {
-    var type = _ref5.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 = '';
-  }; // Update the data
-
-
-  var handleEditSubmit = function handleEditSubmit(event) {
-    var key = event.key;
-
-    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
-
-        });
-      });
+  (0, _hooks2.useSpreadsheetEdit)({
+    isEditing: isEditing,
+    rows: rows,
+    activeCellCoordinates: activeCellCoordinates,
+    activeCellRef: activeCellRef,
+    cellEditorRef: cellEditorRef,
+    cellEditorRulerRef: cellEditorRulerRef,
+    columns: columns,
+    defaultColumn: defaultColumn,
+    cellEditorValue: cellEditorValue
+  });
+  var handleActiveCellMouseEnter = (0, _react.useCallback)(function () {
+    handleActiveCellMouseEnterCallback(selectionAreas, clickAndHoldActive);
+  }, [clickAndHoldActive, selectionAreas, handleActiveCellMouseEnterCallback]); // Only update if there are cell selection areas
+  // Find point object that matches currentMatcher and remove the second point
+  // because hovering over the active cell while clicking and holding should
+  // remove the previously existing selection area
+
+  var handleActiveCellMouseEnterCallback = (0, _react.useCallback)(function (areas, clickHold) {
+    if (!currentMatcher) {
+      return;
     }
 
-    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
-
+    if (areas && areas.length && clickHold && currentMatcher) {
+      setSelectionAreas(function (prev) {
+        var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
+        var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
+          return item.matcher === currentMatcher;
         });
-      });
-    }
 
-    return;
-  };
-
-  (0, _react.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 = (0, _layout.px)(totalCellEditorMaxHeight);
-        cellEditorRef.current.style.width = (0, _layout.px)(cellWidth * (widthMultiplier <= totalMultiplierPossible ? widthMultiplier : totalMultiplierPossible));
-        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 (indexOfItemToUpdate === -1) {
+          return prev;
         }
-      }
-    }
-
-    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]);
-
-  var handleKeyUp = function handleKeyUp(event) {
-    var _activeKeys$current3;
 
-    var key = event.key; // Remove key from active keys array on key up
+        if ((0, _typeof2.default)(selectionAreaClone[indexOfItemToUpdate].point2) === 'object' && selectionAreaClone[indexOfItemToUpdate].areaCreated) {
+          selectionAreaClone[indexOfItemToUpdate].point2 = selectionAreaClone[indexOfItemToUpdate].point1;
+          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
+          setActiveCellInsideSelectionArea(false);
+          (0, _removeCellSelections.removeCellSelections)({
+            matcher: currentMatcher,
+            spreadsheetRef: spreadsheetRef
+          });
+          return selectionAreaClone;
+        }
 
-    if ((_activeKeys$current3 = activeKeys.current) !== null && _activeKeys$current3 !== void 0 && _activeKeys$current3.includes(key)) {
-      var activeKeysClone = (0, _toConsumableArray2.default)(activeKeys.current);
-      var filteredKeysClone = activeKeysClone.filter(function (item) {
-        return item !== key;
+        return prev;
       });
-      activeKeys.current = filteredKeysClone;
     }
-  };
-
+  }, [spreadsheetRef, currentMatcher]);
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, getTableProps(), (0, _devtools.getDevtoolsProps)(componentName), {
     className: (0, _classnames.default)(blockClass, className, "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__container-has-focus"), containerHasFocus)),
     ref: spreadsheetRef,
@@ -724,11 +783,12 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     "aria-rowcount": (rows === null || rows === void 0 ? void 0 : rows.length) || 0,
     "aria-colcount": (columns === null || columns === void 0 ? void 0 : columns.length) || 0,
     onKeyDown: handleKeyPress,
-    onKeyUp: handleKeyUp,
     onFocus: function onFocus() {
       return setContainerHasFocus(true);
     }
-  }), /*#__PURE__*/_react.default.createElement(_DataSpreadsheetHeader.DataSpreadsheetHeader, {
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    ref: multiKeyTrackingRef
+  }, /*#__PURE__*/_react.default.createElement(_DataSpreadsheetHeader.DataSpreadsheetHeader, {
     ref: spreadsheetRef,
     activeCellCoordinates: activeCellCoordinates,
     cellSize: cellSize,
@@ -741,7 +801,9 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     setActiveCellCoordinates: setActiveCellCoordinates,
     setSelectionAreas: setSelectionAreas,
     setCurrentMatcher: setCurrentMatcher,
-    setSelectionAreaData: setSelectionAreaData
+    setSelectionAreaData: setSelectionAreaData,
+    totalVisibleColumns: totalVisibleColumns,
+    updateActiveCellCoordinates: updateActiveCellCoordinates
   }), /*#__PURE__*/_react.default.createElement(_DataSpreadsheetBody.DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
     ref: spreadsheetRef,
@@ -768,30 +830,46 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     totalColumnsWidth: totalColumnsWidth,
     id: id,
     columns: columns,
-    defaultEmptyRowCount: defaultEmptyRowCount
+    defaultEmptyRowCount: defaultEmptyRowCount,
+    setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea,
+    totalVisibleColumns: totalVisibleColumns
   }), /*#__PURE__*/_react.default.createElement("button", {
+    onMouseDown: handleActiveCellMouseDown,
     onClick: handleActiveCellClick,
     onKeyDown: handleActiveCellKeyDown,
     onDoubleClick: handleActiveCellDoubleClick,
+    onMouseEnter: handleActiveCellMouseEnter,
     ref: activeCellRef,
-    className: (0, _classnames.default)("".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__active-cell--highlight")),
+    className: (0, _classnames.default)("".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__active-cell--highlight"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__active-cell--with-selection"), activeCellInsideSelectionArea)),
     type: "button"
   }, activeCellContent), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextArea, {
     value: cellEditorValue,
-    onKeyDown: handleEditSubmit,
+    onKeyDown: (0, _handleEditSubmit.handleEditSubmit)({
+      activeCellCoordinates: activeCellCoordinates,
+      cellEditorRulerRef: cellEditorRulerRef,
+      columns: columns,
+      previousState: previousState,
+      removeCellEditor: removeCellEditor,
+      rows: rows,
+      setActiveCellCoordinates: setActiveCellCoordinates,
+      setCurrentMatcher: setCurrentMatcher,
+      setSelectionAreas: setSelectionAreas,
+      spreadsheetRef: spreadsheetRef,
+      updateData: updateData
+    }),
     onChange: function onChange(event) {
       setCellEditorValue(event.target.value);
       cellEditorRulerRef.current.textContent = event.target.value;
     },
     ref: cellEditorRef,
     labelText: "",
-    "aria-labelledby": activeCellCoordinates ? "[data-row-index=\"".concat(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, "\"][data-column-index=\"").concat(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column, "\"]") : null,
+    "aria-labelledby": activeCellCoordinates ? "#".concat(blockClass, "__cell--").concat(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, "--").concat(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) : null,
     className: (0, _classnames.default)("".concat(blockClass, "__cell-editor"), "".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__cell-editor--").concat(cellSize), (0, _defineProperty2.default)({}, "".concat(blockClass, "__cell-editor--active"), isEditing))
   }), /*#__PURE__*/_react.default.createElement("pre", {
     "aria-hidden": true,
     ref: cellEditorRulerRef,
     className: "".concat(blockClass, "__cell-editor-ruler")
-  }));
+  })));
 }); // Return a placeholder if not released and not enabled by feature flag
 
 
@@ -852,7 +930,13 @@ DataSpreadsheet.propTypes = {
   /**
    * The event handler that is called when the selection area values change
    */
-  onSelectionAreaChange: _propTypes.default.func
+  onSelectionAreaChange: _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
   /* TODO: add types and DocGen for all props. */
 
 };