@carbon/ibm-products 1.14.0 → 1.15.0

package/es/components/DataSpreadsheet/DataSpreadsheet.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
@@ -16,8 +17,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 // Import portions of React that are needed.
 import React, { useMemo, useRef, useState, useCallback, useEffect } from 'react';
-import { useBlockLayout, useTable } from 'react-table';
-import { px } from '@carbon/layout'; // Other standard imports.
+import { useBlockLayout, useTable } from 'react-table'; // Other standard imports.
 
 import PropTypes from 'prop-types';
 import cx from 'classnames';
@@ -29,12 +29,17 @@ import { getDevtoolsProps } from '../../global/js/utils/devtools';
 import { getScrollbarWidth } from '../../global/js/utils/getScrollbarWidth';
 import { useActiveElement, usePreviousValue } from '../../global/js/hooks';
 import uuidv4 from '../../global/js/utils/uuidv4';
-import { useResetSpreadsheetFocus, useSpreadsheetOutsideClick, useMoveActiveCell, useMultipleKeyTracking } from './hooks';
+import { deepCloneObject } from '../../global/js/utils/deepCloneObject';
+import { useResetSpreadsheetFocus, useSpreadsheetOutsideClick, useMoveActiveCell, useMultipleKeyTracking, useSpreadsheetEdit } from './hooks';
 import { createActiveCellFn } from './utils/createActiveCellFn';
 import { getCellSize } from './utils/getCellSize';
-import { handleMultipleKeys, includesShift } from './utils/handleMultipleKeys';
+import { handleMultipleKeys, includesResourceKey, includesShift } from './utils/handleMultipleKeys';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection';
-import { removeCellSelections } from './utils/removeCellSelections'; // cspell:words rowcount colcount
+import { removeCellSelections } from './utils/removeCellSelections';
+import { selectAllCells } from './utils/selectAllCells';
+import { handleEditSubmit } from './utils/handleEditSubmit';
+import { handleActiveCellInSelectionEnter } from './utils/handleActiveCellInSelectionEnter';
+import { handleActiveCellInSelectionTab } from './utils/handleActiveCellInSelectionTab'; // cspell:words rowcount colcount
 // The block part of our conventional BEM class names (blockClass__E--M).
 
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
@@ -117,6 +122,11 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       cellEditorValue = _useState16[0],
       setCellEditorValue = _useState16[1];
 
+  var _useState17 = useState(false),
+      _useState18 = _slicedToArray(_useState17, 2),
+      activeCellInsideSelectionArea = _useState18[0],
+      setActiveCellInsideSelectionArea = _useState18[1];
+
   var previousState = usePreviousValue({
     activeCellCoordinates: activeCellCoordinates,
     isEditing: isEditing
@@ -124,10 +134,10 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
   var cellSizeValue = getCellSize(cellSize);
   var cellEditorRef = useRef();
 
-  var _useState17 = useState(),
-      _useState18 = _slicedToArray(_useState17, 2),
-      activeCellContent = _useState18[0],
-      setActiveCellContent = _useState18[1];
+  var _useState19 = useState(),
+      _useState20 = _slicedToArray(_useState19, 2),
+      activeCellContent = _useState20[0],
+      setActiveCellContent = _useState20[1];
 
   var activeCellRef = useRef();
   var cellEditorRulerRef = useRef();
@@ -144,7 +154,8 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     containerHasFocus: containerHasFocus,
     isEditing: isEditing
   }),
-      keysPressedList = _useMultipleKeyTracki.keysPressedList;
+      keysPressedList = _useMultipleKeyTracki.keysPressedList,
+      usingMac = _useMultipleKeyTracki.usingMac;
 
   var scrollBarSize = useMemo(function () {
     return getScrollbarWidth();
@@ -257,6 +268,8 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
   var handleInitialArrowPress = 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',
@@ -267,16 +280,20 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     return;
   }, [activeCellCoordinates]);
   var updateActiveCellCoordinates = 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 = uuidv4();
       setSelectionAreas([{
         point1: newActiveCell,
@@ -284,7 +301,7 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       }]);
       setCurrentMatcher(tempMatcher);
     }
-  }, []);
+  }, [activeCellCoordinates]);
   var handleHomeEndKey = useCallback(function (_ref4) {
     var type = _ref4.type;
 
@@ -341,7 +358,13 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
         currentMatcher: currentMatcher,
         rows: rows,
         setSelectionAreas: setSelectionAreas,
-        columns: columns
+        columns: columns,
+        updateActiveCellCoordinates: updateActiveCellCoordinates,
+        spreadsheetRef: spreadsheetRef,
+        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
@@ -349,9 +372,26 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
 
     if (keysPressedList.length < 2 && !includesShift(keysPressedList) || activeCellCoordinates.row === 'header' || activeCellCoordinates.column === 'header') {
       switch (key) {
+        // Enter
+        case 'Enter':
+          {
+            handleActiveCellInSelectionEnter({
+              activeCellInsideSelectionArea: activeCellInsideSelectionArea,
+              activeCellCoordinates: activeCellCoordinates,
+              activeCellRef: activeCellRef,
+              selectionAreas: selectionAreas,
+              updateActiveCellCoordinates: updateActiveCellCoordinates
+            });
+            break;
+          }
         // HOME
+
         case 'Home':
           {
+            if (includesResourceKey(keysPressedList, usingMac)) {
+              return;
+            }
+
             handleHomeEndKey({
               type: 'home'
             });
@@ -360,6 +400,10 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
 
         case 'End':
           {
+            if (includesResourceKey(keysPressedList, usingMac)) {
+              return;
+            }
+
             handleHomeEndKey({
               type: 'end'
             });
@@ -369,6 +413,17 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
 
         case 'Tab':
           {
+            if (activeCellInsideSelectionArea) {
+              event.preventDefault();
+              return handleActiveCellInSelectionTab({
+                activeCellInsideSelectionArea: activeCellInsideSelectionArea,
+                activeCellCoordinates: activeCellCoordinates,
+                activeCellRef: activeCellRef,
+                selectionAreas: selectionAreas,
+                updateActiveCellCoordinates: updateActiveCellCoordinates
+              });
+            }
+
             setSelectionAreas([]);
             removeActiveCell();
             removeCellEditor();
@@ -515,7 +570,7 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
           }
       }
     }
-  }, [updateActiveCellCoordinates, handleInitialArrowPress, activeCellCoordinates, removeActiveCell, columns, rows, spreadsheetRef, currentMatcher, isEditing, removeCellEditor, selectionAreas, handleHomeEndKey, keysPressedList]);
+  }, [activeCellInsideSelectionArea, updateActiveCellCoordinates, handleInitialArrowPress, activeCellCoordinates, removeActiveCell, columns, rows, spreadsheetRef, currentMatcher, isEditing, removeCellEditor, selectionAreas, handleHomeEndKey, keysPressedList, usingMac]);
 
   var startEditMode = function startEditMode() {
     setIsEditing(true);
@@ -537,12 +592,37 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
   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 = uuidv4();
+      setClickAndHoldActive(true);
+      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
 
@@ -550,7 +630,7 @@ export var DataSpreadsheet = /*#__PURE__*/React.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();
       }
@@ -580,18 +660,30 @@ export var DataSpreadsheet = /*#__PURE__*/React.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') {
       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') {
       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') {
+      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
 
 
@@ -599,116 +691,55 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     startEditMode();
   };
 
-  var updateSelectionAreaOnCellEditSubmit = function updateSelectionAreaOnCellEditSubmit(_ref6) {
-    var type = _ref6.type;
-
-    var submitEditChanges = function submitEditChanges() {
-      var prevCoords = previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates;
-      var cellProps = rows[prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row].cells[prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.column];
-      removeCellEditor();
-      updateData(prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row, cellProps.column.id);
-    };
-
-    removeCellSelections({
-      spreadsheetRef: spreadsheetRef
-    });
-    submitEditChanges();
-    var tempMatcher = uuidv4();
-    var newSelectionArea = {
-      row: type === 'Enter' ? activeCellCoordinates.row === rows.length - 1 ? activeCellCoordinates.row : activeCellCoordinates.row + 1 : activeCellCoordinates.row,
-      column: type === 'Tab' ? activeCellCoordinates.column === columns.length - 1 ? activeCellCoordinates.column : activeCellCoordinates.column + 1 : activeCellCoordinates.column
-    };
-    setSelectionAreas([{
-      point1: newSelectionArea,
-      point2: newSelectionArea,
-      matcher: tempMatcher,
-      areaCreated: false
-    }]);
-    setCurrentMatcher(tempMatcher);
-    cellEditorRulerRef.current.textContent = '';
-  }; // 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
-
-        });
-      });
+  useSpreadsheetEdit({
+    isEditing: isEditing,
+    rows: rows,
+    activeCellCoordinates: activeCellCoordinates,
+    activeCellRef: activeCellRef,
+    cellEditorRef: cellEditorRef,
+    cellEditorRulerRef: cellEditorRulerRef,
+    columns: columns,
+    defaultColumn: defaultColumn,
+    cellEditorValue: cellEditorValue
+  });
+  var handleActiveCellMouseEnter = 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 = 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 = deepCloneObject(prev);
+        var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
+          return item.matcher === currentMatcher;
         });
-      });
-    }
 
-    return;
-  };
+        if (indexOfItemToUpdate === -1) {
+          return prev;
+        }
 
-  useEffect(function () {
-    if (isEditing) {
-      var _rows$activeCellCoord, _cellProps$column, _cellEditorRef$curren;
-
-      var cellProps = (_rows$activeCellCoord = rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row]) === null || _rows$activeCellCoord === void 0 ? void 0 : _rows$activeCellCoord.cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column];
-      var activeCellLeftPosition = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.left;
-      var activeCellTopPosition = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.top;
-      cellEditorRef.current.style.left = activeCellLeftPosition;
-      cellEditorRef.current.style.top = activeCellTopPosition;
-      cellEditorRef.current.style.display = 'block';
-      cellEditorRef.current.style.width = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.width;
-      cellEditorRef.current.style.height = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height;
-      cellEditorRef.current.style.paddingTop = "".concat((parseInt(activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height) - 16) / 2 - 1, "px"); // calculate paddingTop based on cellHeight which could be variable depending on the cellSize prop
-
-      cellEditorRef.current.style.textAlign = (cellProps === null || cellProps === void 0 ? void 0 : (_cellProps$column = cellProps.column) === null || _cellProps$column === void 0 ? void 0 : _cellProps$column.placement) === 'right' ? 'right' : 'left';
-      (_cellEditorRef$curren = cellEditorRef.current) === null || _cellEditorRef$curren === void 0 ? void 0 : _cellEditorRef$curren.focus();
-      var rulerWidth = cellEditorRulerRef.current.offsetWidth;
-      var cellWidth = activeCellRef.current.offsetWidth;
-
-      if (rulerWidth >= cellWidth) {
-        var widthMultiplier = Math.floor(rulerWidth / cellWidth) + 1;
-        var startingColumnPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column;
-        var startingRowPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row;
-        var totalColumns = columns.length;
-        var totalRows = rows.length;
-        var totalMultiplierPossible = totalColumns - startingColumnPosition;
-        var totalCellEditorMaxHeight = (totalRows - startingRowPosition) * defaultColumn.rowHeight;
-        cellEditorRef.current.style.maxHeight = px(totalCellEditorMaxHeight);
-        cellEditorRef.current.style.width = px(cellWidth * (widthMultiplier <= totalMultiplierPossible ? widthMultiplier : totalMultiplierPossible));
-        cellEditorRef.current.style.height = px(cellEditorRef.current.scrollHeight); // adds dynamic height to cell editor
-        // Cell editor has reached max height, we need to add the scrolling back.
-        // We also need to subtract 1 to account for the fact that the cell editor
-        // is placed one pixel below the cell being edited to account for the border
-
-        if (cellEditorRef.current.clientHeight === totalCellEditorMaxHeight - 1) {
-          cellEditorRef.current.style.overflow = 'auto';
-        } else {
-          cellEditorRef.current.style.overflow = 'hidden';
+        if (_typeof(selectionAreaClone[indexOfItemToUpdate].point2) === 'object' && selectionAreaClone[indexOfItemToUpdate].areaCreated) {
+          selectionAreaClone[indexOfItemToUpdate].point2 = selectionAreaClone[indexOfItemToUpdate].point1;
+          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
+          setActiveCellInsideSelectionArea(false);
+          removeCellSelections({
+            matcher: currentMatcher,
+            spreadsheetRef: spreadsheetRef
+          });
+          return selectionAreaClone;
         }
-      }
-    }
 
-    if (!isEditing) {
-      cellEditorRef.current.style.overflow = 'hidden';
-      cellEditorRef.current.style.display = 'none';
-      cellEditorRef.current.blur();
-      activeCellRef.current.focus();
+        return prev;
+      });
     }
-  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, columns.length, defaultColumn]);
+  }, [spreadsheetRef, currentMatcher]);
   return /*#__PURE__*/React.createElement("div", _extends({}, rest, getTableProps(), getDevtoolsProps(componentName), {
     className: cx(blockClass, className, "".concat(blockClass, "--interactive-cell-element"), _defineProperty({}, "".concat(blockClass, "__container-has-focus"), containerHasFocus)),
     ref: spreadsheetRef,
@@ -735,7 +766,8 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     setActiveCellCoordinates: setActiveCellCoordinates,
     setSelectionAreas: setSelectionAreas,
     setCurrentMatcher: setCurrentMatcher,
-    setSelectionAreaData: setSelectionAreaData
+    setSelectionAreaData: setSelectionAreaData,
+    updateActiveCellCoordinates: updateActiveCellCoordinates
   }), /*#__PURE__*/React.createElement(DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
     ref: spreadsheetRef,
@@ -762,24 +794,39 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     totalColumnsWidth: totalColumnsWidth,
     id: id,
     columns: columns,
-    defaultEmptyRowCount: defaultEmptyRowCount
+    defaultEmptyRowCount: defaultEmptyRowCount,
+    setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea
   }), /*#__PURE__*/React.createElement("button", {
+    onMouseDown: handleActiveCellMouseDown,
     onClick: handleActiveCellClick,
     onKeyDown: handleActiveCellKeyDown,
     onDoubleClick: handleActiveCellDoubleClick,
+    onMouseEnter: handleActiveCellMouseEnter,
     ref: activeCellRef,
-    className: cx("".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__active-cell--highlight")),
+    className: cx("".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__active-cell--highlight"), _defineProperty({}, "".concat(blockClass, "__active-cell--with-selection"), activeCellInsideSelectionArea)),
     type: "button"
   }, activeCellContent), /*#__PURE__*/React.createElement(TextArea, {
     value: cellEditorValue,
-    onKeyDown: handleEditSubmit,
+    onKeyDown: 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: cx("".concat(blockClass, "__cell-editor"), "".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__cell-editor--").concat(cellSize), _defineProperty({}, "".concat(blockClass, "__cell-editor--active"), isEditing))
   }), /*#__PURE__*/React.createElement("pre", {
     "aria-hidden": true,

package/es/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -49,7 +49,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       setClickAndHoldActive = _ref.setClickAndHoldActive,
       currentMatcher = _ref.currentMatcher,
       setCurrentMatcher = _ref.setCurrentMatcher,
-      onSelectionAreaChange = _ref.onSelectionAreaChange;
+      onSelectionAreaChange = _ref.onSelectionAreaChange,
+      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea;
   var previousState = usePreviousValue({
     selectionAreaData: selectionAreaData,
     clickAndHoldActive: clickAndHoldActive
@@ -107,18 +108,20 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
         if (!area.areaCreated && area.point1 && area.point2 && area.matcher) {
           createCellSelectionArea({
+            ref: ref,
             area: area,
             blockClass: blockClass,
             defaultColumn: defaultColumn,
             selectionAreas: selectionAreas,
-            setSelectionAreas: setSelectionAreas
+            setSelectionAreas: setSelectionAreas,
+            setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea
           });
         }
 
         return;
       });
     }
-  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData]);
+  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData, ref, activeCellCoordinates, setActiveCellInsideSelectionArea]);
 
   var populateSelectionAreaCellData = function populateSelectionAreaCellData(_ref2) {
     var rowStart = _ref2.rowStart,
@@ -196,6 +199,9 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       // meaning that selectionAreas should only have one item by default
 
       if (isHoldingCommandKey) {
+        var activeCellElement = ref.current.querySelector(".".concat(blockClass, "__active-cell--highlight"));
+        activeCellElement.setAttribute('data-selection-id', tempMatcher);
+        setActiveCellInsideSelectionArea(true);
         setActiveCellCoordinates(activeCoordinates);
         setCurrentMatcher(tempMatcher);
         setSelectionAreas(function (prev) {
@@ -226,6 +232,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
           setSelectionAreas(selectionAreaClone);
         }
       } else {
+        setActiveCellInsideSelectionArea(false);
         setActiveCellCoordinates(activeCoordinates); // remove all previous cell selections
 
         removeCellSelections({
@@ -239,7 +246,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         setSelectionAreaData([]);
       }
     };
-  }, [currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher, ref, setSelectionAreaData]);
+  }, [currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher, ref, setSelectionAreaData, setActiveCellInsideSelectionArea]);
   var handleBodyCellHover = useCallback(function (cell, columnIndex) {
     return function () {
       if (clickAndHoldActive) {
@@ -272,7 +279,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   }, [clickAndHoldActive, currentMatcher, setSelectionAreas]);
   var handleRowHeaderClick = useCallback(function (index) {
-    return function () {
+    return function (event) {
+      var isHoldingCommandKey = event.metaKey || event.ctrlKey;
       handleHeaderCellSelection({
         type: 'row',
         activeCellCoordinates: activeCellCoordinates,
@@ -283,7 +291,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         setSelectionAreas: setSelectionAreas,
         spreadsheetRef: ref,
         index: index,
-        setSelectionAreaData: setSelectionAreaData
+        setSelectionAreaData: setSelectionAreaData,
+        isHoldingCommandKey: isHoldingCommandKey
       });
     };
   }, [columns, ref, setSelectionAreas, setCurrentMatcher, setActiveCellCoordinates, activeCellCoordinates, rows, setSelectionAreaData]); // Builds the empty rows and calls `onDataUpdate` to set the new empty rows
@@ -328,10 +337,11 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }), {
         className: cx("".concat(blockClass, "__tr")),
         "data-row-index": index,
-        "aria-rowindex": index
+        "aria-rowindex": index + 1
       }), /*#__PURE__*/React.createElement("div", {
         role: "rowheader"
       }, /*#__PURE__*/React.createElement("button", {
+        id: "".concat(blockClass, "__cell--").concat(index, "--header"),
         tabIndex: -1,
         "data-row-index": index,
         "data-column-index": "header",
@@ -344,13 +354,14 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }, index + 1)), row.cells.map(function (cell, index) {
         return /*#__PURE__*/React.createElement("div", _extends({
           key: "cell_".concat(index),
-          "aria-colindex": index
+          "aria-colindex": index + 1
         }, cell.getCellProps(), {
           role: "gridcell",
           style: _objectSpread(_objectSpread({}, cell.getCellProps().style), {}, {
             display: 'grid'
           })
         }), /*#__PURE__*/React.createElement("button", {
+          id: "".concat(blockClass, "__cell--").concat(cell.row.index, "--").concat(index),
           tabIndex: -1,
           "data-row-index": cell.row.index,
           "data-column-index": index,
@@ -473,6 +484,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setActiveCellCoordinates: PropTypes.func,
 
+  /**
+   * Setter fn for active cell inside of selection area
+   */
+  setActiveCellInsideSelectionArea: PropTypes.func,
+
   /**
    * Setter fn for clickAndHold state value
    */