@carbon/ibm-products 1.17.0 → 1.18.0

package/es/components/AddSelect/AddSelectColumn.js

@@ -11,14 +11,17 @@ var _excluded = ["columnInputPlaceholder", "filteredItems", "header", "multiSele
 //
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { TextInput, Tag, OverflowMenu, OverflowMenuItem, Checkbox } from 'carbon-components-react';
-import { Filter32, ArrowsVertical32, ArrowUp16, ArrowDown16 } from '@carbon/icons-react';
+import { TextInput, Tag, OverflowMenu, Checkbox } from 'carbon-components-react';
+import { Filter32 } from '@carbon/icons-react';
 import { pkg, carbon } from '../../settings';
 import { AddSelectList } from './AddSelectList';
+import { AddSelectSort } from './AddSelectSort';
+import { sortItems, getSortBy } from './add-select-utils';
+import { useItemSort } from './hooks/useItemSort';
 import uuidv4 from '../../global/js/utils/uuidv4';
 var componentName = 'AddSelect';
 export var AddSelectColumn = function AddSelectColumn(_ref) {
-  var _filteredItems$find, _filteredItems$find2;
+  var _filteredItems$find;
 
   var columnInputPlaceholder = _ref.columnInputPlaceholder,
       filteredItems = _ref.filteredItems,
@@ -37,20 +40,16 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
       searchTerm = _useState4[0],
       setSearchTerm = _useState4[1];
 
-  var _useState5 = useState(''),
-      _useState6 = _slicedToArray(_useState5, 2),
-      sortDirection = _useState6[0],
-      setSortDirection = _useState6[1];
-
-  var _useState7 = useState(''),
-      _useState8 = _slicedToArray(_useState7, 2),
-      sortAttribute = _useState8[0],
-      setSortAttribute = _useState8[1];
+  var _useItemSort = useItemSort(),
+      sortDirection = _useItemSort.sortDirection,
+      setSortDirection = _useItemSort.setSortDirection,
+      sortAttribute = _useItemSort.sortAttribute,
+      setSortAttribute = _useItemSort.setSortAttribute;
 
-  var _useState9 = useState([]),
-      _useState10 = _slicedToArray(_useState9, 2),
-      filters = _useState10[0],
-      setFilters = _useState10[1];
+  var _useState5 = useState([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      filters = _useState6[0],
+      setFilters = _useState6[1];
 
   var blockClass = "".concat(pkg.prefix, "--add-select");
   var colClass = "".concat(blockClass, "__column");
@@ -59,39 +58,14 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
       return multiSelection.includes(item.id);
     });
     setAllSelected(isAllSelected);
-  }, [filteredItems, multiSelection]); // sorting
-
-  var colSortBy = (_filteredItems$find = filteredItems.find(function (item) {
-    return item.sortBy;
-  })) === null || _filteredItems$find === void 0 ? void 0 : _filteredItems$find.sortBy;
-  var sortByOpts = colSortBy ? colSortBy.reduce(function (acc, cur) {
-    var opts = [{
-      id: "".concat(cur, "-asc"),
-      itemText: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowUp16, null), cur),
-      direction: 'asc',
-      attribute: cur
-    }, {
-      id: "".concat(cur, "-desc"),
-      itemText: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowDown16, null), cur),
-      direction: 'desc',
-      attribute: cur
-    }];
-    return [].concat(_toConsumableArray(acc), opts);
-  }, []) : []; // filtering
-
-  var colFilterBy = (_filteredItems$find2 = filteredItems.find(function (item) {
+  }, [filteredItems, multiSelection]); // filtering
+
+  var colFilterBy = (_filteredItems$find = filteredItems.find(function (item) {
     return item.filterBy;
-  })) === null || _filteredItems$find2 === void 0 ? void 0 : _filteredItems$find2.filterBy;
+  })) === null || _filteredItems$find === void 0 ? void 0 : _filteredItems$find.filterBy;
   var filterByOpts = colFilterBy ? filteredItems.map(function (item) {
     return item[colFilterBy];
-  }) : []; // handlers
-
-  var sortHandler = function sortHandler(_ref2) {
-    var direction = _ref2.direction,
-        attribute = _ref2.attribute;
-    setSortAttribute(attribute);
-    setSortDirection(direction);
-  };
+  }) : [];
 
   var selectAllHandler = function selectAllHandler(checked) {
     var itemIds = filteredItems.map(function (item) {
@@ -138,22 +112,11 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
     });
   };
 
-  var sortItems = function sortItems(a, b) {
-    var _a$sortAttribute, _b$sortAttribute;
-
-    var valueA = (_a$sortAttribute = a[sortAttribute]) === null || _a$sortAttribute === void 0 ? void 0 : _a$sortAttribute.split(' ').join('');
-    var valueB = (_b$sortAttribute = b[sortAttribute]) === null || _b$sortAttribute === void 0 ? void 0 : _b$sortAttribute.split(' ').join('');
-
-    if (sortDirection === 'desc') {
-      return valueA > valueB ? -1 : 1;
-    }
-
-    return valueA < valueB ? -1 : 1;
-  };
-
+  var sortFn = sortItems(sortAttribute, sortDirection);
+  var sortBy = getSortBy(filteredItems);
   var colItems = filteredItems.filter(filterBySearch) // first check if the item meets the search
   .filter(filterByAttribute) // then check if the item is included in the filter
-  .sort(sortItems); // then sort the items by whatever criteria
+  .sort(sortFn); // then sort the items by whatever criteria
 
   return /*#__PURE__*/React.createElement("div", {
     className: colClass
@@ -171,19 +134,14 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
     labelText: columnInputPlaceholder
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(colClass, "-sort-filter")
-  }, sortByOpts.length > 0 && /*#__PURE__*/React.createElement(OverflowMenu, {
-    renderIcon: ArrowsVertical32,
-    className: "".concat(colClass, "-overflow"),
-    flipped: true
-  }, sortByOpts.map(function (opt) {
-    return /*#__PURE__*/React.createElement(OverflowMenuItem, {
-      key: opt.id,
-      itemText: opt.itemText,
-      onClick: function onClick() {
-        return sortHandler(opt);
-      }
-    });
-  })), filterByOpts.length > 0 && /*#__PURE__*/React.createElement(OverflowMenu, {
+  }, /*#__PURE__*/React.createElement(AddSelectSort, {
+    items: filteredItems,
+    setSortAttribute: setSortAttribute,
+    setSortDirection: setSortDirection,
+    sortAttribute: sortAttribute,
+    sortDirection: sortDirection,
+    sortBy: sortBy
+  }), filterByOpts.length > 0 && /*#__PURE__*/React.createElement(OverflowMenu, {
     renderIcon: Filter32,
     className: "".concat(colClass, "-overflow"),
     flipped: true

package/es/components/AddSelect/AddSelectFilter.js

@@ -88,7 +88,7 @@ export var AddSelectFilter = function AddSelectFilter(_ref) {
   };
 
   var showFilter = multi && (filterOpts === null || filterOpts === void 0 ? void 0 : filterOpts.length) > 0;
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "-search")
   }, /*#__PURE__*/React.createElement(TextInput, {
     id: "temp-id",
@@ -107,7 +107,7 @@ export var AddSelectFilter = function AddSelectFilter(_ref) {
     className: "".concat(blockClass, "-toggle"),
     size: "md"
   }), open && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass)
+    className: blockClass
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "-content")
   }, /*#__PURE__*/React.createElement("p", null, "Filters"), /*#__PURE__*/React.createElement("div", {

package/es/components/AddSelect/AddSelectSort.js

@@ -0,0 +1,61 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+//
+// Copyright IBM Corp. 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 React from 'react';
+import PropTypes from 'prop-types';
+import { OverflowMenu, OverflowMenuItem } from 'carbon-components-react';
+import { ArrowsVertical32, ArrowUp16, ArrowDown16 } from '@carbon/icons-react';
+import { pkg } from '../../settings';
+var componentName = 'AddSelect';
+export var AddSelectSort = function AddSelectSort(_ref) {
+  var setSortAttribute = _ref.setSortAttribute,
+      setSortDirection = _ref.setSortDirection,
+      sortBy = _ref.sortBy;
+  var blockClass = "".concat(pkg.prefix, "--add-select-sort");
+  var sortByOpts = sortBy ? sortBy.reduce(function (acc, cur) {
+    var opts = [{
+      id: "".concat(cur, "-asc"),
+      itemText: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowUp16, null), cur),
+      direction: 'asc',
+      attribute: cur
+    }, {
+      id: "".concat(cur, "-desc"),
+      itemText: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowDown16, null), cur),
+      direction: 'desc',
+      attribute: cur
+    }];
+    return [].concat(_toConsumableArray(acc), opts);
+  }, []) : []; // handlers
+
+  var sortHandler = function sortHandler(_ref2) {
+    var direction = _ref2.direction,
+        attribute = _ref2.attribute;
+    setSortAttribute(attribute);
+    setSortDirection(direction);
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: blockClass
+  }, sortByOpts.length > 0 && /*#__PURE__*/React.createElement(OverflowMenu, {
+    renderIcon: ArrowsVertical32,
+    flipped: true
+  }, sortByOpts.map(function (opt) {
+    return /*#__PURE__*/React.createElement(OverflowMenuItem, {
+      key: opt.id,
+      itemText: opt.itemText,
+      onClick: function onClick() {
+        return sortHandler(opt);
+      }
+    });
+  })));
+};
+AddSelectSort.propTypes = {
+  setSortAttribute: PropTypes.func,
+  setSortDirection: PropTypes.func,
+  sortBy: PropTypes.array
+};
+AddSelectSort.displayName = componentName;

package/es/components/AddSelect/add-select-utils.js

@@ -91,4 +91,25 @@ export var getGlobalFilterValues = function getGlobalFilterValues(globalFilters,
     return prevFilter;
   }, []);
   return filterOpts;
+};
+export var sortItems = function sortItems(attribute, direction) {
+  return function (a, b) {
+    var _a$attribute, _b$attribute;
+
+    var valueA = (_a$attribute = a[attribute]) === null || _a$attribute === void 0 ? void 0 : _a$attribute.split(' ').join('');
+    var valueB = (_b$attribute = b[attribute]) === null || _b$attribute === void 0 ? void 0 : _b$attribute.split(' ').join('');
+
+    if (direction === 'desc') {
+      return valueA > valueB ? -1 : 1;
+    }
+
+    return valueA < valueB ? -1 : 1;
+  };
+};
+export var getSortBy = function getSortBy(items) {
+  var _items$find;
+
+  return (_items$find = items.find(function (item) {
+    return item.sortBy;
+  })) === null || _items$find === void 0 ? void 0 : _items$find.sortBy;
 };

package/es/components/AddSelect/hooks/useItemSort.js

@@ -0,0 +1,20 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { useState } from 'react';
+export var useItemSort = function useItemSort() {
+  var _useState = useState(''),
+      _useState2 = _slicedToArray(_useState, 2),
+      sortDirection = _useState2[0],
+      setSortDirection = _useState2[1];
+
+  var _useState3 = useState(''),
+      _useState4 = _slicedToArray(_useState3, 2),
+      sortAttribute = _useState4[0],
+      setSortAttribute = _useState4[1];
+
+  return {
+    sortDirection: sortDirection,
+    setSortDirection: setSortDirection,
+    sortAttribute: sortAttribute,
+    setSortAttribute: setSortAttribute
+  };
+};

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';
@@ -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,9 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     setCurrentMatcher: setCurrentMatcher,
     setSelectionAreaData: setSelectionAreaData,
     totalVisibleColumns: totalVisibleColumns,
-    updateActiveCellCoordinates: updateActiveCellCoordinates
+    updateActiveCellCoordinates: updateActiveCellCoordinates,
+    setHeaderCellHoldActive: setHeaderCellHoldActive,
+    headerCellHoldActive: headerCellHoldActive
   }), /*#__PURE__*/React.createElement(DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
     ref: spreadsheetRef,
@@ -799,7 +809,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,

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,7 +55,16 @@ 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,
@@ -115,18 +126,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,
@@ -142,41 +153,23 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }
 
     return cellContainer;
-  }; // Mouse up
-
-
-  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
-
-          if (indexOfItemToUpdate === -1) {
-            return prev;
-          }
-
-          selectionAreaClone[indexOfItemToUpdate].point2 = endCellCoordinates;
-          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
-          return selectionAreaClone;
-        });
-      }
-    };
+  };
 
-    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
+  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
 
   useEffect(function () {
@@ -192,6 +185,9 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   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);
@@ -524,6 +520,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 +535,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 +559,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
 };