@carbon/ibm-products 1.17.0 → 1.18.0

package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -21,6 +21,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _layout = require("@carbon/layout");
+
 var _settings = require("../../settings");
 
 var _hooks = require("../../global/js/hooks");
@@ -35,6 +37,8 @@ var _selectAllCells = require("./utils/selectAllCells");
 
 var _getSpreadsheetWidth = require("./utils/getSpreadsheetWidth");
 
+var _hooks2 = require("./hooks");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -58,13 +62,20 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
       setSelectionAreaData = _ref.setSelectionAreaData,
       rows = _ref.rows,
       totalVisibleColumns = _ref.totalVisibleColumns,
-      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates,
+      setHeaderCellHoldActive = _ref.setHeaderCellHoldActive,
+      headerCellHoldActive = _ref.headerCellHoldActive;
 
   var _useState = (0, _react.useState)(0),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       scrollBarSizeValue = _useState2[0],
       setScrollBarSizeValue = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      selectedHeaderReorderActive = _useState4[0],
+      setSelectedHeaderReorderActive = _useState4[1];
+
   var previousState = (0, _hooks.usePreviousValue)({
     cellSize: cellSize
   });
@@ -110,6 +121,39 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_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 = (0, _layout.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);
+    };
+  };
+
+  (0, _hooks2.useSpreadsheetMouseMove)({
+    ref: ref,
+    headerCellHoldActive: headerCellHoldActive,
+    defaultColumn: defaultColumn
+  });
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(blockClass, "__header--container")),
     role: "rowgroup"
@@ -146,6 +190,7 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
     }, "\xA0")), headerGroup.headers.map(function (column, index) {
       var _cx2;
 
+      var selectedHeader = (0, _checkSelectedHeaderCell.checkSelectedHeaderCell)(index, selectionAreas, 'column');
       return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
         key: "column_".concat(index),
         role: "columnheader",
@@ -155,12 +200,16 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_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: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'column')), (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__th--selected-header"), (0, _checkSelectedHeaderCell.checkSelectedHeaderCell)(index, selectionAreas, 'column')), _cx2)),
+        className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'column')), (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__th--selected-header"), selectedHeader), (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "__th--selected-header-reorder-active"), selectedHeaderReorderActive), _cx2)),
         type: "button"
       }, column.render('Header')));
     }));
@@ -195,6 +244,11 @@ DataSpreadsheetHeader.propTypes = {
     width: _propTypes.default.number
   }),
 
+  /**
+   * Whether or not a click/hold is active on a header cell
+   */
+  headerCellHoldActive: _propTypes.default.bool,
+
   /**
    * Headers provided from useTable hook
    */
@@ -225,6 +279,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   setCurrentMatcher: _propTypes.default.func,
 
+  /**
+   * Setter fn for header cell hold active value
+   */
+  setHeaderCellHoldActive: _propTypes.default.func,
+
   /**
    * Setter fn for selectionAreaData state value
    */

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

@@ -27,6 +27,18 @@ Object.defineProperty(exports, "useSpreadsheetEdit", {
     return _useSpreadsheetEdit.useSpreadsheetEdit;
   }
 });
+Object.defineProperty(exports, "useSpreadsheetMouseMove", {
+  enumerable: true,
+  get: function get() {
+    return _useSpreadsheetMouseMove.useSpreadsheetMouseMove;
+  }
+});
+Object.defineProperty(exports, "useSpreadsheetMouseUp", {
+  enumerable: true,
+  get: function get() {
+    return _useSpreadsheetMouseUp.useSpreadsheetMouseUp;
+  }
+});
 Object.defineProperty(exports, "useSpreadsheetOutsideClick", {
   enumerable: true,
   get: function get() {
@@ -42,4 +54,8 @@ var _useResetSpreadsheetFocus = require("./useResetSpreadsheetFocus");
 
 var _useSpreadsheetOutsideClick = require("./useSpreadsheetOutsideClick");
 
-var _useSpreadsheetEdit = require("./useSpreadsheetEdit");
+var _useSpreadsheetEdit = require("./useSpreadsheetEdit");
+
+var _useSpreadsheetMouseUp = require("./useSpreadsheetMouseUp");
+
+var _useSpreadsheetMouseMove = require("./useSpreadsheetMouseMove");

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

@@ -17,12 +17,12 @@ var _settings = require("../../../settings");
 
 var _hooks = require("../../../global/js/hooks");
 
-// /**
-//  * 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.
+ */
 var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
   var isEditing = _ref.isEditing,
       rows = _ref.rows,
@@ -30,7 +30,7 @@ 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,
@@ -69,9 +69,9 @@ 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 = (0, _layout.px)(parseInt(cellEditorRef.current.style.width) - currentColumnWidth);
@@ -87,17 +87,17 @@ 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;
@@ -123,7 +123,7 @@ 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]);
 };
 
 exports.useSpreadsheetEdit = useSpreadsheetEdit;

package/lib/components/DataSpreadsheet/hooks/useSpreadsheetMouseMove.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useSpreadsheetMouseMove = void 0;
+
+var _react = require("react");
+
+var _layout = require("@carbon/layout");
+
+var _settings = require("../../../settings");
+
+var _getScrollbarWidth = require("../../../global/js/utils/getScrollbarWidth");
+
+var _moveColumnIndicatorLine = require("../utils/moveColumnIndicatorLine");
+
+/**
+ * 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.
+ */
+// Used specifically for reordering columns, will move the position of the
+// cloned selection area to follow the position of the cursor
+var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
+  var ref = _ref.ref,
+      _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(_settings.pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
+      headerCellHoldActive = _ref.headerCellHoldActive,
+      defaultColumn = _ref.defaultColumn;
+  (0, _react.useEffect)(function () {
+    var handleMouseMove = function handleMouseMove(event) {
+      var clonedSelectionElement = ref.current.querySelector(".".concat(blockClass, "__selection-area--element-cloned"));
+
+      if (clonedSelectionElement) {
+        ref.current.addEventListener('mousemove', handleMouseMove);
+      }
+
+      var spreadsheetCoords = ref.current.getBoundingClientRect();
+      (0, _moveColumnIndicatorLine.moveColumnIndicatorLine)({
+        clonedSelectionElement: clonedSelectionElement,
+        ref: ref,
+        spreadsheetCoords: spreadsheetCoords
+      });
+      var scrollbarWidth = (0, _getScrollbarWidth.getScrollbarWidth)();
+      var spreadsheetWrapperElement = ref.current;
+      spreadsheetWrapperElement.getBoundingClientRect();
+      var xPositionRelativeToSpreadsheet = event.clientX - spreadsheetCoords.left;
+      var offsetXValue = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-clone-offset-x');
+      var totalSpreadsheetWidth = ref.current.offsetWidth;
+      var clonedSelectionWidth = clonedSelectionElement.offsetWidth;
+      var clonePlacement = Math.max(xPositionRelativeToSpreadsheet - offsetXValue, defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth); // Moves the position of the cloned selection area to follow mouse
+
+      clonedSelectionElement.style.left = (0, _layout.px)(totalSpreadsheetWidth - clonedSelectionWidth - scrollbarWidth >= clonePlacement ? clonePlacement : totalSpreadsheetWidth - clonedSelectionWidth - scrollbarWidth);
+    };
+
+    if (headerCellHoldActive) {
+      ref.current.addEventListener('mousemove', handleMouseMove);
+    }
+
+    var spreadsheetRef = ref.current;
+
+    if (!headerCellHoldActive) {
+      spreadsheetRef === null || spreadsheetRef === void 0 ? void 0 : spreadsheetRef.removeEventListener('mousemove', handleMouseMove);
+    }
+
+    return function () {
+      spreadsheetRef === null || spreadsheetRef === void 0 ? void 0 : spreadsheetRef.removeEventListener('mousemove', handleMouseMove);
+    };
+  });
+};
+
+exports.useSpreadsheetMouseMove = useSpreadsheetMouseMove;

package/lib/components/DataSpreadsheet/hooks/useSpreadsheetMouseUp.js

@@ -0,0 +1,161 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useSpreadsheetMouseUp = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _react = require("react");
+
+var _layout = require("@carbon/layout");
+
+var _settings = require("../../../settings");
+
+var _deepCloneObject = require("../../../global/js/utils/deepCloneObject");
+
+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) { (0, _defineProperty2.default)(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; }
+
+var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
+  var currentMatcher = _ref.currentMatcher,
+      setSelectionAreas = _ref.setSelectionAreas,
+      setClickAndHoldActive = _ref.setClickAndHoldActive,
+      setValidStartingPoint = _ref.setValidStartingPoint,
+      validStartingPoint = _ref.validStartingPoint,
+      _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(_settings.pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
+      ref = _ref.ref,
+      setHeaderCellHoldActive = _ref.setHeaderCellHoldActive,
+      setColumnOrder = _ref.setColumnOrder,
+      visibleColumns = _ref.visibleColumns,
+      setActiveCellCoordinates = _ref.setActiveCellCoordinates,
+      activeCellCoordinates = _ref.activeCellCoordinates,
+      rows = _ref.rows,
+      defaultColumn = _ref.defaultColumn;
+  (0, _react.useEffect)(function () {
+    var handleMouseUp = function handleMouseUp(event) {
+      // Remove the cloned selection area on mouse up
+      if (!validStartingPoint) {
+        setHeaderCellHoldActive(false);
+        var selectionAreaCloneElement = ref.current.querySelector(".".concat(blockClass, "__selection-area--element-cloned"));
+
+        if (!selectionAreaCloneElement) {
+          return;
+        } // Mouse up while a cloned selection area exists/a column is being reordered
+
+
+        if (selectionAreaCloneElement) {
+          var closestCell = event.target.closest(".".concat(blockClass, "--interactive-cell-element"));
+          var newColumnIndex = closestCell === null || closestCell === void 0 ? void 0 : closestCell.getAttribute('data-column-index');
+          var originalColumnIndex = selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 ? void 0 : selectionAreaCloneElement.getAttribute('data-column-index-original');
+          var columnToMoveToElement = ref.current.querySelector("[data-row-index=\"header\"][data-column-index=\"".concat(newColumnIndex, "\"]")); // Mouse up element was not part of the spreadsheet component
+
+          if (!columnToMoveToElement) {
+            return;
+          }
+
+          var selectionAreaToMove = ref.current.querySelector("[data-matcher-id=\"".concat(currentMatcher, "\"]"));
+          var spreadsheetPosition = ref.current.getBoundingClientRect();
+          var newIndexPosition = columnToMoveToElement.getBoundingClientRect();
+          var relativeNewPosition = newIndexPosition.left - spreadsheetPosition.left;
+          var cloneColumnWidth = selectionAreaCloneElement.offsetWidth;
+          var columnsWidthUpToNewIndex = 0;
+          var newIndexLessThanStarting = newColumnIndex < originalColumnIndex;
+          visibleColumns.forEach(function (item, index) {
+            if (newIndexLessThanStarting && index === visibleColumns.length - 1) {
+              return;
+            }
+
+            if (index <= newColumnIndex) {
+              columnsWidthUpToNewIndex += (item === null || item === void 0 ? void 0 : item.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width);
+            }
+          });
+          var updatedSelectionAreaPlacement = newIndexLessThanStarting ? relativeNewPosition : columnsWidthUpToNewIndex - cloneColumnWidth + (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth);
+          selectionAreaToMove.style.left = (0, _layout.px)(updatedSelectionAreaPlacement);
+          setSelectionAreas(function (prev) {
+            var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
+
+            if (originalColumnIndex === newColumnIndex) {
+              return prev;
+            }
+
+            var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
+              return item.matcher === currentMatcher;
+            });
+
+            if (indexOfItemToUpdate === -1) {
+              return prev;
+            }
+
+            selectionAreaClone[indexOfItemToUpdate].header.index = Number(newColumnIndex);
+            selectionAreaClone[indexOfItemToUpdate].point1.column = Number(newColumnIndex);
+            selectionAreaClone[indexOfItemToUpdate].point2.column = Number(newColumnIndex);
+            return selectionAreaClone;
+          });
+          var columnIdArray = visibleColumns.map(function (column) {
+            return column.id;
+          });
+          var columnIdArrayClone = (0, _toConsumableArray2.default)(columnIdArray); // Remove one element at the original index
+
+          columnIdArrayClone.splice(originalColumnIndex, 1); // Add one element at the new index
+
+          columnIdArrayClone.splice(newColumnIndex, 0, columnIdArray[originalColumnIndex]);
+          setColumnOrder(columnIdArrayClone); // Function provided by useTable (react-table) hook to reorder columns
+
+          var newCellCoords = _objectSpread(_objectSpread({}, activeCellCoordinates), {}, {
+            column: Number(newColumnIndex)
+          });
+
+          setActiveCellCoordinates(newCellCoords); // Remove the cloned column and indicator elements
+
+          var indicatorLineElement = ref.current.querySelector(".".concat(blockClass, "__reorder-indicator-line"));
+          indicatorLineElement === null || indicatorLineElement === void 0 ? void 0 : indicatorLineElement.remove();
+          selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 ? void 0 : selectionAreaCloneElement.remove();
+        }
+      } // Mouse up was on a spreadsheet body cell which is a valid
+      // start/end point for creating a selection area
+
+
+      if (validStartingPoint) {
+        setClickAndHoldActive(false);
+        setValidStartingPoint(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 = (0, _deepCloneObject.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);
+    };
+  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn]);
+};
+
+exports.useSpreadsheetMouseUp = useSpreadsheetMouseUp;

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

@@ -21,11 +21,11 @@ var createCellSelectionArea = function createCellSelectionArea(_ref) {
   var ref = _ref.ref,
       area = _ref.area,
       blockClass = _ref.blockClass,
-      columns = _ref.columns,
       defaultColumn = _ref.defaultColumn,
       selectionAreas = _ref.selectionAreas,
       setSelectionAreas = _ref.setSelectionAreas,
-      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea;
+      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea,
+      visibleColumns = _ref.visibleColumns;
 
   var _getSelectionAreaPoin = (0, _getSelectionAreaPoints.getSelectionAreaPoints)(area),
       lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
@@ -40,7 +40,7 @@ var createCellSelectionArea = function createCellSelectionArea(_ref) {
   }
 
   var selectionAreaVariableWidth = 0;
-  columns.forEach(function (item, index) {
+  visibleColumns.forEach(function (item, index) {
     if (index >= lowestColumnIndex && index <= greatestColumnIndex) {
       selectionAreaVariableWidth += (item === null || item === void 0 ? void 0 : item.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width);
     }

package/lib/components/DataSpreadsheet/utils/moveColumnIndicatorLine.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.moveColumnIndicatorLine = void 0;
+
+var _layout = require("@carbon/layout");
+
+var _settings = require("../../../settings");
+
+/**
+ * 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.
+ */
+var moveColumnIndicatorLine = function moveColumnIndicatorLine(_ref) {
+  var _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(_settings.pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
+      clonedSelectionElement = _ref.clonedSelectionElement,
+      ref = _ref.ref,
+      spreadsheetCoords = _ref.spreadsheetCoords;
+  var closestCell = event.target.closest(".".concat(blockClass, "--interactive-cell-element"));
+  var newColumnIndex = closestCell === null || closestCell === void 0 ? void 0 : closestCell.getAttribute('data-column-index');
+  var originalColumnIndex = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-column-index-original');
+  var closestCellCoords = closestCell.getBoundingClientRect();
+  var indicatorLineElement = ref.current.querySelector(".".concat(blockClass, "__reorder-indicator-line"));
+  var matcherId = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-matcher-id');
+  var selectionAreaOrigin = ref.current.querySelector("[data-matcher-id=\"".concat(matcherId, "\"]"));
+
+  if (Number(newColumnIndex) > Number(originalColumnIndex)) {
+    indicatorLineElement.style.left = (0, _layout.px)(closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2);
+  }
+
+  if (Number(newColumnIndex) < Number(originalColumnIndex)) {
+    indicatorLineElement.style.left = (0, _layout.px)(closestCellCoords.left - spreadsheetCoords.left);
+  }
+
+  if (Number(newColumnIndex) === Number(originalColumnIndex)) {
+    indicatorLineElement.style.left = selectionAreaOrigin.style.left;
+  }
+};
+
+exports.moveColumnIndicatorLine = moveColumnIndicatorLine;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -50,19 +50,20 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon|^react$|^react-dom$|^chalk$|^react-dnd|^namor)/'"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.6",
-    "@babel/core": "^7.17.9",
-    "babel-preset-ibm-cloud-cognitive": "^0.14.14",
+    "@babel/cli": "^7.17.10",
+    "@babel/core": "^7.17.10",
+    "babel-preset-ibm-cloud-cognitive": "^0.14.15",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "fs-extra": "^10.1.0",
     "glob": "^8.0.1",
-    "jest": "^27.5.1",
-    "jest-config-ibm-cloud-cognitive": "^0.23.17",
+    "jest": "^28.0.3",
+    "jest-config-ibm-cloud-cognitive": "^0.23.18",
+    "jest-environment-jsdom": "^28.1.0",
     "namor": "^1.1.2",
-    "npm-check-updates": "^12.5.10",
+    "npm-check-updates": "^12.5.11",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
     "sass": "^1.51.0",
@@ -86,11 +87,11 @@
     "@carbon/motion": "^10.29.0",
     "@carbon/themes": "^10.54.0",
     "@carbon/type": "^10.44.0",
-    "carbon-components": "^10.56.0",
-    "carbon-components-react": "^7.56.0",
+    "carbon-components": "^10.57.1",
+    "carbon-components-react": "^7.57.1",
     "carbon-icons": "^7.0.7",
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "dcf8ef9163dbb8cad6bfc6e70165bfa7288c654e"
+  "gitHead": "6bf1f85853417a8b5142207318b12290254201bf"
 }

package/scss/components/AddSelect/_add-select.scss

@@ -100,6 +100,12 @@
     }
   }
 
+  .#{$block-class}__sub-header {
+    display: flex;
+    align-items: end;
+    justify-content: space-between;
+  }
+
   // sidebar
 
   .#{$block-class}__sidebar-header {

package/scss/components/DataSpreadsheet/_data-spreadsheet.scss

@@ -180,19 +180,6 @@
         outline: 0;
       }
     }
-    .#{$block-class}__active-cell--highlight.#{$block-class}__active-cell--with-selection {
-      &::before {
-        position: absolute;
-        top: 0;
-        left: 0;
-        display: block;
-        width: 100%;
-        height: 100%;
-        background-color: $interactive-01;
-        content: '';
-        opacity: 0.25;
-      }
-    }
     .#{$block-class}__selection-area--element {
       position: absolute;
       z-index: 2;
@@ -210,6 +197,20 @@
         content: '';
         opacity: 0.2;
       }
+      &.#{$block-class}__selection-area--element-cloned {
+        z-index: 4;
+
+        &::before {
+          background-color: $ui-05;
+          opacity: 0.25;
+        }
+      }
+    }
+    .#{$block-class}__reorder-indicator-line {
+      position: absolute;
+      z-index: 4;
+      width: $spacing-01;
+      background-color: $interactive-01;
     }
     .#{$block-class}__th--active-header,
     .#{$block-class}__td-th--active-header.#{$block-class}__td {
@@ -220,10 +221,17 @@
       background-color: $inverse-02;
       color: $text-04;
 
+      &:focus,
       &:hover {
         background-color: $inverse-02;
       }
     }
+    .#{$block-class}__th--selected-header.#{$block-class}__th {
+      cursor: grab;
+    }
+    .#{$block-class}__th--selected-header-reorder-active.#{$block-class}__th {
+      cursor: grabbing;
+    }
     .#{$block-class}__list--container {
       overscroll-behavior: none;
     }