@carbon/ibm-products 1.11.2 → 1.14.0

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof3 = require("@babel/runtime/helpers/typeof");
+var _typeof = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -11,10 +11,6 @@ exports.DataSpreadsheet = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -25,6 +21,8 @@ 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"));
@@ -43,15 +41,9 @@ var _getScrollbarWidth = require("../../global/js/utils/getScrollbarWidth");
 
 var _hooks = require("../../global/js/hooks");
 
-var _deepCloneObject = require("../../global/js/utils/deepCloneObject");
-
 var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 
-var _useResetSpreadsheetFocus = require("./hooks/useResetSpreadsheetFocus");
-
-var _useSpreadsheetOutsideClick = require("./hooks/useSpreadsheetOutsideClick");
-
-var _useMoveActiveCell = require("./hooks/useMoveActiveCell");
+var _hooks2 = require("./hooks");
 
 var _createActiveCellFn = require("./utils/createActiveCellFn");
 
@@ -61,11 +53,13 @@ var _handleMultipleKeys = require("./utils/handleMultipleKeys");
 
 var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
 
-var _excluded = ["cellSize", "className", "columns", "data", "onDataUpdate", "id", "onActiveCellChange"];
+var _removeCellSelections = require("./utils/removeCellSelections");
+
+var _excluded = ["cellSize", "className", "columns", "data", "defaultEmptyRowCount", "onDataUpdate", "id", "onActiveCellChange", "onSelectionAreaChange"];
 
 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 || _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 _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 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; }
 
@@ -80,7 +74,10 @@ var defaults = {
   cellSize: 'standard',
   columns: Object.freeze([]),
   data: Object.freeze([]),
-  onDataUpdate: Object.freeze(function () {})
+  defaultEmptyRowCount: 16,
+  onDataUpdate: Object.freeze(function () {}),
+  onActiveCellChange: Object.freeze(function () {}),
+  onSelectionAreaChange: Object.freeze(function () {})
 };
 /**
  * DataSpreadsheet: used to organize and display large amounts of structured data, separated by columns and rows in a grid-like format.
@@ -94,11 +91,17 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       columns = _ref$columns === void 0 ? defaults.columns : _ref$columns,
       _ref$data = _ref.data,
       data = _ref$data === void 0 ? defaults.data : _ref$data,
+      _ref$defaultEmptyRowC = _ref.defaultEmptyRowCount,
+      defaultEmptyRowCount = _ref$defaultEmptyRowC === void 0 ? defaults.defaultEmptyRowCount : _ref$defaultEmptyRowC,
       _ref$onDataUpdate = _ref.onDataUpdate,
       onDataUpdate = _ref$onDataUpdate === void 0 ? defaults.onDataUpdate : _ref$onDataUpdate,
       id = _ref.id,
-      onActiveCellChange = _ref.onActiveCellChange,
+      _ref$onActiveCellChan = _ref.onActiveCellChange,
+      onActiveCellChange = _ref$onActiveCellChan === void 0 ? defaults.onActiveCellChange : _ref$onActiveCellChan,
+      _ref$onSelectionAreaC = _ref.onSelectionAreaChange,
+      onSelectionAreaChange = _ref$onSelectionAreaC === void 0 ? defaults.onSelectionAreaChange : _ref$onSelectionAreaC,
       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)();
@@ -118,34 +121,45 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       selectionAreas = _useState6[0],
       setSelectionAreas = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(false),
+  var _useState7 = (0, _react.useState)([]),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      clickAndHoldActive = _useState8[0],
-      setClickAndHoldActive = _useState8[1];
+      selectionAreaData = _useState8[0],
+      setSelectionAreaData = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(''),
+  var _useState9 = (0, _react.useState)(false),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      currentMatcher = _useState10[0],
-      setCurrentMatcher = _useState10[1];
+      clickAndHoldActive = _useState10[0],
+      setClickAndHoldActive = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(false),
+  var _useState11 = (0, _react.useState)(''),
       _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      isEditing = _useState12[0],
-      setIsEditing = _useState12[1];
+      currentMatcher = _useState12[0],
+      setCurrentMatcher = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(''),
+  var _useState13 = (0, _react.useState)(false),
       _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-      cellEditorValue = _useState14[0],
-      setCellEditorValue = _useState14[1];
+      isEditing = _useState14[0],
+      setIsEditing = _useState14[1];
+
+  var _useState15 = (0, _react.useState)(''),
+      _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+      cellEditorValue = _useState16[0],
+      setCellEditorValue = _useState16[1];
 
   var previousState = (0, _hooks.usePreviousValue)({
-    activeCellCoordinates: activeCellCoordinates
+    activeCellCoordinates: activeCellCoordinates,
+    isEditing: isEditing
   });
   var cellSizeValue = (0, _getCellSize.getCellSize)(cellSize);
   var cellEditorRef = (0, _react.useRef)();
-  var currentMatcherRef = (0, _react.useRef)();
-  var activeKeys = (0, _react.useRef)([]);
+
+  var _useState17 = (0, _react.useState)(),
+      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
+      activeCellContent = _useState18[0],
+      setActiveCellContent = _useState18[1];
+
   var activeCellRef = (0, _react.useRef)();
+  var cellEditorRulerRef = (0, _react.useRef)();
   var defaultColumn = (0, _react.useMemo)(function () {
     return {
       width: 150,
@@ -153,6 +167,14 @@ 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;
+
   var scrollBarSize = (0, _react.useMemo)(function () {
     return (0, _getScrollbarWidth.getScrollbarWidth)();
   }, []);
@@ -193,22 +215,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     setCellEditorValue('');
     setIsEditing(false);
     cellEditorRef.current.style.display = 'none';
-  }, []); // Removes the cell selection elements
-
-  var removeCellSelections = (0, _react.useCallback)(function (matcher) {
-    if (matcher && typeof matcher === 'string') {
-      var selectionToRemove = spreadsheetRef.current.querySelector("[data-matcher-id=\"".concat(matcher, "\"]"));
-
-      if (selectionToRemove) {
-        selectionToRemove.remove();
-      }
-    } else {
-      var cellSelections = spreadsheetRef.current.querySelectorAll(".".concat(blockClass, "__selection-area--element"));
-      (0, _toConsumableArray2.default)(cellSelections).forEach(function (element) {
-        return element.remove();
-      });
-    }
-  }, [spreadsheetRef]); // Remove cell editor if the active cell coordinates change and save with new cell data, this will
+  }, []); // Remove cell editor if the active cell coordinates change and save with new cell data, this will
   // happen if you click on another cell while isEditing is true
 
   (0, _react.useEffect)(function () {
@@ -218,11 +225,20 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       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);
+      cellEditorRulerRef.current.textContent = '';
+    }
+
+    if ((prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row) !== (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) || (prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.column) !== (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column)) {
+      if (activeCellCoordinates && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) !== 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header') {
+        var activeCellFullData = typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'number' && typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'number' ? rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row].cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column] : null;
+        setActiveCellContent(activeCellFullData.render('Cell'));
+      }
+
+      if (activeCellCoordinates && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
+        setActiveCellContent(null);
+      }
     }
-  }, [activeCellCoordinates, previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates, updateData, rows, isEditing, removeCellEditor]);
-  var handleActiveCellMouseEnter = (0, _react.useCallback)(function () {
-    handleActiveCellMouseEnterCallback(selectionAreas, clickAndHoldActive);
-  }, [clickAndHoldActive, selectionAreas, handleActiveCellMouseEnterCallback]);
+  }, [activeCellCoordinates, previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates, updateData, rows, isEditing, removeCellEditor, activeCellContent]);
   var createActiveCell = (0, _react.useCallback)(function (_ref2) {
     var placementElement = _ref2.placementElement,
         coords = _ref2.coords,
@@ -247,23 +263,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: _removeCellSelections.removeCellSelections,
     setContainerHasFocus: setContainerHasFocus,
-    activeKeys: activeKeys,
     removeCellEditor: removeCellEditor
   });
-  (0, _useMoveActiveCell.useMoveActiveCell)({
+  (0, _hooks2.useMoveActiveCell)({
     spreadsheetRef: spreadsheetRef,
     activeCellCoordinates: activeCellCoordinates,
     containerHasFocus: containerHasFocus,
@@ -300,10 +314,28 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       setCurrentMatcher(tempMatcher);
     }
   }, []);
+  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;
@@ -320,27 +352,20 @@ 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([]);
-        removeCellSelections({
+        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,
@@ -351,9 +376,26 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     // 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) {
+        // HOME
+        case 'Home':
+          {
+            handleHomeEndKey({
+              type: 'home'
+            });
+            break;
+          }
+
+        case 'End':
+          {
+            handleHomeEndKey({
+              type: 'end'
+            });
+            break;
+          }
         // Tab
+
         case 'Tab':
           {
             setSelectionAreas([]);
@@ -502,13 +544,35 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
           }
       }
     }
-  }, [updateActiveCellCoordinates, handleInitialArrowPress, activeCellCoordinates, removeActiveCell, columns, rows, spreadsheetRef, currentMatcher, isEditing, removeCellEditor, removeCellSelections, selectionAreas]);
+  }, [updateActiveCellCoordinates, handleInitialArrowPress, activeCellCoordinates, removeActiveCell, columns, rows, spreadsheetRef, currentMatcher, isEditing, removeCellEditor, selectionAreas, handleHomeEndKey, keysPressedList]);
 
   var startEditMode = function startEditMode() {
     setIsEditing(true);
     var activeCellFullData = typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'number' && typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'number' ? rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row].cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column] : null;
     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;
+      handleRowColumnHeaderClick({
+        isKeyboard: false,
+        index: indexValue
+      });
+    }
+
+    return;
   }; // Go into edit mode if 'Enter' key is pressed on activeCellRef
 
 
@@ -521,41 +585,51 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       }
 
       if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
-        var handleHeaderCellProps = {
-          activeCellCoordinates: activeCellCoordinates,
-          rows: rows,
-          columns: columns,
-          setActiveCellCoordinates: setActiveCellCoordinates,
-          setCurrentMatcher: setCurrentMatcher,
-          setSelectionAreas: setSelectionAreas,
-          spreadsheetRef: spreadsheetRef,
+        handleRowColumnHeaderClick({
           isKeyboard: true
-        }; // Select an entire column
-
-        if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header') {
-          (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
-            type: 'column'
-          }, handleHeaderCellProps));
-        } // Select an entire row
-
-
-        if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
-          (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
-            type: 'row'
-          }, handleHeaderCellProps));
-        }
+        });
       }
     }
+  };
+
+  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,
+      columns: columns,
+      setActiveCellCoordinates: setActiveCellCoordinates,
+      setCurrentMatcher: setCurrentMatcher,
+      setSelectionAreas: setSelectionAreas,
+      spreadsheetRef: spreadsheetRef,
+      isKeyboard: isKeyboard,
+      setSelectionAreaData: setSelectionAreaData,
+      index: index
+    }; // Select an entire column
+
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header') {
+      (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
+        type: 'column'
+      }, handleHeaderCellProps));
+    } // Select an entire row
+
+
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
+      (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
+        type: 'row'
+      }, handleHeaderCellProps));
+    }
   }; // Go into edit mode if double click is detected on activeCellRef
 
 
   var handleActiveCellDoubleClick = function handleActiveCellDoubleClick() {
     startEditMode();
-  }; // Update the data
-
+  };
 
-  var handleEditSubmit = function handleEditSubmit(event) {
-    var key = event.key;
+  var updateSelectionAreaOnCellEditSubmit = function updateSelectionAreaOnCellEditSubmit(_ref6) {
+    var type = _ref6.type;
 
     var submitEditChanges = function submitEditChanges() {
       var prevCoords = previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates;
@@ -564,8 +638,33 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       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') {
-      submitEditChanges();
+      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
@@ -576,7 +675,9 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
 
     if (key === 'Tab') {
       event.preventDefault();
-      submitEditChanges();
+      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
@@ -586,44 +687,8 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     }
 
     return;
-  }; // 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) {
-    var freshMatcherValue = currentMatcherRef.current;
-
-    if (!freshMatcherValue) {
-      return;
-    }
-
-    if (areas && areas.length && clickHold && freshMatcherValue) {
-      setSelectionAreas(function (prev) {
-        var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
-        var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
-          return item.matcher === freshMatcherValue;
-        });
-
-        if (indexOfItemToUpdate === -1) {
-          return prev;
-        }
-
-        if ((0, _typeof2.default)(selectionAreaClone[indexOfItemToUpdate].point2) === 'object' && selectionAreaClone[indexOfItemToUpdate].areaCreated) {
-          selectionAreaClone[indexOfItemToUpdate].point2 = null;
-          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
-          removeCellSelections({
-            matcher: freshMatcherValue,
-            spreadsheetRef: spreadsheetRef
-          });
-          return selectionAreaClone;
-        }
+  };
 
-        return prev;
-      });
-    }
-  }, [spreadsheetRef, removeCellSelections]);
   (0, _react.useEffect)(function () {
     if (isEditing) {
       var _rows$activeCellCoord, _cellProps$column, _cellEditorRef$curren;
@@ -636,57 +701,70 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       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, "px"); // calculate paddingTop based on cellHeight which could be variable depending on the cellSize prop
+      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 (!isEditing) {
+      cellEditorRef.current.style.overflow = 'hidden';
       cellEditorRef.current.style.display = 'none';
       cellEditorRef.current.blur();
       activeCellRef.current.focus();
     }
-  }, [isEditing, activeCellCoordinates, rows]);
-
-  var handleKeyUp = function handleKeyUp(event) {
-    var _activeKeys$current3;
-
-    var key = event.key; // Remove key from active keys array on key up
-
-    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;
-      });
-      activeKeys.current = filteredKeysClone;
-    }
-  };
-
+  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, columns.length, defaultColumn]);
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, getTableProps(), (0, _devtools.getDevtoolsProps)(componentName), {
-    className: (0, _classnames.default)(blockClass, className, (0, _defineProperty2.default)({}, "".concat(blockClass, "__container-has-focus"), containerHasFocus)),
+    className: (0, _classnames.default)(blockClass, className, "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__container-has-focus"), containerHasFocus)),
     ref: spreadsheetRef,
     role: "grid",
     tabIndex: 0,
     "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,
-    cellSizeValue: cellSizeValue,
+    cellSize: cellSize,
     columns: columns,
     defaultColumn: defaultColumn,
     headerGroups: headerGroups,
     rows: rows,
+    scrollBarSize: scrollBarSize,
     selectionAreas: selectionAreas,
     setActiveCellCoordinates: setActiveCellCoordinates,
     setSelectionAreas: setSelectionAreas,
-    setCurrentMatcher: setCurrentMatcher
+    setCurrentMatcher: setCurrentMatcher,
+    setSelectionAreaData: setSelectionAreaData
   }), /*#__PURE__*/_react.default.createElement(_DataSpreadsheetBody.DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
     ref: spreadsheetRef,
@@ -698,34 +776,45 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     selectionAreas: selectionAreas,
     setSelectionAreas: setSelectionAreas,
     cellSize: cellSize,
+    headerGroups: headerGroups,
     defaultColumn: defaultColumn,
     getTableBodyProps: getTableBodyProps,
+    onDataUpdate: onDataUpdate,
     onActiveCellChange: onActiveCellChange,
+    onSelectionAreaChange: onSelectionAreaChange,
     prepareRow: prepareRow,
     rows: rows,
+    selectionAreaData: selectionAreaData,
+    setSelectionAreaData: setSelectionAreaData,
     setActiveCellCoordinates: setActiveCellCoordinates,
     scrollBarSize: scrollBarSize,
     totalColumnsWidth: totalColumnsWidth,
     id: id,
-    columns: columns
+    columns: columns,
+    defaultEmptyRowCount: defaultEmptyRowCount
   }), /*#__PURE__*/_react.default.createElement("button", {
+    onClick: handleActiveCellClick,
     onKeyDown: handleActiveCellKeyDown,
-    onMouseEnter: handleActiveCellMouseEnter,
     onDoubleClick: handleActiveCellDoubleClick,
     ref: activeCellRef,
     className: (0, _classnames.default)("".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__active-cell--highlight")),
     type: "button"
-  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextArea, {
+  }, activeCellContent), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextArea, {
     value: cellEditorValue,
     onKeyDown: handleEditSubmit,
     onChange: function onChange(event) {
-      return setCellEditorValue(event.target.value);
+      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,
     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
 
 
@@ -763,6 +852,11 @@ DataSpreadsheet.propTypes = {
    */
   data: _propTypes.default.arrayOf(_propTypes.default.shape),
 
+  /**
+   * Sets the number of empty rows to be created when there is no data provided
+   */
+  defaultEmptyRowCount: _propTypes.default.number,
+
   /**
    * The spreadsheet id
    */
@@ -776,7 +870,12 @@ DataSpreadsheet.propTypes = {
   /**
    * The setter fn for the data prop
    */
-  onDataUpdate: _propTypes.default.func
+  onDataUpdate: _propTypes.default.func,
+
+  /**
+   * The event handler that is called when the selection area values change
+   */
+  onSelectionAreaChange: _propTypes.default.func
   /* TODO: add types and DocGen for all props. */
 
 };