@carbon/ibm-products 1.18.2 → 1.20.0

package/es/components/AddSelect/AddSelectList.js

@@ -15,19 +15,24 @@ import { UserProfileImage } from '../UserProfileImage';
 import { pkg } from '../../settings';
 var componentName = 'AddSelectList';
 export var AddSelectList = function AddSelectList(_ref) {
-  var filteredItems = _ref.filteredItems,
+  var _modifiers$options;
+
+  var appliedModifiers = _ref.appliedModifiers,
+      filteredItems = _ref.filteredItems,
       metaIconDescription = _ref.metaIconDescription,
       modifiers = _ref.modifiers,
       multi = _ref.multi,
       multiSelection = _ref.multiSelection,
       navIconDescription = _ref.navIconDescription,
       path = _ref.path,
+      setAppliedModifiers = _ref.setAppliedModifiers,
       setDisplayMetaPanel = _ref.setDisplayMetaPanel,
       setMultiSelection = _ref.setMultiSelection,
       setPath = _ref.setPath,
       setSingleSelection = _ref.setSingleSelection,
       singleSelection = _ref.singleSelection;
   var blockClass = "".concat(pkg.prefix, "--add-select__selections");
+  var hasModifiers = (modifiers === null || modifiers === void 0 ? void 0 : (_modifiers$options = modifiers.options) === null || _modifiers$options === void 0 ? void 0 : _modifiers$options.length) > 0;
 
   var handleSingleSelection = function handleSingleSelection(value) {
     setSingleSelection(value);
@@ -130,14 +135,24 @@ export var AddSelectList = function AddSelectList(_ref) {
     return /*#__PURE__*/React.createElement(Icon, null);
   };
 
+  var modifierHandler = function modifierHandler(id, selectedItem) {
+    var modifiersClone = _toConsumableArray(appliedModifiers);
+
+    var modifierIdx = modifiersClone.findIndex(function (item) {
+      return item.id === id;
+    });
+    modifiersClone[modifierIdx] = _defineProperty({
+      id: id
+    }, modifiers.id, selectedItem);
+    setAppliedModifiers(modifiersClone);
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "-wrapper")
   }, /*#__PURE__*/React.createElement(StructuredListWrapper, {
     selection: true,
     className: "".concat(blockClass)
   }, /*#__PURE__*/React.createElement(StructuredListBody, null, filteredItems.map(function (item) {
-    var _modifiers$options;
-
     return /*#__PURE__*/React.createElement(StructuredListRow, {
       key: item.id,
       className: cx("".concat(blockClass, "-row"), _defineProperty({}, "".concat(blockClass, "-row-selected"), isSelected(item.id)))
@@ -165,22 +180,29 @@ export var AddSelectList = function AddSelectList(_ref) {
       className: "".concat(blockClass, "-cell-title")
     }, item.title), item.subtitle && /*#__PURE__*/React.createElement("span", {
       className: "".concat(blockClass, "-cell-subtitle")
-    }, item.subtitle)))), (modifiers === null || modifiers === void 0 ? void 0 : (_modifiers$options = modifiers.options) === null || _modifiers$options === void 0 ? void 0 : _modifiers$options.length) && /*#__PURE__*/React.createElement(Dropdown, {
+    }, item.subtitle)))), hasModifiers && /*#__PURE__*/React.createElement(Dropdown, {
       id: "".concat(item.id, "-modifier"),
       type: "inline",
-      items: modifiers === null || modifiers === void 0 ? void 0 : modifiers.options,
+      items: modifiers.options,
       light: true,
-      label: modifiers === null || modifiers === void 0 ? void 0 : modifiers.label,
+      label: modifiers.label,
       disabled: !isSelected(item.id),
-      className: "".concat(blockClass, "-dropdown ").concat(blockClass, "-hidden-hover")
+      className: "".concat(blockClass, "-dropdown ").concat(blockClass, "-hidden-hover"),
+      initialSelectedItem: item[modifiers.id],
+      onChange: function onChange(_ref5) {
+        var selectedItem = _ref5.selectedItem;
+        return modifierHandler(item.id, selectedItem);
+      }
     })) : /*#__PURE__*/React.createElement(RadioButton, {
       className: "".concat(blockClass, "-radio"),
       name: "add-select-selections",
       id: item.id,
       value: item.value,
       labelText: item.title,
-      onChange: handleSingleSelection,
-      selected: item.value === singleSelection
+      onChange: function onChange() {
+        return handleSingleSelection(item.id);
+      },
+      selected: item.id === singleSelection
     }), item.children && /*#__PURE__*/React.createElement(Button, {
       renderIcon: ChevronRight16,
       iconDescription: navIconDescription,
@@ -209,6 +231,7 @@ export var AddSelectList = function AddSelectList(_ref) {
   }))));
 };
 AddSelectList.propTypes = {
+  appliedModifiers: PropTypes.array,
   filteredItems: PropTypes.array,
   metaIconDescription: PropTypes.string,
   modifiers: PropTypes.object,
@@ -216,6 +239,7 @@ AddSelectList.propTypes = {
   multiSelection: PropTypes.array,
   navIconDescription: PropTypes.string,
   path: PropTypes.array,
+  setAppliedModifiers: PropTypes.func,
   setDisplayMetaPanel: PropTypes.func,
   setMultiSelection: PropTypes.func,
   setPath: PropTypes.func,

package/es/components/AddSelect/AddSelectSidebar.js

@@ -1,5 +1,5 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["icon", "avatar"];
+var _excluded = ["meta", "icon", "avatar"];
 //
 // Copyright IBM Corp. 2022
 //
@@ -15,11 +15,15 @@ import { pkg } from '../../settings';
 import { AddSelectMetaPanel } from './AddSelectMetaPanel';
 var componentName = 'AddSelectSidebar';
 export var AddSelectSidebar = function AddSelectSidebar(_ref) {
-  var closeIconDescription = _ref.closeIconDescription,
+  var _modifiers$options;
+
+  var appliedModifiers = _ref.appliedModifiers,
+      closeIconDescription = _ref.closeIconDescription,
       displayMetalPanel = _ref.displayMetalPanel,
       influencerTitle = _ref.influencerTitle,
       items = _ref.items,
       metaPanelTitle = _ref.metaPanelTitle,
+      modifiers = _ref.modifiers,
       multiSelection = _ref.multiSelection,
       noSelectionDescription = _ref.noSelectionDescription,
       noSelectionTitle = _ref.noSelectionTitle,
@@ -27,6 +31,8 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
       setDisplayMetaPanel = _ref.setDisplayMetaPanel,
       setMultiSelection = _ref.setMultiSelection;
   var blockClass = "".concat(pkg.prefix, "--add-select__sidebar");
+  var hasModifiers = (modifiers === null || modifiers === void 0 ? void 0 : (_modifiers$options = modifiers.options) === null || _modifiers$options === void 0 ? void 0 : _modifiers$options.length) > 0;
+  var hasSelections = multiSelection.length > 0;
 
   var handleItemRemove = function handleItemRemove(id) {
     var newSelections = multiSelection.filter(function (v) {
@@ -41,7 +47,8 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
     }); // certain properties should not be displayed in the sidebar
     // eslint-disable-next-line no-unused-vars
 
-    var icon = selectedItem.icon,
+    var meta = selectedItem.meta,
+        icon = selectedItem.icon,
         avatar = selectedItem.avatar,
         newItem = _objectWithoutProperties(selectedItem, _excluded);
 
@@ -49,24 +56,23 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
     return acc;
   }, []);
 
-  var getTitle = function getTitle(_ref2) {
-    var title = _ref2.title,
-        subtitle = _ref2.subtitle,
-        id = _ref2.id;
+  var getTitle = function getTitle(item) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "-accordion-title")
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "-selected-item")
     }, /*#__PURE__*/React.createElement("p", {
       className: "".concat(blockClass, "-selected-item-title")
-    }, title), /*#__PURE__*/React.createElement("p", {
+    }, item.title), /*#__PURE__*/React.createElement("p", {
       className: "".concat(blockClass, "-selected-item-subtitle")
-    }, subtitle)), /*#__PURE__*/React.createElement(Button, {
+    }, item.subtitle)), hasModifiers && /*#__PURE__*/React.createElement("div", null, appliedModifiers.find(function (modifier) {
+      return modifier.id === item.id;
+    })[modifiers.id]), /*#__PURE__*/React.createElement(Button, {
       renderIcon: SubtractAlt32,
       iconDescription: removeIconDescription,
       hasIconOnly: true,
       onClick: function onClick() {
-        return handleItemRemove(id);
+        return handleItemRemove(item.id);
       },
       kind: "ghost",
       className: "".concat(blockClass, "-item-remove-button"),
@@ -92,7 +98,7 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
   }, influencerTitle), /*#__PURE__*/React.createElement(Tag, {
     type: "gray",
     size: "sm"
-  }, multiSelection.length)), multiSelection.length > 0 ? /*#__PURE__*/React.createElement(Accordion, {
+  }, multiSelection.length)), hasSelections ? /*#__PURE__*/React.createElement(Accordion, {
     align: "start"
   }, sidebarItems.map(function (item) {
     return /*#__PURE__*/React.createElement(AccordionItem, {
@@ -117,11 +123,13 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
   })));
 };
 AddSelectSidebar.propTypes = {
+  appliedModifiers: PropTypes.array,
   closeIconDescription: PropTypes.string,
   displayMetalPanel: PropTypes.object,
   influencerTitle: PropTypes.string,
   items: PropTypes.array,
   metaPanelTitle: PropTypes.string,
+  modifiers: PropTypes.object,
   multiSelection: PropTypes.array,
   noSelectionDescription: PropTypes.string,
   noSelectionTitle: PropTypes.string,

package/es/components/ComboButton/ComboButton.js

@@ -18,13 +18,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * LICENSE file in the root directory of this source tree.
  */
 import { ChevronDown16, ChevronUp16 } from '@carbon/icons-react';
-import { Button, OverflowMenuItem } from 'carbon-components-react';
-import { OverflowMenu } from 'carbon-components-react/lib/components/OverflowMenu/OverflowMenu';
-import setupGetInstanceId from 'carbon-components-react/lib/tools/setupGetInstanceId';
+import { Button, OverflowMenuItem, OverflowMenu } from 'carbon-components-react';
 import classnames from 'classnames';
 import { node, shape, string } from 'prop-types';
+import uuidv4 from '../../global/js/utils/uuidv4';
 import React, { Children, createElement, useRef, useState } from 'react';
-var getInstanceId = setupGetInstanceId();
 var blockClass = 'security--combo-button';
 /**
  * The combo button consolidates similar actions, while exposing the most commonly used one.
@@ -36,7 +34,7 @@ var ComboButton = function ComboButton(_ref) {
       overflowMenu = _ref.overflowMenu,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  var _useRef = useRef(getInstanceId()),
+  var _useRef = useRef(uuidv4()),
       instanceId = _useRef.current;
 
   var _useState = useState(false),

package/es/components/CreateSidePanel/CreateSidePanel.js

@@ -22,11 +22,9 @@ import { pkg } from '../../settings';
 import { getDevtoolsProps } from '../../global/js/utils/devtools'; // Carbon and package components we use.
 
 import { Form } from 'carbon-components-react';
-import { SidePanel } from '../SidePanel';
-import { ActionSet } from '../ActionSet'; // The block part of our conventional BEM class names (blockClass__E--M).
+import { SidePanel } from '../SidePanel'; // The block part of our conventional BEM class names (blockClass__E--M).
 
 var blockClass = "".concat(pkg.prefix, "--create-side-panel");
-var sidePanelBlockClass = "".concat(pkg.prefix, "--side-panel");
 var componentName = 'CreateSidePanel'; // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
 /**
@@ -64,7 +62,6 @@ export var CreateSidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     onClick: onRequestClose,
     kind: 'secondary'
   }];
-  var actionContainerClassNames = cx(["".concat(blockClass, "__actions-container"), "".concat(sidePanelBlockClass, "__actions-container")]);
   return selectorPageContent && /*#__PURE__*/React.createElement(SidePanel, _extends({}, rest, _objectSpread({
     open: open,
     ref: ref,
@@ -78,18 +75,15 @@ export var CreateSidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     slideIn: true,
     animateTitle: false,
     className: cx(blockClass, className),
-    size: "md"
+    size: "md",
+    actions: actions
   }), /*#__PURE__*/React.createElement("h3", {
     className: "".concat(blockClass, "__form-title-text ").concat(blockClass, "__content-text")
   }, formTitle), /*#__PURE__*/React.createElement("p", {
     className: "".concat(blockClass, "__form-description-text ").concat(blockClass, "__content-text")
   }, formDescription), /*#__PURE__*/React.createElement(Form, {
     className: "".concat(blockClass, "__form")
-  }, children, /*#__PURE__*/React.createElement(ActionSet, {
-    actions: actions,
-    className: actionContainerClassNames,
-    size: "md"
-  })));
+  }, children));
 });
 CreateSidePanel = pkg.checkComponentEnabled(CreateSidePanel, componentName);
 CreateSidePanel.displayName = componentName;

package/es/components/DataSpreadsheet/DataSpreadsheet.js

@@ -667,7 +667,8 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       spreadsheetRef: spreadsheetRef,
       isKeyboard: isKeyboard,
       setSelectionAreaData: setSelectionAreaData,
-      index: index
+      index: index,
+      currentMatcher: currentMatcher
     }; // Select an entire column
 
     if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header') {
@@ -768,6 +769,7 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     activeCellCoordinates: activeCellCoordinates,
     cellSize: cellSize,
     columns: columns,
+    currentMatcher: currentMatcher,
     defaultColumn: defaultColumn,
     headerGroups: headerGroups,
     rows: rows,

package/es/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -169,7 +169,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setActiveCellCoordinates: setActiveCellCoordinates,
     rows: rows,
     activeCellCoordinates: activeCellCoordinates,
-    defaultColumn: defaultColumn
+    defaultColumn: defaultColumn,
+    selectionAreas: selectionAreas
   }); // 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
@@ -395,7 +396,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         "data-column-index": "header",
         type: "button",
         onClick: handleRowHeaderClick(index),
-        className: cx("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || checkActiveHeaderCell(index, selectionAreas, 'row')), _defineProperty(_cx, "".concat(blockClass, "__td-th--selected-header"), checkSelectedHeaderCell(index, selectionAreas, 'row')), _cx)),
+        className: cx("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || checkActiveHeaderCell(index, selectionAreas, 'row')), _defineProperty(_cx, "".concat(blockClass, "__td-th--selected-header"), checkSelectedHeaderCell(index, selectionAreas, 'row', columns)), _cx)),
         style: {
           width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
         }
@@ -424,7 +425,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }, cell.render('Cell')));
       }));
     }
-  }, [prepareRow, rows, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover, defaultColumn]);
+  }, [prepareRow, rows, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover, defaultColumn, columns]);
   var spreadsheetBodyRef = useRef();
   return /*#__PURE__*/React.createElement("div", _extends({
     ref: spreadsheetBodyRef,

package/es/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -29,6 +29,7 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
   var activeCellCoordinates = _ref.activeCellCoordinates,
       cellSize = _ref.cellSize,
       columns = _ref.columns,
+      currentMatcher = _ref.currentMatcher,
       defaultColumn = _ref.defaultColumn,
       headerGroups = _ref.headerGroups,
       scrollBarSize = _ref.scrollBarSize,
@@ -71,6 +72,7 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
   var handleColumnHeaderClick = function handleColumnHeaderClick(index) {
     return function (event) {
       var isHoldingCommandKey = event.metaKey || event.ctrlKey;
+      var isHoldingShiftKey = event.shiftKey;
       handleHeaderCellSelection({
         type: 'column',
         activeCellCoordinates: activeCellCoordinates,
@@ -82,7 +84,9 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
         spreadsheetRef: ref,
         index: index,
         setSelectionAreaData: setSelectionAreaData,
-        isHoldingCommandKey: isHoldingCommandKey
+        isHoldingCommandKey: isHoldingCommandKey,
+        isHoldingShiftKey: isHoldingShiftKey,
+        currentMatcher: currentMatcher
       });
     };
   };
@@ -103,23 +107,30 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
     return function (event) {
       var _selectionAreaToClone;
 
+      if (event.shiftKey) {
+        // Remove columns, need to call handleHeaderCellSelection
+        return;
+      }
+
       setSelectedHeaderReorderActive(true);
+      var selectionAreaToClone = selectionAreas.filter(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.matcher) === currentMatcher;
+      });
+      var selectionAreaElement = ref.current.querySelector("[data-matcher-id=\"".concat((_selectionAreaToClone = selectionAreaToClone[0]) === null || _selectionAreaToClone === void 0 ? void 0 : _selectionAreaToClone.matcher, "\"]"));
       var clickXPosition = event.clientX;
       var headerButtonCoords = event.target.getBoundingClientRect();
+      var headerIndex = event.target.getAttribute('data-column-index');
       var offsetXValue = clickXPosition - headerButtonCoords.left;
+      var lowestColumnIndexFromSelectionArea = Math.min(selectionAreaToClone[0].point1.column, selectionAreaToClone[0].point2.column);
+      var selectionAreaCoords = selectionAreaElement.getBoundingClientRect();
+      var updatedOffsetDifference = lowestColumnIndexFromSelectionArea < parseInt(headerIndex) ? offsetXValue + (headerButtonCoords.left - selectionAreaCoords.left) : offsetXValue;
       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-clone-offset-x', updatedOffsetDifference);
       selectionAreaClonedElement.setAttribute('data-column-index-original', index);
       bodyContainer.appendChild(selectionAreaClonedElement);
       bodyContainer.appendChild(reorderIndicatorLine);
@@ -169,7 +180,7 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
     }, "\xA0")), headerGroup.headers.map(function (column, index) {
       var _cx2;
 
-      var selectedHeader = checkSelectedHeaderCell(index, selectionAreas, 'column');
+      var selectedHeader = checkSelectedHeaderCell(index, selectionAreas, 'column', rows);
       return /*#__PURE__*/React.createElement("div", _extends({
         key: "column_".concat(index),
         role: "columnheader",
@@ -213,6 +224,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   columns: PropTypes.array,
 
+  /**
+   * uuid that corresponds to the current selection area
+   */
+  currentMatcher: PropTypes.string,
+
   /**
    * Default spreadsheet sizing values
    */

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

@@ -7,7 +7,6 @@
 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
 
@@ -34,7 +33,6 @@ export var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
         spreadsheetCoords: spreadsheetCoords,
         leftScrollAmount: scrollAmount
       });
-      var scrollbarWidth = getScrollbarWidth();
       var spreadsheetWrapperElement = ref.current;
       spreadsheetWrapperElement.getBoundingClientRect();
       var xPositionRelativeToSpreadsheet = event.clientX - spreadsheetCoords.left;
@@ -44,7 +42,7 @@ export var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
       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, and
       // add the amount horizontally scrolled
 
-      clonedSelectionElement.style.left = px(totalSpreadsheetScrollingWidth - clonedSelectionWidth - scrollbarWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth - scrollbarWidth);
+      clonedSelectionElement.style.left = px(totalSpreadsheetScrollingWidth - clonedSelectionWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth);
     };
 
     if (headerCellHoldActive) {

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

@@ -30,7 +30,8 @@ export var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
       setActiveCellCoordinates = _ref.setActiveCellCoordinates,
       activeCellCoordinates = _ref.activeCellCoordinates,
       rows = _ref.rows,
-      defaultColumn = _ref.defaultColumn;
+      defaultColumn = _ref.defaultColumn,
+      selectionAreas = _ref.selectionAreas;
   useEffect(function () {
     var handleMouseUp = function handleMouseUp(event) {
       // Remove the cloned selection area on mouse up
@@ -45,8 +46,12 @@ export var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
 
         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 newColumnIndex = parseInt === null || parseInt === void 0 ? void 0 : parseInt(closestCell === null || closestCell === void 0 ? void 0 : closestCell.getAttribute('data-column-index'));
+          var originalColumnIndex = parseInt === null || parseInt === void 0 ? void 0 : parseInt(selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 ? void 0 : selectionAreaCloneElement.getAttribute('data-column-index-original'));
+          var selectionAreaToClone = selectionAreas.filter(function (item) {
+            return (item === null || item === void 0 ? void 0 : item.matcher) === currentMatcher;
+          });
+          var selectionAreaIndexArray = selectionAreaToClone[0].header.selectedIndexList;
           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) {
@@ -55,24 +60,11 @@ export var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
 
           var selectionAreaToMove = ref.current.querySelector("[data-matcher-id=\"".concat(currentMatcher, "\"]"));
           var spreadsheetPosition = ref.current.getBoundingClientRect();
-          var newIndexPosition = columnToMoveToElement.getBoundingClientRect();
           var listContainer = ref.current.querySelector(".".concat(blockClass, "__list--container"));
           var leftScrollAmount = listContainer.scrollLeft;
-          var relativeNewPosition = newIndexPosition.left - spreadsheetPosition.left + leftScrollAmount;
-          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);
+          var newIndexGreater = newColumnIndex > originalColumnIndex;
+          var differenceBetweenOldNewIndex = newIndexGreater ? newColumnIndex - originalColumnIndex : originalColumnIndex - newColumnIndex;
           setSelectionAreas(function (prev) {
             var selectionAreaClone = deepCloneObject(prev);
 
@@ -88,28 +80,65 @@ export var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
               return prev;
             }
 
-            selectionAreaClone[indexOfItemToUpdate].header.index = Number(newColumnIndex);
-            selectionAreaClone[indexOfItemToUpdate].point1.column = Number(newColumnIndex);
-            selectionAreaClone[indexOfItemToUpdate].point2.column = Number(newColumnIndex);
+            if (!selectionAreaIndexArray.includes(newColumnIndex)) {
+              // We need to not add just the newColumnIndex, but an array of indexes
+              // if there are multiple columns
+              var newIndexArray = newIndexGreater ? selectionAreaIndexArray.map(function (num) {
+                return num + differenceBetweenOldNewIndex;
+              }) : selectionAreaIndexArray.map(function (num) {
+                return num - differenceBetweenOldNewIndex;
+              });
+              selectionAreaClone[indexOfItemToUpdate].header.selectedIndexList = newIndexArray;
+              selectionAreaClone[indexOfItemToUpdate].point1.column = Math.min.apply(Math, _toConsumableArray(newIndexArray));
+              selectionAreaClone[indexOfItemToUpdate].point2.column = Math.max.apply(Math, _toConsumableArray(newIndexArray));
+            }
+
             return selectionAreaClone;
-          });
-          var columnIdArray = visibleColumns.map(function (column) {
-            return column.id;
-          });
+          }); // Only reorder columns if the new index is _not_ part of the
+          // selectionAreaIndexArray, meaning the new placement is outside
+          // of the current selection area. Similarly, the active cell position
+          // should only be changed under the same condition.
+
+          if (!selectionAreaIndexArray.includes(newColumnIndex)) {
+            var deleteCount = selectionAreaIndexArray.length;
+            var startIndex = Math.min.apply(Math, _toConsumableArray(selectionAreaIndexArray));
+            var columnIdArray = visibleColumns.map(function (column) {
+              return column.id;
+            });
 
-          var columnIdArrayClone = _toConsumableArray(columnIdArray); // Remove one element at the original index
+            var columnIdArrayClone = _toConsumableArray(columnIdArray);
 
+            var getNewColumnOrder = function getNewColumnOrder() {
+              var newColumnList = [];
+              selectionAreaIndexArray.map(function (index) {
+                return newColumnList.push(columnIdArray[index]);
+              });
+              return newColumnList;
+            }; // 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
+            columnIdArrayClone.splice(startIndex, deleteCount);
+            var originalPointIndex = selectionAreaIndexArray.findIndex(function (item) {
+              return item === originalColumnIndex;
+            });
+            var updatedNewIndexWithNewOrder = newColumnIndex - originalPointIndex; // Add one element at the new index
 
-          var newCellCoords = _objectSpread(_objectSpread({}, activeCellCoordinates), {}, {
-            column: Number(newColumnIndex)
-          });
+            columnIdArrayClone.splice.apply(columnIdArrayClone, [updatedNewIndexWithNewOrder, 0].concat(_toConsumableArray(getNewColumnOrder())));
+            setColumnOrder(columnIdArrayClone); // Function provided by useTable (react-table) hook to reorder columns
+
+            var newCellCoords = _objectSpread(_objectSpread({}, activeCellCoordinates), {}, {
+              column: newIndexGreater ? activeCellCoordinates.column + differenceBetweenOldNewIndex : activeCellCoordinates.column - differenceBetweenOldNewIndex
+            });
+
+            setActiveCellCoordinates(newCellCoords);
+            var firstSelectedHeader = Array.from(ref.current.querySelectorAll(".".concat(blockClass, "__th--selected-header")))[0];
+            var firstSelectedHeaderCoords = firstSelectedHeader.getBoundingClientRect();
+            var newRelativePosition = firstSelectedHeaderCoords.left - spreadsheetPosition.left + leftScrollAmount; // console.log(firstSelectedHeaderCoords.left - spreadsheetPosition.left + leftScrollAmount);
+
+            var updatedSelectionAreaPlacement = newIndexLessThanStarting ? newRelativePosition : newColumnIndex === originalColumnIndex ? selectionAreaToMove.style.left : newRelativePosition;
+            selectionAreaToMove.style.left = px(updatedSelectionAreaPlacement);
+          } // Remove the cloned column and indicator elements
 
-          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();
@@ -151,5 +180,5 @@ export var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
     return function () {
       document.removeEventListener('mouseup', handleMouseUp);
     };
-  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn]);
+  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas]);
 };

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

@@ -5,12 +5,26 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
-export var checkSelectedHeaderCell = function checkSelectedHeaderCell(headerIndex, selectionAreas, headerType) {
+export var checkSelectedHeaderCell = function checkSelectedHeaderCell(headerIndex, selectionAreas, headerType, items) {
   var areasCloned = deepCloneObject(selectionAreas);
   var isSelectedHeader = areasCloned.some(function (area) {
-    var _area$header, _area$header2;
+    var _area$point, _area$point2, _area$point3, _area$point4, _area$point5, _area$point6, _area$point7, _area$point8;
 
-    return (area === null || area === void 0 ? void 0 : (_area$header = area.header) === null || _area$header === void 0 ? void 0 : _area$header.type) === headerType && headerIndex === (area === null || area === void 0 ? void 0 : (_area$header2 = area.header) === null || _area$header2 === void 0 ? void 0 : _area$header2.index);
+    var oppositeType = headerType === 'column' ? 'row' : 'column';
+    var minOppositeSelection = Math.min(area === null || area === void 0 ? void 0 : (_area$point = area.point1) === null || _area$point === void 0 ? void 0 : _area$point[oppositeType], area === null || area === void 0 ? void 0 : (_area$point2 = area.point2) === null || _area$point2 === void 0 ? void 0 : _area$point2[oppositeType]);
+    var maxOppositeSelection = Math.max(area === null || area === void 0 ? void 0 : (_area$point3 = area.point1) === null || _area$point3 === void 0 ? void 0 : _area$point3[oppositeType], area === null || area === void 0 ? void 0 : (_area$point4 = area.point2) === null || _area$point4 === void 0 ? void 0 : _area$point4[oppositeType]);
+    var minSelection = Math.min(area === null || area === void 0 ? void 0 : (_area$point5 = area.point1) === null || _area$point5 === void 0 ? void 0 : _area$point5[headerType], area === null || area === void 0 ? void 0 : (_area$point6 = area.point2) === null || _area$point6 === void 0 ? void 0 : _area$point6[headerType]);
+    var maxSelection = Math.max(area === null || area === void 0 ? void 0 : (_area$point7 = area.point1) === null || _area$point7 === void 0 ? void 0 : _area$point7[headerType], area === null || area === void 0 ? void 0 : (_area$point8 = area.point2) === null || _area$point8 === void 0 ? void 0 : _area$point8[headerType]);
+    var isTrueSelectedState = (items === null || items === void 0 ? void 0 : items.length) - 1 === maxOppositeSelection && minOppositeSelection === 0; // console.log({minSelection, maxSelection});
+    // Iterate over all columns included in the selection area
+
+    for (var i = minSelection; i <= maxSelection; i++) {
+      if (headerIndex === i && isTrueSelectedState) {
+        return true;
+      }
+    }
+
+    return false;
   });
   return isSelectedHeader;
 };