@carbon/ibm-products 1.13.0 → 1.16.0

package/es/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -2,6 +2,10 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -21,6 +25,7 @@ import { removeCellSelections } from './utils/removeCellSelections';
 import { createCellSelectionArea } from './utils/createCellSelectionArea';
 import { checkActiveHeaderCell } from './utils/checkActiveHeaderCell';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection';
+import { getSpreadsheetWidth } from './utils/getSpreadsheetWidth';
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
 export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var columns = _ref.columns,
@@ -45,7 +50,10 @@ 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,
+      totalVisibleColumns = _ref.totalVisibleColumns;
+  var contentScrollRef = useRef();
   var previousState = usePreviousValue({
     selectionAreaData: selectionAreaData,
     clickAndHoldActive: clickAndHoldActive
@@ -103,18 +111,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,
@@ -192,6 +202,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) {
@@ -222,6 +235,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
           setSelectionAreas(selectionAreaClone);
         }
       } else {
+        setActiveCellInsideSelectionArea(false);
         setActiveCellCoordinates(activeCoordinates); // remove all previous cell selections
 
         removeCellSelections({
@@ -235,7 +249,22 @@ 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 handleBodyScroll = function handleBodyScroll() {
+    var headerRowElement = ref.current.querySelector("\n        .".concat(blockClass, "__header--container .").concat(blockClass, "__tr"));
+    headerRowElement.scrollLeft = contentScrollRef.current.scrollLeft;
+  };
+
+  useEffect(function () {
+    contentScrollRef.current.addEventListener('scroll', function (event) {
+      return handleBodyScroll(event);
+    });
+    var contentScrollElementRef = contentScrollRef.current;
+    return function () {
+      contentScrollElementRef.removeEventListener('scroll', handleBodyScroll);
+    };
+  });
   var handleBodyCellHover = useCallback(function (cell, columnIndex) {
     return function () {
       if (clickAndHoldActive) {
@@ -268,7 +297,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,
@@ -279,7 +309,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
@@ -323,8 +354,13 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         style: style
       }), {
         className: cx("".concat(blockClass, "__tr")),
-        "data-row-index": index
-      }), /*#__PURE__*/React.createElement("button", {
+        "data-row-index": index,
+        "aria-rowindex": index + 1
+      }), /*#__PURE__*/React.createElement("div", {
+        role: "rowheader",
+        className: "".concat(blockClass, "__td-th--cell-container")
+      }, /*#__PURE__*/React.createElement("button", {
+        id: "".concat(blockClass, "__cell--").concat(index, "--header"),
         tabIndex: -1,
         "data-row-index": index,
         "data-column-index": "header",
@@ -334,22 +370,30 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         style: {
           width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
         }
-      }, index + 1), row.cells.map(function (cell, index) {
-        return /*#__PURE__*/React.createElement("button", _extends({
+      }, index + 1)), row.cells.map(function (cell, index) {
+        return /*#__PURE__*/React.createElement("div", _extends({
+          key: "cell_".concat(index),
+          "aria-colindex": index + 1
+        }, cell.getCellProps(), {
+          role: "gridcell",
+          style: _objectSpread(_objectSpread({}, cell.getCellProps().style), {}, {
+            display: 'grid',
+            minWidth: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width
+          })
+        }), /*#__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
-        }, cell.getCellProps(), {
+          "data-column-index": index,
           className: cx("".concat(blockClass, "__td"), "".concat(blockClass, "__body--td"), "".concat(blockClass, "--interactive-cell-element")),
-          key: "cell_".concat(index),
           onMouseDown: handleBodyCellClick(cell, index),
           onMouseOver: handleBodyCellHover(cell, index),
           onFocus: function onFocus() {},
           type: "button"
-        }), cell.render('Cell'));
+        }, cell.render('Cell')));
       }));
     }
-  }, [prepareRow, rows, defaultColumn.rowHeaderWidth, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover]);
+  }, [prepareRow, rows, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover, defaultColumn]);
   var spreadsheetBodyRef = useRef();
   return /*#__PURE__*/React.createElement("div", _extends({
     ref: spreadsheetBodyRef,
@@ -359,7 +403,13 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     height: 400,
     itemCount: rows.length || defaultEmptyRowCount,
     itemSize: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
-    width: totalColumnsWidth + scrollBarSize
+    width: getSpreadsheetWidth({
+      scrollBarSizeValue: scrollBarSize,
+      totalVisibleColumns: totalVisibleColumns,
+      defaultColumn: defaultColumn,
+      totalColumnsWidth: totalColumnsWidth
+    }),
+    outerRef: contentScrollRef
   }, rows !== null && rows !== void 0 && rows.length ? RenderRow : RenderEmptyRows));
 });
 DataSpreadsheetBody.propTypes = {
@@ -460,6 +510,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setActiveCellCoordinates: PropTypes.func,
 
+  /**
+   * Setter fn for active cell inside of selection area
+   */
+  setActiveCellInsideSelectionArea: PropTypes.func,
+
   /**
    * Setter fn for clickAndHold state value
    */
@@ -488,5 +543,11 @@ DataSpreadsheetBody.propTypes = {
   /**
    * The total columns width
    */
-  totalColumnsWidth: PropTypes.number
+  totalColumnsWidth: PropTypes.number,
+
+  /**
+   * The total number of columns to be initially visible, additional columns will be rendered and
+   * visible via horizontal scrollbar
+   */
+  totalVisibleColumns: PropTypes.number
 };

package/es/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -15,11 +15,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React, { forwardRef, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { px } from '@carbon/layout';
 import { pkg } from '../../settings';
+import { usePreviousValue } from '../../global/js/hooks';
 import { checkActiveHeaderCell } from './utils/checkActiveHeaderCell';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection';
-import { usePreviousValue } from '../../global/js/hooks';
+import { selectAllCells } from './utils/selectAllCells';
+import { getSpreadsheetWidth } from './utils/getSpreadsheetWidth';
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
 export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var activeCellCoordinates = _ref.activeCellCoordinates,
@@ -33,7 +34,9 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
       setCurrentMatcher = _ref.setCurrentMatcher,
       setSelectionAreas = _ref.setSelectionAreas,
       setSelectionAreaData = _ref.setSelectionAreaData,
-      rows = _ref.rows;
+      rows = _ref.rows,
+      totalVisibleColumns = _ref.totalVisibleColumns,
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -55,7 +58,8 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
   }, [cellSize, ref, scrollBarSize, previousState === null || previousState === void 0 ? void 0 : previousState.cellSize]);
 
   var handleColumnHeaderClick = function handleColumnHeaderClick(index) {
-    return function () {
+    return function (event) {
+      var isHoldingCommandKey = event.metaKey || event.ctrlKey;
       handleHeaderCellSelection({
         type: 'column',
         activeCellCoordinates: activeCellCoordinates,
@@ -66,45 +70,75 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
         setSelectionAreas: setSelectionAreas,
         spreadsheetRef: ref,
         index: index,
-        setSelectionAreaData: setSelectionAreaData
+        setSelectionAreaData: setSelectionAreaData,
+        isHoldingCommandKey: isHoldingCommandKey
       });
     };
   };
 
+  var handleSelectAllClick = function handleSelectAllClick() {
+    selectAllCells({
+      ref: ref,
+      setCurrentMatcher: setCurrentMatcher,
+      setSelectionAreas: setSelectionAreas,
+      rows: rows,
+      columns: columns,
+      activeCellCoordinates: activeCellCoordinates,
+      updateActiveCellCoordinates: updateActiveCellCoordinates
+    });
+  };
+
   return /*#__PURE__*/React.createElement("div", {
-    className: cx("".concat(blockClass, "__header--container"))
+    className: cx("".concat(blockClass, "__header--container")),
+    role: "rowgroup"
   }, headerGroups.map(function (headerGroup, index) {
     return /*#__PURE__*/React.createElement("div", _extends({
       key: "header_".concat(index)
     }, headerGroup.getHeaderGroupProps(), {
       style: _objectSpread(_objectSpread({}, headerGroup.getHeaderGroupProps().style), {}, {
-        width: px(parseInt(headerGroup.getHeaderGroupProps().style.width) + scrollBarSizeValue)
+        width: getSpreadsheetWidth({
+          type: 'header',
+          headerGroup: headerGroup,
+          scrollBarSizeValue: scrollBarSizeValue,
+          totalVisibleColumns: totalVisibleColumns,
+          defaultColumn: defaultColumn
+        }),
+        overflow: 'hidden'
       }),
       className: "".concat(blockClass, "__tr")
-    }), /*#__PURE__*/React.createElement("button", {
-      "data-row-index": "header",
-      "data-column-index": "header",
-      type: "button",
-      tabIndex: -1,
-      className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), _defineProperty({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header')),
+    }), /*#__PURE__*/React.createElement("div", {
+      role: "columnheader",
+      className: "".concat(blockClass, "__select-all-cell-container"),
       style: {
         width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth,
         height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
       }
-    }, "\xA0"), headerGroup.headers.map(function (column, index) {
-      return /*#__PURE__*/React.createElement("button", _extends({
+    }, /*#__PURE__*/React.createElement("button", {
+      id: "".concat(blockClass, "__cell--header--header"),
+      "data-row-index": "header",
+      "data-column-index": "header",
+      type: "button",
+      tabIndex: -1,
+      onClick: handleSelectAllClick,
+      className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__th--select-all"), _defineProperty({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header'))
+    }, "\xA0")), headerGroup.headers.map(function (column, index) {
+      return /*#__PURE__*/React.createElement("div", _extends({
         key: "column_".concat(index),
+        role: "columnheader",
+        className: "".concat(blockClass, "__columnheader")
+      }, column.getHeaderProps()), /*#__PURE__*/React.createElement("button", {
+        id: "".concat(blockClass, "__cell--header--").concat(index),
         "data-row-index": "header",
         "data-column-index": index,
         tabIndex: -1,
         onClick: handleColumnHeaderClick(index),
         style: {
-          height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
-        }
-      }, column.getHeaderProps(), {
+          height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
+          width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width
+        },
         className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), _defineProperty({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || checkActiveHeaderCell(index, selectionAreas, 'column'))),
         type: "button"
-      }), column.render('Header'));
+      }, column.render('Header')));
     }));
   }));
 });
@@ -174,5 +208,16 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Setter fn for selectionAreas value
    */
-  setSelectionAreas: PropTypes.func
+  setSelectionAreas: PropTypes.func,
+
+  /**
+   * The total number of columns to be initially visible, additional columns will be rendered and
+   * visible via horizontal scrollbar
+   */
+  totalVisibleColumns: PropTypes.number,
+
+  /**
+   * Function used to update the active cell coordinates
+   */
+  updateActiveCellCoordinates: PropTypes.func
 };

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

@@ -0,0 +1,11 @@
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+export { useMoveActiveCell } from './useMoveActiveCell';
+export { useMultipleKeyTracking } from './useMultipleKeyTracking';
+export { useResetSpreadsheetFocus } from './useResetSpreadsheetFocus';
+export { useSpreadsheetOutsideClick } from './useSpreadsheetOutsideClick';
+export { useSpreadsheetEdit } from './useSpreadsheetEdit';

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

@@ -0,0 +1,139 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { useEffect, useState } from 'react';
+import { usePreviousValue } from '../../../global/js/hooks';
+import { includesResourceKey } from '../utils/handleMultipleKeys';
+
+var hasFocus = function hasFocus() {
+  return typeof document !== 'undefined' && document.hasFocus();
+};
+
+export var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
+  var ref = _ref.ref,
+      containerHasFocus = _ref.containerHasFocus,
+      isEditing = _ref.isEditing;
+
+  var _useState = useState(''),
+      _useState2 = _slicedToArray(_useState, 2),
+      usingMac = _useState2[0],
+      setUsingMac = _useState2[1];
+
+  var _useState3 = useState(hasFocus),
+      _useState4 = _slicedToArray(_useState3, 2),
+      windowFocused = _useState4[0],
+      setWindowFocused = _useState4[1];
+
+  var _useState5 = useState([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      keysPressedList = _useState6[0],
+      setKeysPressedList = _useState6[1];
+
+  var previousState = usePreviousValue({
+    isEditing: isEditing,
+    windowFocused: windowFocused
+  }); // useEffect to check for window focus, if window loses focus
+  // we need to clear out the keysPressedList
+
+  useEffect(function () {
+    var userAgentString = window.navigator.userAgent;
+
+    if (userAgentString.includes('Macintosh')) {
+      setUsingMac(true);
+    } else {
+      setUsingMac(false);
+    }
+
+    setWindowFocused(hasFocus());
+
+    var onWindowFocus = function onWindowFocus() {
+      return setWindowFocused(true);
+    };
+
+    var onWindowBlur = function onWindowBlur() {
+      return setWindowFocused(false);
+    };
+
+    window.addEventListener('focus', onWindowFocus);
+    window.addEventListener('blur', onWindowBlur);
+    return function () {
+      window.removeEventListener('focus', onWindowFocus);
+      window.removeEventListener('blur', onWindowBlur);
+    };
+  }, []);
+  useEffect(function () {
+    if (containerHasFocus && !isEditing) {
+      ref.current.onkeydown = ref.current.onkeyup = function (event) {
+        // If keydown, we will add the new key to the keysPressedList array
+        if (event.type === 'keydown') {
+          // Prevent multiple keys of the same type being added to our keysPressedList array
+          if (keysPressedList.includes(event.code)) {
+            return;
+          } // Because keyup events are lost when using the Command key
+          // we need to remove the previously pressed keys so that we
+          // do not have keys in the pressed list that should not be
+
+
+          if (includesResourceKey(keysPressedList, usingMac) && keysPressedList.length > 1) {
+            var clonedKeys = _toConsumableArray(keysPressedList);
+
+            var filteredClonedKeys = clonedKeys.filter(function (item) {
+              return item === 'MetaLeft' || item === 'MetaRight';
+            });
+            filteredClonedKeys.push(event.code);
+            return setKeysPressedList(_toConsumableArray(new Set(filteredClonedKeys)));
+          }
+
+          var tempKeys = _toConsumableArray(keysPressedList);
+
+          tempKeys.push(event.code);
+          setKeysPressedList(_toConsumableArray(new Set(tempKeys)));
+        } // If keyup, we will remove the key from the keysPressedList array
+
+
+        if (event.type === 'keyup') {
+          var _tempKeys = _toConsumableArray(keysPressedList);
+
+          var filteredClone = _tempKeys.filter(function (item) {
+            return item !== event.code;
+          }); // Keyup events are lost on all other keys if a Meta key is used
+          // so to work around this behavior, we empty out all other keys
+          // from the keysPressedList array if we detect a Meta keyup event
+
+
+          if (event.code === 'MetaLeft' || event.code === 'MetaRight') {
+            return setKeysPressedList([]);
+          }
+
+          setKeysPressedList(_toConsumableArray(new Set(filteredClone)));
+        }
+      };
+    }
+
+    if (previousState !== null && previousState !== void 0 && previousState.windowFocused && !windowFocused) {
+      setKeysPressedList([]);
+    } // Remove handlers if the spreadsheet container loses focus
+    // or is currently in edit mode
+
+
+    if (!containerHasFocus || isEditing) {
+      ref.current.onkeydown = undefined;
+      ref.current.onkeyup = undefined;
+
+      if (!(previousState !== null && previousState !== void 0 && previousState.isEditing) && isEditing) {
+        setKeysPressedList([]);
+      }
+    }
+  }, [keysPressedList, containerHasFocus, ref, isEditing, previousState === null || previousState === void 0 ? void 0 : previousState.isEditing, windowFocused, previousState === null || previousState === void 0 ? void 0 : previousState.windowFocused, usingMac]);
+  return {
+    keysPressedList: keysPressedList,
+    windowFocused: windowFocused,
+    usingMac: usingMac
+  };
+};

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

@@ -7,8 +7,7 @@
 import { useEffect } from 'react';
 import { pkg } from '../../../settings';
 export var useResetSpreadsheetFocus = function useResetSpreadsheetFocus(_ref) {
-  var activeKeys = _ref.activeKeys,
-      _ref$blockClass = _ref.blockClass,
+  var _ref$blockClass = _ref.blockClass,
       blockClass = _ref$blockClass === void 0 ? "".concat(pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
       focusedElement = _ref.focusedElement,
       removeActiveCell = _ref.removeActiveCell,
@@ -18,11 +17,10 @@ export var useResetSpreadsheetFocus = function useResetSpreadsheetFocus(_ref) {
     if (!focusedElement.classList.contains("".concat(blockClass, "--interactive-cell-element"))) {
       setContainerHasFocus(false);
       removeActiveCell();
-      activeKeys.current = [];
     }
 
     if (focusedElement.classList.contains(blockClass) || focusedElement.classList.contains("".concat(blockClass, "--interactive-cell-element"))) {
       setContainerHasFocus(true);
     }
-  }, [focusedElement, removeActiveCell, activeKeys, blockClass, setContainerHasFocus]);
+  }, [focusedElement, removeActiveCell, blockClass, setContainerHasFocus]);
 };

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

@@ -0,0 +1,68 @@
+// /**
+//  * Copyright IBM Corp. 2022, 2022
+//  *
+//  * This source code is licensed under the Apache-2.0 license found in the
+//  * LICENSE file in the root directory of this source tree.
+//  */
+import { useEffect } from 'react';
+import { px } from '@carbon/layout';
+export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
+  var isEditing = _ref.isEditing,
+      rows = _ref.rows,
+      activeCellCoordinates = _ref.activeCellCoordinates,
+      activeCellRef = _ref.activeCellRef,
+      cellEditorRef = _ref.cellEditorRef,
+      cellEditorRulerRef = _ref.cellEditorRulerRef,
+      columns = _ref.columns,
+      defaultColumn = _ref.defaultColumn,
+      cellEditorValue = _ref.cellEditorValue;
+  useEffect(function () {
+    if (isEditing) {
+      var _rows$activeCellCoord, _cellProps$column, _cellEditorRef$curren;
+
+      var cellProps = (_rows$activeCellCoord = rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row]) === null || _rows$activeCellCoord === void 0 ? void 0 : _rows$activeCellCoord.cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column];
+      var activeCellLeftPosition = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.left;
+      var activeCellTopPosition = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.top;
+      cellEditorRef.current.style.left = activeCellLeftPosition;
+      cellEditorRef.current.style.top = activeCellTopPosition;
+      cellEditorRef.current.style.display = 'block';
+      cellEditorRef.current.style.width = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.width;
+      cellEditorRef.current.style.height = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height;
+      cellEditorRef.current.style.paddingTop = "".concat((parseInt(activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height) - 16) / 2 - 1, "px"); // calculate paddingTop based on cellHeight which could be variable depending on the cellSize prop
+
+      cellEditorRef.current.style.textAlign = (cellProps === null || cellProps === void 0 ? void 0 : (_cellProps$column = cellProps.column) === null || _cellProps$column === void 0 ? void 0 : _cellProps$column.placement) === 'right' ? 'right' : 'left';
+      (_cellEditorRef$curren = cellEditorRef.current) === null || _cellEditorRef$curren === void 0 ? void 0 : _cellEditorRef$curren.focus();
+      var rulerWidth = cellEditorRulerRef.current.offsetWidth;
+      var cellWidth = activeCellRef.current.offsetWidth;
+
+      if (rulerWidth >= cellWidth) {
+        var widthMultiplier = Math.floor(rulerWidth / cellWidth) + 1;
+        var startingColumnPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column;
+        var startingRowPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row;
+        var totalColumns = columns.length;
+        var totalRows = rows.length;
+        var totalMultiplierPossible = totalColumns - startingColumnPosition;
+        var totalCellEditorMaxHeight = (totalRows - startingRowPosition) * defaultColumn.rowHeight;
+        cellEditorRef.current.style.maxHeight = px(totalCellEditorMaxHeight);
+        cellEditorRef.current.style.width = px(cellWidth * (widthMultiplier <= totalMultiplierPossible ? widthMultiplier : totalMultiplierPossible));
+        cellEditorRef.current.style.height = px(cellEditorRef.current.scrollHeight); // adds dynamic height to cell editor
+        // Cell editor has reached max height, we need to add the scrolling back.
+        // We also need to subtract 1 to account for the fact that the cell editor
+        // is placed one pixel below the cell being edited to account for the border
+
+        if (cellEditorRef.current.clientHeight === totalCellEditorMaxHeight - 1) {
+          cellEditorRef.current.style.overflow = 'auto';
+        } else {
+          cellEditorRef.current.style.overflow = 'hidden';
+        }
+      }
+    }
+
+    if (!isEditing) {
+      cellEditorRef.current.style.overflow = 'hidden';
+      cellEditorRef.current.style.display = 'none';
+      cellEditorRef.current.blur();
+      activeCellRef.current.focus();
+    }
+  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, columns.length, defaultColumn, cellEditorValue, activeCellRef, cellEditorRef, cellEditorRulerRef]);
+};

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

@@ -16,7 +16,6 @@ export var useSpreadsheetOutsideClick = function useSpreadsheetOutsideClick(_ref
       setSelectionAreas = _ref.setSelectionAreas,
       removeActiveCell = _ref.removeActiveCell,
       setContainerHasFocus = _ref.setContainerHasFocus,
-      activeKeys = _ref.activeKeys,
       removeCellEditor = _ref.removeCellEditor;
   useEffect(function () {
     var handleOutsideClick = function handleOutsideClick(event) {
@@ -32,12 +31,11 @@ export var useSpreadsheetOutsideClick = function useSpreadsheetOutsideClick(_ref
       });
       setContainerHasFocus(false);
       removeCellEditor();
-      activeKeys.current = [];
     };
 
     document.addEventListener('click', handleOutsideClick);
     return function () {
       document.removeEventListener('click', handleOutsideClick);
     };
-  }, [spreadsheetRef, removeActiveCell, activeKeys, blockClass, setActiveCellCoordinates, setContainerHasFocus, setSelectionAreas, removeCellEditor]);
+  }, [spreadsheetRef, removeActiveCell, blockClass, setActiveCellCoordinates, setContainerHasFocus, setSelectionAreas, removeCellEditor]);
 };

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

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