@carbon/ibm-products 1.17.0 → 1.18.0

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,20 @@ 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;
 
   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 +98,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"
@@ -125,6 +167,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 +177,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')));
     }));
@@ -173,6 +220,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 +255,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   setCurrentMatcher: PropTypes.func,
 
+  /**
+   * Setter fn for header cell hold active value
+   */
+  setHeaderCellHoldActive: PropTypes.func,
+
   /**
    * Setter fn for selectionAreaData state value
    */

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]);
 };

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

@@ -0,0 +1,60 @@
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { useEffect } from 'react';
+import { px } from '@carbon/layout';
+import { pkg } from '../../../settings';
+import { getScrollbarWidth } from '../../../global/js/utils/getScrollbarWidth';
+import { moveColumnIndicatorLine } from '../utils/moveColumnIndicatorLine'; // Used specifically for reordering columns, will move the position of the
+// cloned selection area to follow the position of the cursor
+
+export var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
+  var ref = _ref.ref,
+      _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
+      headerCellHoldActive = _ref.headerCellHoldActive,
+      defaultColumn = _ref.defaultColumn;
+  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();
+      moveColumnIndicatorLine({
+        clonedSelectionElement: clonedSelectionElement,
+        ref: ref,
+        spreadsheetCoords: spreadsheetCoords
+      });
+      var scrollbarWidth = 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 = 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);
+    };
+  });
+};

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

@@ -0,0 +1,153 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { useEffect } from 'react';
+import { px } from '@carbon/layout';
+import { pkg } from '../../../settings';
+import { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
+export 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(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;
+  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 = px(updatedSelectionAreaPlacement);
+          setSelectionAreas(function (prev) {
+            var selectionAreaClone = 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 = _toConsumableArray(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 = 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]);
+};

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

@@ -11,11 +11,11 @@ export 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 = getSelectionAreaPoints(area),
       lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
@@ -30,7 +30,7 @@ export 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/es/components/DataSpreadsheet/utils/moveColumnIndicatorLine.js

@@ -0,0 +1,34 @@
+/**
+ * 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 { px } from '@carbon/layout';
+import { pkg } from '../../../settings';
+export var moveColumnIndicatorLine = function moveColumnIndicatorLine(_ref) {
+  var _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(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 = px(closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2);
+  }
+
+  if (Number(newColumnIndex) < Number(originalColumnIndex)) {
+    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left);
+  }
+
+  if (Number(newColumnIndex) === Number(originalColumnIndex)) {
+    indicatorLineElement.style.left = selectionAreaOrigin.style.left;
+  }
+};

package/lib/components/AddSelect/AddSelect.js

@@ -43,7 +43,11 @@ var _addSelectUtils = require("./add-select-utils");
 
 var _AddSelectFilter = require("./AddSelectFilter");
 
-var _excluded = ["className", "clearFiltersText", "columnInputPlaceholder", "description", "globalFilters", "globalFiltersIconDescription", "globalFiltersPlaceholderText", "globalFiltersPrimaryButtonText", "globalFiltersSecondaryButtonText", "globalSearchLabel", "globalSearchPlaceholder", "influencerTitle", "items", "itemsLabel", "multi", "noResultsDescription", "noResultsTitle", "noSelectionDescription", "noSelectionTitle", "onClose", "onCloseButtonText", "onSubmit", "onSubmitButtonText", "open", "portalTarget", "removeIconDescription", "searchResultsLabel", "title"];
+var _AddSelectSort = require("./AddSelectSort");
+
+var _useItemSort2 = require("./hooks/useItemSort");
+
+var _excluded = ["className", "clearFiltersText", "columnInputPlaceholder", "description", "globalFilters", "globalFiltersIconDescription", "globalFiltersPlaceholderText", "globalFiltersPrimaryButtonText", "globalFiltersSecondaryButtonText", "globalSearchLabel", "globalSearchPlaceholder", "globalSortBy", "influencerTitle", "items", "itemsLabel", "multi", "noResultsDescription", "noResultsTitle", "noSelectionDescription", "noSelectionTitle", "onClose", "onCloseButtonText", "onSubmit", "onSubmitButtonText", "open", "portalTarget", "removeIconDescription", "searchResultsLabel", "title"];
 
 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); }
 
@@ -64,6 +68,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       globalFiltersSecondaryButtonText = _ref.globalFiltersSecondaryButtonText,
       globalSearchLabel = _ref.globalSearchLabel,
       globalSearchPlaceholder = _ref.globalSearchPlaceholder,
+      globalSortBy = _ref.globalSortBy,
       influencerTitle = _ref.influencerTitle,
       items = _ref.items,
       itemsLabel = _ref.itemsLabel,
@@ -129,6 +134,12 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       appliedGlobalFilters = _useState18[0],
       setAppliedGlobalFilters = _useState18[1];
 
+  var _useItemSort = (0, _useItemSort2.useItemSort)(),
+      sortDirection = _useItemSort.sortDirection,
+      setSortDirection = _useItemSort.setSortDirection,
+      sortAttribute = _useItemSort.sortAttribute,
+      setSortAttribute = _useItemSort.setSortAttribute;
+
   (0, _react.useEffect)(function () {
     var entries = items.entries; // flatItems is just a single array of all entries including children
 
@@ -218,6 +229,8 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     return results;
   };
 
+  var sortFn = (0, _addSelectUtils.sortItems)(sortAttribute, sortDirection);
+
   var getDisplayItems = function getDisplayItems() {
     if (useNormalizedItems) {
       // when global search or filter is in use the results are not in column format
@@ -230,7 +243,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
           return filters.every(function (filter) {
             return item[filter] === appliedGlobalFilters[filter];
           });
-        });
+        }).sort(sortFn);
         return results;
       }
 
@@ -317,9 +330,11 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     return true;
   };
 
+  var hasResults = itemsToDisplay.length > 0;
+  var globalFiltersApplied = Object.keys(appliedGlobalFilters).length > 0;
   var showBreadsCrumbs = setShowBreadsCrumbs();
-  var showTags = setShowTags();
-  var globalFiltersApplied = Object.keys(appliedGlobalFilters).length > 0; // main content
+  var showSort = (searchTerm || globalFiltersApplied) && hasResults;
+  var showTags = setShowTags(); // main content
 
   var body = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__header")
@@ -339,6 +354,8 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     hasFiltersApplied: globalFiltersApplied,
     clearFiltersText: clearFiltersText
   }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__sub-header")
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__tag-container")
   }, showBreadsCrumbs ? /*#__PURE__*/_react.default.createElement(_AddSelectBreadcrumbs.AddSelectBreadcrumbs, {
     itemsLabel: itemsLabel,
@@ -349,7 +366,14 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   }, searchTerm ? searchResultsLabel : itemsLabel), showTags && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Tag, {
     type: "gray",
     size: "sm"
-  }, itemsToDisplay.length))), useNormalizedItems && !searchTerm && !globalFiltersApplied ? /*#__PURE__*/_react.default.createElement("div", {
+  }, itemsToDisplay.length)), showSort && /*#__PURE__*/_react.default.createElement(_AddSelectSort.AddSelectSort, {
+    items: itemsToDisplay,
+    setSortAttribute: setSortAttribute,
+    setSortDirection: setSortDirection,
+    sortAttribute: sortAttribute,
+    sortDirection: sortDirection,
+    sortBy: globalSortBy
+  }))), useNormalizedItems && !searchTerm && !globalFiltersApplied ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__columns")
   }, itemsToDisplay.map(function (page, idx) {
     var _path;
@@ -360,7 +384,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       header: idx === 0 ? itemsLabel : (_path = path[idx - 1]) === null || _path === void 0 ? void 0 : _path.title,
       columnInputPlaceholder: columnInputPlaceholder
     }));
-  })) : /*#__PURE__*/_react.default.createElement("div", null, itemsToDisplay.length > 0 ? /*#__PURE__*/_react.default.createElement(_AddSelectList.AddSelectList, (0, _extends2.default)({}, commonListProps, {
+  })) : /*#__PURE__*/_react.default.createElement("div", null, hasResults ? /*#__PURE__*/_react.default.createElement(_AddSelectList.AddSelectList, (0, _extends2.default)({}, commonListProps, {
     filteredItems: itemsToDisplay,
     modifiers: items === null || items === void 0 ? void 0 : items.modifiers
   })) : /*#__PURE__*/_react.default.createElement("div", {
@@ -393,6 +417,7 @@ AddSelect.propTypes = {
   globalFiltersSecondaryButtonText: _propTypes.default.string,
   globalSearchLabel: _propTypes.default.string,
   globalSearchPlaceholder: _propTypes.default.string,
+  globalSortBy: _propTypes.default.array,
   influencerTitle: _propTypes.default.string,
   items: _propTypes.default.shape({
     modifiers: _propTypes.default.shape({