@carbon/ibm-products 1.17.0 → 1.18.2

package/es/components/DataSpreadsheet/DataSpreadsheet.js

@@ -17,7 +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'; // Other standard imports.
+import { useBlockLayout, useTable, useColumnOrder } from 'react-table'; // Other standard imports.
 
 import PropTypes from 'prop-types';
 import cx from 'classnames';
@@ -46,7 +46,7 @@ var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
 var componentName = 'DataSpreadsheet'; // Default values for props
 
 var defaults = {
-  cellSize: 'standard',
+  cellSize: 'sm',
   columns: Object.freeze([]),
   data: Object.freeze([]),
   defaultEmptyRowCount: 16,
@@ -125,8 +125,13 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
 
   var _useState17 = useState(false),
       _useState18 = _slicedToArray(_useState17, 2),
-      activeCellInsideSelectionArea = _useState18[0],
-      setActiveCellInsideSelectionArea = _useState18[1];
+      headerCellHoldActive = _useState18[0],
+      setHeaderCellHoldActive = _useState18[1];
+
+  var _useState19 = useState(false),
+      _useState20 = _slicedToArray(_useState19, 2),
+      activeCellInsideSelectionArea = _useState20[0],
+      setActiveCellInsideSelectionArea = _useState20[1];
 
   var previousState = usePreviousValue({
     activeCellCoordinates: activeCellCoordinates,
@@ -135,10 +140,10 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
   var cellSizeValue = getCellSize(cellSize);
   var cellEditorRef = useRef();
 
-  var _useState19 = useState(),
-      _useState20 = _slicedToArray(_useState19, 2),
-      activeCellContent = _useState20[0],
-      setActiveCellContent = _useState20[1];
+  var _useState21 = useState(),
+      _useState22 = _slicedToArray(_useState21, 2),
+      activeCellContent = _useState22[0],
+      setActiveCellContent = _useState22[1];
 
   var activeCellRef = useRef();
   var cellEditorRulerRef = useRef();
@@ -166,13 +171,15 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     columns: columns,
     data: data,
     defaultColumn: defaultColumn
-  }, useBlockLayout),
+  }, useBlockLayout, useColumnOrder),
       getTableProps = _useTable.getTableProps,
       getTableBodyProps = _useTable.getTableBodyProps,
       headerGroups = _useTable.headerGroups,
       rows = _useTable.rows,
       totalColumnsWidth = _useTable.totalColumnsWidth,
-      prepareRow = _useTable.prepareRow; // Update the spreadsheet data after editing a cell
+      prepareRow = _useTable.prepareRow,
+      setColumnOrder = _useTable.setColumnOrder,
+      visibleColumns = _useTable.visibleColumns; // Update the spreadsheet data after editing a cell
 
 
   var updateData = useCallback(function (rowIndex, columnId) {
@@ -575,8 +582,9 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
 
   var startEditMode = function startEditMode() {
     setIsEditing(true);
+    setClickAndHoldActive(false);
     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;
+    var activeCellValue = activeCellFullData ? activeCellFullData.row.cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column].value : null;
     setCellEditorValue(activeCellValue);
     cellEditorRulerRef.current.textContent = activeCellValue;
     cellEditorRef.current.style.width = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.width;
@@ -700,7 +708,7 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     activeCellRef: activeCellRef,
     cellEditorRef: cellEditorRef,
     cellEditorRulerRef: cellEditorRulerRef,
-    columns: columns,
+    visibleColumns: visibleColumns,
     defaultColumn: defaultColumn,
     cellEditorValue: cellEditorValue
   });
@@ -770,7 +778,10 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     setCurrentMatcher: setCurrentMatcher,
     setSelectionAreaData: setSelectionAreaData,
     totalVisibleColumns: totalVisibleColumns,
-    updateActiveCellCoordinates: updateActiveCellCoordinates
+    updateActiveCellCoordinates: updateActiveCellCoordinates,
+    setHeaderCellHoldActive: setHeaderCellHoldActive,
+    headerCellHoldActive: headerCellHoldActive,
+    visibleColumns: visibleColumns
   }), /*#__PURE__*/React.createElement(DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
     ref: spreadsheetRef,
@@ -799,7 +810,10 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     columns: columns,
     defaultEmptyRowCount: defaultEmptyRowCount,
     setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea,
-    totalVisibleColumns: totalVisibleColumns
+    totalVisibleColumns: totalVisibleColumns,
+    setHeaderCellHoldActive: setHeaderCellHoldActive,
+    setColumnOrder: setColumnOrder,
+    visibleColumns: visibleColumns
   }), /*#__PURE__*/React.createElement("button", {
     onMouseDown: handleActiveCellMouseDown,
     onClick: handleActiveCellClick,
@@ -850,7 +864,7 @@ DataSpreadsheet.propTypes = {
   /**
    * Specifies the cell height
    */
-  cellSize: PropTypes.oneOf(['compact', 'standard', 'medium', 'large']),
+  cellSize: PropTypes.oneOf(['xs', 'sm', 'md', 'lg']),
 
   /**
    * Provide an optional class to be applied to the containing node.

package/es/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 
 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; }
 
@@ -12,7 +13,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * 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 React, { useRef, useCallback, useEffect, forwardRef } from 'react';
+import React, { useRef, useCallback, useEffect, forwardRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { FixedSizeList } from 'react-window';
 import cx from 'classnames';
@@ -27,6 +28,7 @@ import { checkActiveHeaderCell } from './utils/checkActiveHeaderCell';
 import { checkSelectedHeaderCell } from './utils/checkSelectedHeaderCell';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection';
 import { getSpreadsheetWidth } from './utils/getSpreadsheetWidth';
+import { useSpreadsheetMouseUp } from './hooks';
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
 export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var columns = _ref.columns,
@@ -53,11 +55,21 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       setCurrentMatcher = _ref.setCurrentMatcher,
       onSelectionAreaChange = _ref.onSelectionAreaChange,
       setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea,
-      totalVisibleColumns = _ref.totalVisibleColumns;
+      totalVisibleColumns = _ref.totalVisibleColumns,
+      setHeaderCellHoldActive = _ref.setHeaderCellHoldActive,
+      setColumnOrder = _ref.setColumnOrder,
+      visibleColumns = _ref.visibleColumns;
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      validStartingPoint = _useState2[0],
+      setValidStartingPoint = _useState2[1];
+
   var contentScrollRef = useRef();
   var previousState = usePreviousValue({
     selectionAreaData: selectionAreaData,
-    clickAndHoldActive: clickAndHoldActive
+    clickAndHoldActive: clickAndHoldActive,
+    rowHeight: defaultColumn.rowHeight
   }); // Set custom css property containing the spreadsheet total width
 
   useEffect(function () {
@@ -115,18 +127,18 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
             ref: ref,
             area: area,
             blockClass: blockClass,
-            columns: columns,
             defaultColumn: defaultColumn,
             selectionAreas: selectionAreas,
             setSelectionAreas: setSelectionAreas,
-            setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea
+            setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea,
+            visibleColumns: visibleColumns
           });
         }
 
         return;
       });
     }
-  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData, ref, activeCellCoordinates, setActiveCellInsideSelectionArea, columns]);
+  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData, ref, activeCellCoordinates, setActiveCellInsideSelectionArea, visibleColumns]);
 
   var populateSelectionAreaCellData = function populateSelectionAreaCellData(_ref2) {
     var rowStart = _ref2.rowStart,
@@ -137,61 +149,74 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
     for (var rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {
       for (var columnIndex = columnStart; columnIndex <= columnEnd; columnIndex++) {
-        cellContainer.push([rowIndex, columnIndex]);
+        cellContainer.push([rowIndex, columnIndex, "".concat(blockClass, "__cell--").concat(rowIndex, "--").concat(columnIndex)]);
       }
     }
 
     return cellContainer;
-  }; // Mouse up
+  };
 
+  useSpreadsheetMouseUp({
+    currentMatcher: currentMatcher,
+    setClickAndHoldActive: setClickAndHoldActive,
+    setSelectionAreas: setSelectionAreas,
+    setValidStartingPoint: setValidStartingPoint,
+    validStartingPoint: validStartingPoint,
+    ref: ref,
+    setHeaderCellHoldActive: setHeaderCellHoldActive,
+    setColumnOrder: setColumnOrder,
+    visibleColumns: visibleColumns,
+    setActiveCellCoordinates: setActiveCellCoordinates,
+    rows: rows,
+    activeCellCoordinates: activeCellCoordinates,
+    defaultColumn: defaultColumn
+  }); // Make sure that if the cellSize prop changes, the active
+  // cell also gets updated with the new size and new top placement
+  // value. All of the cell selections will be updated as well
 
   useEffect(function () {
-    var handleMouseUp = function handleMouseUp(event) {
-      setClickAndHoldActive(false);
-      var cellButton = event.target.closest(".".concat(blockClass, "__body--td"));
-
-      if (cellButton) {
-        var endCellCoordinates = {
-          row: Number(cellButton.getAttribute('data-row-index')),
-          column: Number(cellButton.getAttribute('data-column-index'))
-        };
-        setSelectionAreas(function (prev) {
-          var selectionAreaClone = deepCloneObject(prev);
-          var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
-            return item.matcher === currentMatcher;
-          }); // No items in the array have an object that matches the value of currentMatcher
+    var listContainer = spreadsheetBodyRef === null || spreadsheetBodyRef === void 0 ? void 0 : spreadsheetBodyRef.current;
+    var activeCellButton = listContainer.querySelector(".".concat(blockClass, "__active-cell--highlight"));
 
-          if (indexOfItemToUpdate === -1) {
-            return prev;
-          }
+    if (activeCellButton && defaultColumn.rowHeight !== previousState.rowHeight) {
+      activeCellButton.style.height = "".concat(defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight, "px");
 
-          selectionAreaClone[indexOfItemToUpdate].point2 = endCellCoordinates;
-          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
-          return selectionAreaClone;
-        });
-      }
-    };
+      if (activeCellCoordinates) {
+        var activeTargetElement = ref.current.querySelector("[data-row-index=\"".concat(activeCellCoordinates.row, "\"][data-column-index=\"").concat(activeCellCoordinates.column, "\"]"));
 
-    document.addEventListener('mouseup', handleMouseUp);
-    return function () {
-      document.removeEventListener('mouseup', handleMouseUp);
-    };
-  }, [selectionAreas, currentMatcher, setSelectionAreas, setClickAndHoldActive, setCurrentMatcher, ref]); // Make sure that if the cellSize prop changes, the active
-  // cell also gets updated with the new size
+        var _listContainer = ref.current.querySelector(".".concat(blockClass, "__list--container"));
 
-  useEffect(function () {
-    var listContainer = spreadsheetBodyRef === null || spreadsheetBodyRef === void 0 ? void 0 : spreadsheetBodyRef.current;
-    var activeCellButton = listContainer.querySelector(".".concat(blockClass, "__active-cell--highlight"));
+        var newActiveCellTopPosition = activeTargetElement.getBoundingClientRect().top - _listContainer.getBoundingClientRect().top;
 
-    if (activeCellButton) {
-      activeCellButton.style.height = "".concat(defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight, "px");
+        activeCellButton.style.top = px(newActiveCellTopPosition);
+        removeCellSelections({
+          spreadsheetRef: ref
+        });
+        selectionAreas.map(function (area) {
+          if (!area.areaCreated && area.point1 && area.point2 && area.matcher) {
+            return createCellSelectionArea({
+              ref: ref,
+              area: area,
+              blockClass: blockClass,
+              defaultColumn: defaultColumn,
+              selectionAreas: selectionAreas,
+              setSelectionAreas: setSelectionAreas,
+              setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea,
+              visibleColumns: visibleColumns
+            });
+          }
+        });
+      }
     }
-  }, [defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight]); // onClick fn for each cell in the data spreadsheet body,
+  }, [defaultColumn, ref, activeCellCoordinates, previousState === null || previousState === void 0 ? void 0 : previousState.rowHeight, selectionAreas, setActiveCellInsideSelectionArea, setSelectionAreas, visibleColumns]); // onClick fn for each cell in the data spreadsheet body,
   // adds the active cell highlight
 
   var handleBodyCellClick = useCallback(function (cell, columnIndex) {
     return function (event) {
       event.preventDefault();
+      var closestBodyCell = event.target.closest(".".concat(blockClass, "__body--td"));
+      var isValidSelectionAreaStart = closestBodyCell.classList.contains("".concat(blockClass, "__body--td"));
+      setValidStartingPoint(isValidSelectionAreaStart);
       var isHoldingCommandKey = event.metaKey || event.ctrlKey;
       var isHoldingShiftKey = event.shiftKey;
       setContainerHasFocus(true);
@@ -375,6 +400,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
           width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
         }
       }, index + 1)), row.cells.map(function (cell, index) {
+        var _cell$column;
+
         return /*#__PURE__*/React.createElement("div", _extends({
           key: "cell_".concat(index),
           "aria-colindex": index + 1
@@ -382,7 +409,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
           role: "gridcell",
           style: _objectSpread(_objectSpread({}, cell.getCellProps().style), {}, {
             display: 'grid',
-            minWidth: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width
+            minWidth: (cell === null || cell === void 0 ? void 0 : (_cell$column = cell.column) === null || _cell$column === void 0 ? void 0 : _cell$column.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width)
           })
         }), /*#__PURE__*/React.createElement("button", {
           id: "".concat(blockClass, "__cell--").concat(cell.row.index, "--").concat(index),
@@ -411,7 +438,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       scrollBarSizeValue: scrollBarSize,
       totalVisibleColumns: totalVisibleColumns,
       defaultColumn: defaultColumn,
-      totalColumnsWidth: totalColumnsWidth
+      totalColumnsWidth: totalColumnsWidth,
+      visibleColumns: visibleColumns
     }),
     outerRef: contentScrollRef
   }, rows !== null && rows !== void 0 && rows.length ? RenderRow : RenderEmptyRows));
@@ -524,6 +552,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setClickAndHoldActive: PropTypes.func,
 
+  /**
+   * Setter fn for column ordering, provided from react-table
+   */
+  setColumnOrder: PropTypes.func,
+
   /**
    * Setter fn for containerHasFocus state value
    */
@@ -534,6 +567,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setCurrentMatcher: PropTypes.func,
 
+  /**
+   * Setter fn for header cell hold active value
+   */
+  setHeaderCellHoldActive: PropTypes.func,
+
   /**
    * Setter fn for selectionAreaData state value
    */
@@ -553,5 +591,10 @@ DataSpreadsheetBody.propTypes = {
    * The total number of columns to be initially visible, additional columns will be rendered and
    * visible via horizontal scrollbar
    */
-  totalVisibleColumns: PropTypes.number
+  totalVisibleColumns: PropTypes.number,
+
+  /**
+   * Prop from react-table used to reorder columns
+   */
+  visibleColumns: PropTypes.array
 };

package/es/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -15,6 +15,7 @@ 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';
@@ -22,6 +23,7 @@ import { checkSelectedHeaderCell } from './utils/checkSelectedHeaderCell';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection';
 import { selectAllCells } from './utils/selectAllCells';
 import { getSpreadsheetWidth } from './utils/getSpreadsheetWidth';
+import { useSpreadsheetMouseMove } from './hooks';
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
 export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var activeCellCoordinates = _ref.activeCellCoordinates,
@@ -37,13 +39,21 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
       setSelectionAreaData = _ref.setSelectionAreaData,
       rows = _ref.rows,
       totalVisibleColumns = _ref.totalVisibleColumns,
-      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates,
+      setHeaderCellHoldActive = _ref.setHeaderCellHoldActive,
+      headerCellHoldActive = _ref.headerCellHoldActive,
+      visibleColumns = _ref.visibleColumns;
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
       scrollBarSizeValue = _useState2[0],
       setScrollBarSizeValue = _useState2[1];
 
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selectedHeaderReorderActive = _useState4[0],
+      setSelectedHeaderReorderActive = _useState4[1];
+
   var previousState = usePreviousValue({
     cellSize: cellSize
   });
@@ -89,6 +99,39 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
     });
   };
 
+  var handleHeaderMouseDown = function handleHeaderMouseDown(index) {
+    return function (event) {
+      var _selectionAreaToClone;
+
+      setSelectedHeaderReorderActive(true);
+      var clickXPosition = event.clientX;
+      var headerButtonCoords = event.target.getBoundingClientRect();
+      var offsetXValue = clickXPosition - headerButtonCoords.left;
+      var bodyContainer = document.querySelector(".".concat(blockClass, "__list--container")).firstElementChild;
+      var selectionAreaToClone = selectionAreas.filter(function (item) {
+        var _item$header;
+
+        return (item === null || item === void 0 ? void 0 : (_item$header = item.header) === null || _item$header === void 0 ? void 0 : _item$header.index) === index;
+      });
+      var selectionAreaElement = ref.current.querySelector("[data-matcher-id=\"".concat((_selectionAreaToClone = selectionAreaToClone[0]) === null || _selectionAreaToClone === void 0 ? void 0 : _selectionAreaToClone.matcher, "\"]"));
+      var selectionAreaClonedElement = selectionAreaElement.cloneNode();
+      var reorderIndicatorLine = selectionAreaElement.cloneNode();
+      reorderIndicatorLine.className = "".concat(blockClass, "__reorder-indicator-line");
+      reorderIndicatorLine.style.width = px(2);
+      selectionAreaClonedElement.classList.add("".concat(blockClass, "__selection-area--element-cloned"));
+      selectionAreaClonedElement.setAttribute('data-clone-offset-x', offsetXValue);
+      selectionAreaClonedElement.setAttribute('data-column-index-original', index);
+      bodyContainer.appendChild(selectionAreaClonedElement);
+      bodyContainer.appendChild(reorderIndicatorLine);
+      setHeaderCellHoldActive(true);
+    };
+  };
+
+  useSpreadsheetMouseMove({
+    ref: ref,
+    headerCellHoldActive: headerCellHoldActive,
+    defaultColumn: defaultColumn
+  });
   return /*#__PURE__*/React.createElement("div", {
     className: cx("".concat(blockClass, "__header--container")),
     role: "rowgroup"
@@ -102,7 +145,8 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
           headerGroup: headerGroup,
           scrollBarSizeValue: scrollBarSizeValue,
           totalVisibleColumns: totalVisibleColumns,
-          defaultColumn: defaultColumn
+          defaultColumn: defaultColumn,
+          visibleColumns: visibleColumns
         }),
         overflow: 'hidden'
       }),
@@ -125,6 +169,7 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
     }, "\xA0")), headerGroup.headers.map(function (column, index) {
       var _cx2;
 
+      var selectedHeader = checkSelectedHeaderCell(index, selectionAreas, 'column');
       return /*#__PURE__*/React.createElement("div", _extends({
         key: "column_".concat(index),
         role: "columnheader",
@@ -134,12 +179,16 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
         "data-row-index": "header",
         "data-column-index": index,
         tabIndex: -1,
-        onClick: handleColumnHeaderClick(index),
+        onMouseDown: selectedHeader ? handleHeaderMouseDown(index) : null,
+        onMouseUp: selectedHeader ? function () {
+          return setSelectedHeaderReorderActive(false);
+        } : null,
+        onClick: !selectedHeader ? handleColumnHeaderClick(index) : null,
         style: {
           height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
           width: (column === null || column === void 0 ? void 0 : column.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width)
         },
-        className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (_cx2 = {}, _defineProperty(_cx2, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || checkActiveHeaderCell(index, selectionAreas, 'column')), _defineProperty(_cx2, "".concat(blockClass, "__th--selected-header"), checkSelectedHeaderCell(index, selectionAreas, 'column')), _cx2)),
+        className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (_cx2 = {}, _defineProperty(_cx2, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || checkActiveHeaderCell(index, selectionAreas, 'column')), _defineProperty(_cx2, "".concat(blockClass, "__th--selected-header"), selectedHeader), _defineProperty(_cx2, "".concat(blockClass, "__th--selected-header-reorder-active"), selectedHeaderReorderActive), _cx2)),
         type: "button"
       }, column.render('Header')));
     }));
@@ -157,7 +206,7 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Specifies the cell height
    */
-  cellSize: PropTypes.oneOf(['compact', 'standard', 'medium', 'large']),
+  cellSize: PropTypes.oneOf(['xs', 'sm', 'md', 'lg']),
 
   /**
    * All of the spreadsheet columns
@@ -173,6 +222,11 @@ DataSpreadsheetHeader.propTypes = {
     width: PropTypes.number
   }),
 
+  /**
+   * Whether or not a click/hold is active on a header cell
+   */
+  headerCellHoldActive: PropTypes.bool,
+
   /**
    * Headers provided from useTable hook
    */
@@ -203,6 +257,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   setCurrentMatcher: PropTypes.func,
 
+  /**
+   * Setter fn for header cell hold active value
+   */
+  setHeaderCellHoldActive: PropTypes.func,
+
   /**
    * Setter fn for selectionAreaData state value
    */
@@ -222,5 +281,10 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Function used to update the active cell coordinates
    */
-  updateActiveCellCoordinates: PropTypes.func
+  updateActiveCellCoordinates: PropTypes.func,
+
+  /**
+   * Array of visible columns provided by react-table useTable hook
+   */
+  visibleColumns: PropTypes.array
 };

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

@@ -8,4 +8,6 @@ export { useMoveActiveCell } from './useMoveActiveCell';
 export { useMultipleKeyTracking } from './useMultipleKeyTracking';
 export { useResetSpreadsheetFocus } from './useResetSpreadsheetFocus';
 export { useSpreadsheetOutsideClick } from './useSpreadsheetOutsideClick';
-export { useSpreadsheetEdit } from './useSpreadsheetEdit';
+export { useSpreadsheetEdit } from './useSpreadsheetEdit';
+export { useSpreadsheetMouseUp } from './useSpreadsheetMouseUp';
+export { useSpreadsheetMouseMove } from './useSpreadsheetMouseMove';

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

@@ -1,10 +1,11 @@
 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.
-//  */
+
+/**
+ * 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 { px } from '@carbon/layout';
 import { pkg } from '../../../settings';
@@ -16,7 +17,7 @@ export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
       activeCellRef = _ref.activeCellRef,
       cellEditorRef = _ref.cellEditorRef,
       cellEditorRulerRef = _ref.cellEditorRulerRef,
-      columns = _ref.columns,
+      visibleColumns = _ref.visibleColumns,
       defaultColumn = _ref.defaultColumn,
       cellEditorValue = _ref.cellEditorValue,
       _ref$blockClass = _ref.blockClass,
@@ -55,9 +56,9 @@ export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
       (_cellEditorRef$curren = cellEditorRef.current) === null || _cellEditorRef$curren === void 0 ? void 0 : _cellEditorRef$curren.focus();
 
       if (rulerWidth < cellEditorCurrentWidth) {
-        var _columns$nextIndex;
+        var _visibleColumns$nextI;
 
-        var currentColumnWidth = ((_columns$nextIndex = columns[nextIndex]) === null || _columns$nextIndex === void 0 ? void 0 : _columns$nextIndex.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width); // If the contents of the cell editor is deleted past the point of the next column
+        var currentColumnWidth = ((_visibleColumns$nextI = visibleColumns[nextIndex]) === null || _visibleColumns$nextI === void 0 ? void 0 : _visibleColumns$nextI.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width); // If the contents of the cell editor is deleted past the point of the next column
 
         if (rulerWidth < cellEditorCurrentWidth - currentColumnWidth) {
           cellEditorRef.current.style.width = px(parseInt(cellEditorRef.current.style.width) - currentColumnWidth);
@@ -73,17 +74,17 @@ export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
       }
 
       if (rulerWidth >= cellEditorCurrentWidth) {
-        var _columns;
+        var _visibleColumns;
 
         setNextIndex(function (prev) {
-          if (prev === columns.length - 1) {
+          if (prev === visibleColumns.length - 1) {
             return prev;
           }
 
           return prev + 1;
         });
-        var onLastColumnIndex = nextIndex + 1 === columns.length;
-        var nextColumnWidth = onLastColumnIndex ? 0 : ((_columns = columns[nextIndex + 1]) === null || _columns === void 0 ? void 0 : _columns.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width);
+        var onLastColumnIndex = nextIndex + 1 === visibleColumns.length;
+        var nextColumnWidth = onLastColumnIndex ? 0 : ((_visibleColumns = visibleColumns[nextIndex + 1]) === null || _visibleColumns === void 0 ? void 0 : _visibleColumns.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width);
         var startingRowPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row;
         var totalRows = rows.length;
         var totalCellEditorMaxHeight = (totalRows - startingRowPosition) * defaultColumn.rowHeight;
@@ -109,5 +110,5 @@ export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
       activeCellRef.current.focus();
       setNextIndex(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column);
     }
-  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, columns.length, defaultColumn, activeCellRef, cellEditorRef, cellEditorRulerRef, columns, blockClass, previousState === null || previousState === void 0 ? void 0 : previousState.cellEditorValue, nextIndex]);
+  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, defaultColumn, activeCellRef, cellEditorRef, cellEditorRulerRef, visibleColumns, blockClass, previousState === null || previousState === void 0 ? void 0 : previousState.cellEditorValue, nextIndex]);
 };