@carbon/ibm-products 1.10.0 → 1.11.2

package/es/components/DataSpreadsheet/DataSpreadsheet.js

@@ -1,10 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _typeof from "@babel/runtime/helpers/typeof";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["cellSize", "className", "columns", "data", "id", "onActiveCellChange"];
+var _excluded = ["cellSize", "className", "columns", "data", "onDataUpdate", "id", "onActiveCellChange"];
 
 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; }
 
@@ -17,22 +17,28 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * LICENSE file in the root directory of this source tree.
  */
 // Import portions of React that are needed.
-import React, { useMemo, useRef, useEffect, useState, useCallback } from 'react';
+import React, { useMemo, useRef, useState, useCallback, useEffect } from 'react';
 import { useBlockLayout, useTable } from 'react-table'; // Other standard imports.
 
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { getDevtoolsProps } from '../../global/js/utils/devtools';
+import { TextArea } from 'carbon-components-react';
 import { pkg } from '../../settings';
-import { getScrollbarWidth } from '../../global/js/utils/getScrollbarWidth';
 import { DataSpreadsheetBody } from './DataSpreadsheetBody';
-import { getCellSize } from './getCellSize';
 import { DataSpreadsheetHeader } from './DataSpreadsheetHeader';
+import { getDevtoolsProps } from '../../global/js/utils/devtools';
+import { getScrollbarWidth } from '../../global/js/utils/getScrollbarWidth';
 import { useActiveElement } from '../../global/js/hooks';
-import { createActiveCellFn } from './createActiveCellFn';
 import { deepCloneObject } from '../../global/js/utils/deepCloneObject';
 import { usePreviousValue } from '../../global/js/hooks';
-import uuidv4 from '../../global/js/utils/uuidv4'; // cspell:words rowcount colcount
+import uuidv4 from '../../global/js/utils/uuidv4';
+import { useResetSpreadsheetFocus } from './hooks/useResetSpreadsheetFocus';
+import { useSpreadsheetOutsideClick } from './hooks/useSpreadsheetOutsideClick';
+import { useMoveActiveCell } from './hooks/useMoveActiveCell';
+import { createActiveCellFn } from './utils/createActiveCellFn';
+import { getCellSize } from './utils/getCellSize';
+import { handleMultipleKeys } from './utils/handleMultipleKeys';
+import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection'; // cspell:words rowcount colcount
 // The block part of our conventional BEM class names (blockClass__E--M).
 
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
@@ -41,7 +47,8 @@ var componentName = 'DataSpreadsheet'; // Default values for props
 var defaults = {
   cellSize: 'standard',
   columns: Object.freeze([]),
-  data: Object.freeze([])
+  data: Object.freeze([]),
+  onDataUpdate: Object.freeze(function () {})
 };
 /**
  * DataSpreadsheet: used to organize and display large amounts of structured data, separated by columns and rows in a grid-like format.
@@ -55,10 +62,14 @@ export var DataSpreadsheet = /*#__PURE__*/React.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$onDataUpdate = _ref.onDataUpdate,
+      onDataUpdate = _ref$onDataUpdate === void 0 ? defaults.onDataUpdate : _ref$onDataUpdate,
       id = _ref.id,
       onActiveCellChange = _ref.onActiveCellChange,
       rest = _objectWithoutProperties(_ref, _excluded);
 
+  var localRef = useRef();
+  var spreadsheetRef = ref || localRef;
   var focusedElement = useActiveElement();
 
   var _useState = useState(false),
@@ -86,12 +97,24 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       currentMatcher = _useState10[0],
       setCurrentMatcher = _useState10[1];
 
+  var _useState11 = useState(false),
+      _useState12 = _slicedToArray(_useState11, 2),
+      isEditing = _useState12[0],
+      setIsEditing = _useState12[1];
+
+  var _useState13 = useState(''),
+      _useState14 = _slicedToArray(_useState13, 2),
+      cellEditorValue = _useState14[0],
+      setCellEditorValue = _useState14[1];
+
   var previousState = usePreviousValue({
     activeCellCoordinates: activeCellCoordinates
   });
   var cellSizeValue = getCellSize(cellSize);
+  var cellEditorRef = useRef();
   var currentMatcherRef = useRef();
   var activeKeys = useRef([]);
+  var activeCellRef = useRef();
   var defaultColumn = useMemo(function () {
     return {
       width: 150,
@@ -113,28 +136,33 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       headerGroups = _useTable.headerGroups,
       rows = _useTable.rows,
       totalColumnsWidth = _useTable.totalColumnsWidth,
-      prepareRow = _useTable.prepareRow; // Reset everything when spreadsheet loses focus
+      prepareRow = _useTable.prepareRow; // Update the spreadsheet data after editing a cell
 
 
-  useEffect(function () {
-    if (!focusedElement.classList.contains("".concat(blockClass, "--interactive-cell-element"))) {
-      setContainerHasFocus(false);
-      removeActiveCell();
-      activeKeys.current = [];
-    }
+  var updateData = useCallback(function (rowIndex, columnId) {
+    onDataUpdate(function (prev) {
+      return prev.map(function (row, index) {
+        if (index === rowIndex) {
+          return _objectSpread(_objectSpread({}, prev[rowIndex]), {}, _defineProperty({}, columnId, cellEditorValue));
+        }
 
-    if (focusedElement.classList.contains(blockClass) || focusedElement.classList.contains("".concat(blockClass, "--interactive-cell-element"))) {
-      setContainerHasFocus(true);
-    }
-  }, [focusedElement, removeActiveCell]); // Removes the active cell element
+        return row;
+      });
+    });
+  }, [cellEditorValue, onDataUpdate]); // Removes the active cell element
 
   var removeActiveCell = useCallback(function () {
     var activeCellHighlight = spreadsheetRef.current.querySelector(".".concat(blockClass, "__active-cell--highlight"));
 
     if (activeCellHighlight) {
-      activeCellHighlight.remove();
+      activeCellHighlight.style.display = 'none';
     }
-  }, [spreadsheetRef]); // Removes the cell selection elements
+  }, [spreadsheetRef]);
+  var removeCellEditor = useCallback(function () {
+    setCellEditorValue('');
+    setIsEditing(false);
+    cellEditorRef.current.style.display = 'none';
+  }, []); // Removes the cell selection elements
 
   var removeCellSelections = useCallback(function (matcher) {
     if (matcher && typeof matcher === 'string') {
@@ -150,27 +178,21 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
         return element.remove();
       });
     }
-  }, [spreadsheetRef]); // Click outside useEffect
+  }, [spreadsheetRef]); // 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
 
   useEffect(function () {
-    var handleOutsideClick = function handleOutsideClick(event) {
-      if (!spreadsheetRef.current || spreadsheetRef.current.contains(event.target) || event.target.classList.contains("".concat(blockClass, "__active-cell--highlight"))) {
-        return;
-      }
+    var prevCoords = previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates;
 
-      setActiveCellCoordinates(null);
-      setSelectionAreas([]);
-      removeActiveCell();
-      removeCellSelections();
-      setContainerHasFocus(false);
-      activeKeys.current = [];
-    };
-
-    document.addEventListener('click', handleOutsideClick);
-    return function () {
-      document.removeEventListener('click', handleOutsideClick);
-    };
-  }, [spreadsheetRef, removeActiveCell, removeCellSelections]);
+    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)) && isEditing) {
+      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);
+    }
+  }, [activeCellCoordinates, previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates, updateData, rows, isEditing, removeCellEditor]);
+  var handleActiveCellMouseEnter = useCallback(function () {
+    handleActiveCellMouseEnterCallback(selectionAreas, clickAndHoldActive);
+  }, [clickAndHoldActive, selectionAreas, handleActiveCellMouseEnterCallback]);
   var createActiveCell = useCallback(function (_ref2) {
     var placementElement = _ref2.placementElement,
         coords = _ref2.coords,
@@ -178,11 +200,6 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
         addToHeader = _ref2$addToHeader === void 0 ? false : _ref2$addToHeader;
     var activeCellFullData = typeof (coords === null || coords === void 0 ? void 0 : coords.column) === 'number' && typeof (coords === null || coords === void 0 ? void 0 : coords.row) === 'number' ? rows[coords === null || coords === void 0 ? void 0 : coords.row].cells[coords === null || coords === void 0 ? void 0 : coords.column] : null;
     var activeCellValue = activeCellFullData ? Object.values(activeCellFullData.row.values)[coords === null || coords === void 0 ? void 0 : coords.column] : null;
-
-    var handleActiveCellMouseEnter = function handleActiveCellMouseEnter() {
-      handleActiveCellMouseEnterCallback(selectionAreas, clickAndHoldActive);
-    };
-
     var prevCoords = previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates; // Only create an active cell if the activeCellCoordinates have changed
 
     if ((prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row) !== (coords === null || coords === void 0 ? void 0 : coords.row) || (prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.column) !== (coords === null || coords === void 0 ? void 0 : coords.column)) {
@@ -194,10 +211,34 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
         blockClass: blockClass,
         onActiveCellChange: onActiveCellChange,
         activeCellValue: activeCellValue,
-        handleActiveCellMouseEnter: handleActiveCellMouseEnter
+        activeCellRef: activeCellRef,
+        cellEditorRef: cellEditorRef,
+        defaultColumn: defaultColumn
       });
     }
-  }, [spreadsheetRef, rows, onActiveCellChange, clickAndHoldActive, handleActiveCellMouseEnterCallback, selectionAreas, previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates]);
+  }, [spreadsheetRef, rows, onActiveCellChange, previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates, defaultColumn]);
+  useResetSpreadsheetFocus({
+    activeKeys: activeKeys,
+    focusedElement: focusedElement,
+    removeActiveCell: removeActiveCell,
+    setContainerHasFocus: setContainerHasFocus
+  });
+  useSpreadsheetOutsideClick({
+    spreadsheetRef: spreadsheetRef,
+    setActiveCellCoordinates: setActiveCellCoordinates,
+    setSelectionAreas: setSelectionAreas,
+    removeActiveCell: removeActiveCell,
+    removeCellSelections: removeCellSelections,
+    setContainerHasFocus: setContainerHasFocus,
+    activeKeys: activeKeys,
+    removeCellEditor: removeCellEditor
+  });
+  useMoveActiveCell({
+    spreadsheetRef: spreadsheetRef,
+    activeCellCoordinates: activeCellCoordinates,
+    containerHasFocus: containerHasFocus,
+    createActiveCell: createActiveCell
+  });
   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
@@ -229,75 +270,6 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       setCurrentMatcher(tempMatcher);
     }
   }, []);
-  var handleMultipleKeys = useCallback(function () {
-    var _selectionAreasClone$;
-
-    var activeKeyValues = activeKeys.current;
-    var selectionAreasClone = deepCloneObject(selectionAreas);
-    var indexOfCurrentArea = selectionAreasClone.findIndex(function (item) {
-      return item.matcher === currentMatcher;
-    });
-    var pointToUpdate = (_selectionAreasClone$ = selectionAreasClone[indexOfCurrentArea]) !== null && _selectionAreasClone$ !== void 0 && _selectionAreasClone$.point2 ? selectionAreasClone[indexOfCurrentArea].point2 : selectionAreasClone[indexOfCurrentArea].point1; // Down + Shift
-
-    if (activeKeyValues.includes('Shift') && activeKeyValues.includes('ArrowDown')) {
-      if (rows.length - 1 === pointToUpdate.row) {
-        return;
-      }
-
-      var newPoint = {
-        row: pointToUpdate.row + 1,
-        column: pointToUpdate.column
-      };
-      selectionAreasClone[indexOfCurrentArea].point2 = newPoint;
-      selectionAreasClone[indexOfCurrentArea].areaCreated = false;
-      setSelectionAreas(selectionAreasClone);
-    } // Right + Shift
-
-
-    if (activeKeyValues.includes('Shift') && activeKeyValues.includes('ArrowRight')) {
-      if (columns.length - 1 === pointToUpdate.column) {
-        return;
-      }
-
-      var _newPoint = {
-        row: pointToUpdate.row,
-        column: pointToUpdate.column + 1
-      };
-      selectionAreasClone[indexOfCurrentArea].point2 = _newPoint;
-      selectionAreasClone[indexOfCurrentArea].areaCreated = false;
-      setSelectionAreas(selectionAreasClone);
-    } // Up + Shift
-
-
-    if (activeKeyValues.includes('Shift') && activeKeyValues.includes('ArrowUp')) {
-      if (pointToUpdate.row === 0) {
-        return;
-      }
-
-      var _newPoint2 = {
-        row: pointToUpdate.row - 1,
-        column: pointToUpdate.column
-      };
-      selectionAreasClone[indexOfCurrentArea].point2 = _newPoint2;
-      selectionAreasClone[indexOfCurrentArea].areaCreated = false;
-      setSelectionAreas(selectionAreasClone);
-    } // Left + Shift
-
-
-    if (activeKeyValues.includes('Shift') && activeKeyValues.includes('ArrowLeft')) {
-      if (pointToUpdate.column === 0) {
-        return;
-      }
-
-      var _newPoint3 = {
-        row: pointToUpdate.row,
-        column: pointToUpdate.column - 1
-      };
-      selectionAreasClone[indexOfCurrentArea].point2 = _newPoint3;
-      selectionAreasClone[indexOfCurrentArea].areaCreated = false;
-      setSelectionAreas(selectionAreasClone);
-    }
-  }, [selectionAreas, currentMatcher, columns, rows]);
   var handleKeyPress = useCallback(function (event) {
     var _activeKeys$current, _activeKeys$current2;
 
@@ -308,15 +280,25 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     } // Prevent arrow keys, home key, and end key from scrolling the page when the data spreadsheet container has focus
 
 
-    if (['End', 'Home', 'ArrowLeft', 'ArrowUp', 'ArrowRight', 'ArrowDown'].indexOf(key) > -1) {
+    if (['End', 'Home', 'ArrowLeft', 'ArrowUp', 'ArrowRight', 'ArrowDown'].indexOf(key) > -1 && !isEditing) {
       event.preventDefault();
+    }
+
+    if (['Tab'].indexOf(key) > -1 && isEditing) {
+      return;
     } // Clear out all cell selection areas if user uses any arrow key, except if the shift key is being held
 
 
     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')) {
         setSelectionAreas([]);
-        removeCellSelections();
+        removeCellSelections({
+          spreadsheetRef: spreadsheetRef
+        });
       }
     } // Update list of activeKeys
 
@@ -328,7 +310,14 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     }
 
     if (((_activeKeys$current2 = activeKeys.current) === null || _activeKeys$current2 === void 0 ? void 0 : _activeKeys$current2.length) > 1) {
-      handleMultipleKeys();
+      handleMultipleKeys({
+        activeKeys: activeKeys,
+        selectionAreas: selectionAreas,
+        currentMatcher: currentMatcher,
+        rows: rows,
+        setSelectionAreas: setSelectionAreas,
+        columns: columns
+      });
     } // Allow arrow key navigation if there are less than two activeKeys OR
     // if one of the activeCellCoordinates is in a header position
 
@@ -340,6 +329,7 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
           {
             setSelectionAreas([]);
             removeActiveCell();
+            removeCellEditor();
             setContainerHasFocus(false);
             setActiveCellCoordinates(null);
             break;
@@ -483,11 +473,96 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
           }
       }
     }
-  }, [updateActiveCellCoordinates, handleInitialArrowPress, handleMultipleKeys, activeCellCoordinates, selectionAreas === null || selectionAreas === void 0 ? void 0 : selectionAreas.length, removeCellSelections, removeActiveCell, columns.length, rows.length]); // Only update if there are cell selection areas
+  }, [updateActiveCellCoordinates, handleInitialArrowPress, activeCellCoordinates, removeActiveCell, columns, rows, spreadsheetRef, currentMatcher, isEditing, removeCellEditor, removeCellSelections, selectionAreas]);
+
+  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);
+  }; // Go into edit mode if 'Enter' key is pressed on activeCellRef
+
+
+  var handleActiveCellKeyDown = function handleActiveCellKeyDown(event) {
+    var key = event.key;
+
+    if (key === 'Enter') {
+      if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) !== 'header') {
+        startEditMode();
+      }
+
+      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,
+          isKeyboard: true
+        }; // Select an entire column
+
+        if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header') {
+          handleHeaderCellSelection(_objectSpread({
+            type: 'column'
+          }, handleHeaderCellProps));
+        } // Select an entire row
+
+
+        if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
+          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 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);
+    };
+
+    if (key === 'Enter') {
+      submitEditChanges();
+      setActiveCellCoordinates(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          row: prev.row === rows.length - 1 ? prev.row : prev.row + 1 // do not move to next cell below if we're already in the last row
+
+        });
+      });
+    }
+
+    if (key === 'Tab') {
+      event.preventDefault();
+      submitEditChanges();
+      setActiveCellCoordinates(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          column: prev.column === columns.length - 1 ? prev.column : prev.column + 1 // do not move to next cell below if we're already in the last column
+
+        });
+      });
+    }
+
+    return;
+  }; // 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) {
     var freshMatcherValue = currentMatcherRef.current;
 
@@ -509,28 +584,41 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
         if (_typeof(selectionAreaClone[indexOfItemToUpdate].point2) === 'object' && selectionAreaClone[indexOfItemToUpdate].areaCreated) {
           selectionAreaClone[indexOfItemToUpdate].point2 = null;
           selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
-          removeCellSelections(freshMatcherValue);
+          removeCellSelections({
+            matcher: freshMatcherValue,
+            spreadsheetRef: spreadsheetRef
+          });
           return selectionAreaClone;
         }
 
         return prev;
       });
     }
-  }, [removeCellSelections]); // Adds active cell highlight to correct cell onKeyDown
-
+  }, [spreadsheetRef, removeCellSelections]);
   useEffect(function () {
-    var activeCellPlacementElement = spreadsheetRef === null || spreadsheetRef === void 0 ? void 0 : spreadsheetRef.current.querySelector("[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, "\"]"));
-    var shouldPlaceActiveCellInHeader = (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' && true;
-    var selectAllElement = spreadsheetRef === null || spreadsheetRef === void 0 ? void 0 : spreadsheetRef.current.querySelector("[data-row-index=\"header\"][data-column-index=\"header\"]");
-
-    if (containerHasFocus) {
-      createActiveCell({
-        placementElement: activeCellCoordinates ? activeCellPlacementElement : selectAllElement,
-        coords: activeCellCoordinates,
-        addToHeader: shouldPlaceActiveCellInHeader
-      });
+    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, "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();
+    }
+
+    if (!isEditing) {
+      cellEditorRef.current.style.display = 'none';
+      cellEditorRef.current.blur();
+      activeCellRef.current.focus();
     }
-  }, [activeCellCoordinates, spreadsheetRef, createActiveCell, containerHasFocus]);
+  }, [isEditing, activeCellCoordinates, rows]);
 
   var handleKeyUp = function handleKeyUp(event) {
     var _activeKeys$current3;
@@ -547,8 +635,6 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     }
   };
 
-  var localRef = useRef();
-  var spreadsheetRef = ref || localRef;
   return /*#__PURE__*/React.createElement("div", _extends({}, rest, getTableProps(), getDevtoolsProps(componentName), {
     className: cx(blockClass, className, _defineProperty({}, "".concat(blockClass, "__container-has-focus"), containerHasFocus)),
     ref: spreadsheetRef,
@@ -562,14 +648,20 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       return setContainerHasFocus(true);
     }
   }), /*#__PURE__*/React.createElement(DataSpreadsheetHeader, {
+    ref: spreadsheetRef,
     activeCellCoordinates: activeCellCoordinates,
     cellSizeValue: cellSizeValue,
+    columns: columns,
     defaultColumn: defaultColumn,
     headerGroups: headerGroups,
-    selectionAreas: selectionAreas
+    rows: rows,
+    selectionAreas: selectionAreas,
+    setActiveCellCoordinates: setActiveCellCoordinates,
+    setSelectionAreas: setSelectionAreas,
+    setCurrentMatcher: setCurrentMatcher
   }), /*#__PURE__*/React.createElement(DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
-    ref: currentMatcherRef,
+    ref: spreadsheetRef,
     clickAndHoldActive: clickAndHoldActive,
     setClickAndHoldActive: setClickAndHoldActive,
     currentMatcher: currentMatcher,
@@ -586,7 +678,25 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     setActiveCellCoordinates: setActiveCellCoordinates,
     scrollBarSize: scrollBarSize,
     totalColumnsWidth: totalColumnsWidth,
-    id: id
+    id: id,
+    columns: columns
+  }), /*#__PURE__*/React.createElement("button", {
+    onKeyDown: handleActiveCellKeyDown,
+    onMouseEnter: handleActiveCellMouseEnter,
+    onDoubleClick: handleActiveCellDoubleClick,
+    ref: activeCellRef,
+    className: cx("".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__active-cell--highlight")),
+    type: "button"
+  }), /*#__PURE__*/React.createElement(TextArea, {
+    value: cellEditorValue,
+    onKeyDown: handleEditSubmit,
+    onChange: function onChange(event) {
+      return setCellEditorValue(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: cx("".concat(blockClass, "__cell-editor"), "".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__cell-editor--").concat(cellSize), _defineProperty({}, "".concat(blockClass, "__cell-editor--active"), isEditing))
   }));
 }); // Return a placeholder if not released and not enabled by feature flag
 
@@ -631,7 +741,12 @@ DataSpreadsheet.propTypes = {
   /**
    * The event handler that is called when the active cell changes
    */
-  onActiveCellChange: PropTypes.func
+  onActiveCellChange: PropTypes.func,
+
+  /**
+   * The setter fn for the data prop
+   */
+  onDataUpdate: PropTypes.func
   /* TODO: add types and DocGen for all props. */
 
 };