@carbon/ibm-products 1.18.2 → 1.20.0

package/lib/components/AddSelect/AddSelectSidebar.js

@@ -23,15 +23,19 @@ var _settings = require("../../settings");
 
 var _AddSelectMetaPanel = require("./AddSelectMetaPanel");
 
-var _excluded = ["icon", "avatar"];
+var _excluded = ["meta", "icon", "avatar"];
 var componentName = 'AddSelectSidebar';
 
 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,
@@ -39,6 +43,8 @@ var AddSelectSidebar = function AddSelectSidebar(_ref) {
       setDisplayMetaPanel = _ref.setDisplayMetaPanel,
       setMultiSelection = _ref.setMultiSelection;
   var blockClass = "".concat(_settings.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) {
@@ -53,31 +59,31 @@ 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 = (0, _objectWithoutProperties2.default)(selectedItem, _excluded);
     acc.push(newItem);
     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.default.createElement("div", {
       className: "".concat(blockClass, "-accordion-title")
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "-selected-item")
     }, /*#__PURE__*/_react.default.createElement("p", {
       className: "".concat(blockClass, "-selected-item-title")
-    }, title), /*#__PURE__*/_react.default.createElement("p", {
+    }, item.title), /*#__PURE__*/_react.default.createElement("p", {
       className: "".concat(blockClass, "-selected-item-subtitle")
-    }, subtitle)), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+    }, item.subtitle)), hasModifiers && /*#__PURE__*/_react.default.createElement("div", null, appliedModifiers.find(function (modifier) {
+      return modifier.id === item.id;
+    })[modifiers.id]), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
       renderIcon: _iconsReact.SubtractAlt32,
       iconDescription: removeIconDescription,
       hasIconOnly: true,
       onClick: function onClick() {
-        return handleItemRemove(id);
+        return handleItemRemove(item.id);
       },
       kind: "ghost",
       className: "".concat(blockClass, "-item-remove-button"),
@@ -103,7 +109,7 @@ var AddSelectSidebar = function AddSelectSidebar(_ref) {
   }, influencerTitle), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Tag, {
     type: "gray",
     size: "sm"
-  }, multiSelection.length)), multiSelection.length > 0 ? /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Accordion, {
+  }, multiSelection.length)), hasSelections ? /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Accordion, {
     align: "start"
   }, sidebarItems.map(function (item) {
     return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.AccordionItem, {
@@ -130,11 +136,13 @@ var AddSelectSidebar = function AddSelectSidebar(_ref) {
 
 exports.AddSelectSidebar = AddSelectSidebar;
 AddSelectSidebar.propTypes = {
+  appliedModifiers: _propTypes.default.array,
   closeIconDescription: _propTypes.default.string,
   displayMetalPanel: _propTypes.default.object,
   influencerTitle: _propTypes.default.string,
   items: _propTypes.default.array,
   metaPanelTitle: _propTypes.default.string,
+  modifiers: _propTypes.default.object,
   multiSelection: _propTypes.default.array,
   noSelectionDescription: _propTypes.default.string,
   noSelectionTitle: _propTypes.default.string,

package/lib/components/ComboButton/ComboButton.js

@@ -23,14 +23,12 @@ var _iconsReact = require("@carbon/icons-react");
 
 var _carbonComponentsReact = require("carbon-components-react");
 
-var _OverflowMenu = require("carbon-components-react/lib/components/OverflowMenu/OverflowMenu");
-
-var _setupGetInstanceId = _interopRequireDefault(require("carbon-components-react/lib/tools/setupGetInstanceId"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _propTypes = require("prop-types");
 
+var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _excluded = ["children", "className", "overflowMenu"],
@@ -45,7 +43,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 getInstanceId = (0, _setupGetInstanceId.default)();
 var blockClass = 'security--combo-button';
 /**
  * The combo button consolidates similar actions, while exposing the most commonly used one.
@@ -57,7 +54,7 @@ var ComboButton = function ComboButton(_ref) {
       overflowMenu = _ref.overflowMenu,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
 
-  var _useRef = (0, _react.useRef)(getInstanceId()),
+  var _useRef = (0, _react.useRef)((0, _uuidv.default)()),
       instanceId = _useRef.current;
 
   var _useState = (0, _react.useState)(false),
@@ -83,7 +80,7 @@ var ComboButton = function ComboButton(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass, className),
     "data-floating-menu-container": true
-  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, primaryAction), restActions.length > 0 && /*#__PURE__*/_react.default.createElement(_OverflowMenu.OverflowMenu, (0, _extends2.default)({}, overflowMenu, {
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, primaryAction), restActions.length > 0 && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, (0, _extends2.default)({}, overflowMenu, {
     className: "".concat(blockClass, "__overflow-menu"),
     menuOptionsClass: "".concat(blockClass, "__overflow-menu__list"),
     onClick: function onClick() {
@@ -121,5 +118,5 @@ ComboButton.propTypes = {
   className: _propTypes.string,
 
   /** Provide the [props of the `OverflowMenu`](https://react.carbondesignsystem.com/?path=/docs/overflowmenu) */
-  overflowMenu: (0, _propTypes.shape)(_OverflowMenu.OverflowMenu.propTypes)
+  overflowMenu: (0, _propTypes.shape)(_carbonComponentsReact.OverflowMenu.propTypes)
 };

package/lib/components/CreateSidePanel/CreateSidePanel.js

@@ -27,8 +27,6 @@ var _carbonComponentsReact = require("carbon-components-react");
 
 var _SidePanel = require("../SidePanel");
 
-var _ActionSet = require("../ActionSet");
-
 var _excluded = ["className", "children", "disableSubmit", "formTitle", "formDescription", "onRequestClose", "onRequestSubmit", "open", "primaryButtonText", "secondaryButtonText", "selectorPageContent", "selectorPrimaryFocus", "subtitle", "title"];
 
 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; }
@@ -37,7 +35,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 // The block part of our conventional BEM class names (blockClass__E--M).
 var blockClass = "".concat(_settings.pkg.prefix, "--create-side-panel");
-var sidePanelBlockClass = "".concat(_settings.pkg.prefix, "--side-panel");
 var componentName = 'CreateSidePanel'; // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
 /**
@@ -74,7 +71,6 @@ var CreateSidePanel = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     onClick: onRequestClose,
     kind: 'secondary'
   }];
-  var actionContainerClassNames = (0, _classnames.default)(["".concat(blockClass, "__actions-container"), "".concat(sidePanelBlockClass, "__actions-container")]);
   return selectorPageContent && /*#__PURE__*/_react.default.createElement(_SidePanel.SidePanel, (0, _extends2.default)({}, rest, _objectSpread({
     open: open,
     ref: ref,
@@ -88,18 +84,15 @@ var CreateSidePanel = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     slideIn: true,
     animateTitle: false,
     className: (0, _classnames.default)(blockClass, className),
-    size: "md"
+    size: "md",
+    actions: actions
   }), /*#__PURE__*/_react.default.createElement("h3", {
     className: "".concat(blockClass, "__form-title-text ").concat(blockClass, "__content-text")
   }, formTitle), /*#__PURE__*/_react.default.createElement("p", {
     className: "".concat(blockClass, "__form-description-text ").concat(blockClass, "__content-text")
   }, formDescription), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Form, {
     className: "".concat(blockClass, "__form")
-  }, children, /*#__PURE__*/_react.default.createElement(_ActionSet.ActionSet, {
-    actions: actions,
-    className: actionContainerClassNames,
-    size: "md"
-  })));
+  }, children));
 });
 
 exports.CreateSidePanel = CreateSidePanel;

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -701,7 +701,8 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.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') {
@@ -802,6 +803,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     activeCellCoordinates: activeCellCoordinates,
     cellSize: cellSize,
     columns: columns,
+    currentMatcher: currentMatcher,
     defaultColumn: defaultColumn,
     headerGroups: headerGroups,
     rows: rows,

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -197,7 +197,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
     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
@@ -421,7 +422,7 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         "data-column-index": "header",
         type: "button",
         onClick: handleRowHeaderClick(index),
-        className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row')), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__td-th--selected-header"), (0, _checkSelectedHeaderCell.checkSelectedHeaderCell)(index, selectionAreas, 'row')), _cx)),
+        className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row')), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__td-th--selected-header"), (0, _checkSelectedHeaderCell.checkSelectedHeaderCell)(index, selectionAreas, 'row', columns)), _cx)),
         style: {
           width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
         }
@@ -450,7 +451,7 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         }, 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 = (0, _react.useRef)();
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: spreadsheetBodyRef,

package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -52,6 +52,7 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
   var activeCellCoordinates = _ref.activeCellCoordinates,
       cellSize = _ref.cellSize,
       columns = _ref.columns,
+      currentMatcher = _ref.currentMatcher,
       defaultColumn = _ref.defaultColumn,
       headerGroups = _ref.headerGroups,
       scrollBarSize = _ref.scrollBarSize,
@@ -94,6 +95,7 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
   var handleColumnHeaderClick = function handleColumnHeaderClick(index) {
     return function (event) {
       var isHoldingCommandKey = event.metaKey || event.ctrlKey;
+      var isHoldingShiftKey = event.shiftKey;
       (0, _handleHeaderCellSelection.handleHeaderCellSelection)({
         type: 'column',
         activeCellCoordinates: activeCellCoordinates,
@@ -105,7 +107,9 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
         spreadsheetRef: ref,
         index: index,
         setSelectionAreaData: setSelectionAreaData,
-        isHoldingCommandKey: isHoldingCommandKey
+        isHoldingCommandKey: isHoldingCommandKey,
+        isHoldingShiftKey: isHoldingShiftKey,
+        currentMatcher: currentMatcher
       });
     };
   };
@@ -126,23 +130,30 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_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 = (0, _layout.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);
@@ -192,7 +203,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');
+      var selectedHeader = (0, _checkSelectedHeaderCell.checkSelectedHeaderCell)(index, selectionAreas, 'column', rows);
       return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
         key: "column_".concat(index),
         role: "columnheader",
@@ -237,6 +248,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   columns: _propTypes.default.array,
 
+  /**
+   * uuid that corresponds to the current selection area
+   */
+  currentMatcher: _propTypes.default.string,
+
   /**
    * Default spreadsheet sizing values
    */

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

@@ -11,8 +11,6 @@ var _layout = require("@carbon/layout");
 
 var _settings = require("../../../settings");
 
-var _getScrollbarWidth = require("../../../global/js/utils/getScrollbarWidth");
-
 var _moveColumnIndicatorLine = require("../utils/moveColumnIndicatorLine");
 
 /**
@@ -46,7 +44,6 @@ var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
         spreadsheetCoords: spreadsheetCoords,
         leftScrollAmount: scrollAmount
       });
-      var scrollbarWidth = (0, _getScrollbarWidth.getScrollbarWidth)();
       var spreadsheetWrapperElement = ref.current;
       spreadsheetWrapperElement.getBoundingClientRect();
       var xPositionRelativeToSpreadsheet = event.clientX - spreadsheetCoords.left;
@@ -56,7 +53,7 @@ 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 = (0, _layout.px)(totalSpreadsheetScrollingWidth - clonedSelectionWidth - scrollbarWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth - scrollbarWidth);
+      clonedSelectionElement.style.left = (0, _layout.px)(totalSpreadsheetScrollingWidth - clonedSelectionWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth);
     };
 
     if (headerCellHoldActive) {

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

@@ -38,7 +38,8 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
       setActiveCellCoordinates = _ref.setActiveCellCoordinates,
       activeCellCoordinates = _ref.activeCellCoordinates,
       rows = _ref.rows,
-      defaultColumn = _ref.defaultColumn;
+      defaultColumn = _ref.defaultColumn,
+      selectionAreas = _ref.selectionAreas;
   (0, _react.useEffect)(function () {
     var handleMouseUp = function handleMouseUp(event) {
       // Remove the cloned selection area on mouse up
@@ -53,8 +54,12 @@ 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) {
@@ -63,24 +68,11 @@ 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 = (0, _layout.px)(updatedSelectionAreaPlacement);
+          var newIndexGreater = newColumnIndex > originalColumnIndex;
+          var differenceBetweenOldNewIndex = newIndexGreater ? newColumnIndex - originalColumnIndex : originalColumnIndex - newColumnIndex;
           setSelectionAreas(function (prev) {
             var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
 
@@ -96,26 +88,64 @@ 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, (0, _toConsumableArray2.default)(newIndexArray));
+              selectionAreaClone[indexOfItemToUpdate].point2.column = Math.max.apply(Math, (0, _toConsumableArray2.default)(newIndexArray));
+            }
+
             return selectionAreaClone;
-          });
-          var columnIdArray = visibleColumns.map(function (column) {
-            return column.id;
-          });
-          var columnIdArrayClone = (0, _toConsumableArray2.default)(columnIdArray); // Remove one element at the original index
+          }); // 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, (0, _toConsumableArray2.default)(selectionAreaIndexArray));
+            var columnIdArray = visibleColumns.map(function (column) {
+              return column.id;
+            });
+            var columnIdArrayClone = (0, _toConsumableArray2.default)(columnIdArray);
 
-          columnIdArrayClone.splice(originalColumnIndex, 1); // Add one element at the new index
+            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(newColumnIndex, 0, columnIdArray[originalColumnIndex]);
-          setColumnOrder(columnIdArrayClone); // Function provided by useTable (react-table) hook to reorder columns
 
-          var newCellCoords = _objectSpread(_objectSpread({}, activeCellCoordinates), {}, {
-            column: Number(newColumnIndex)
-          });
+            columnIdArrayClone.splice(startIndex, deleteCount);
+            var originalPointIndex = selectionAreaIndexArray.findIndex(function (item) {
+              return item === originalColumnIndex;
+            });
+            var updatedNewIndexWithNewOrder = newColumnIndex - originalPointIndex; // Add one element at the new index
+
+            columnIdArrayClone.splice.apply(columnIdArrayClone, [updatedNewIndexWithNewOrder, 0].concat((0, _toConsumableArray2.default)(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 = (0, _layout.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();
@@ -157,7 +187,7 @@ 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]);
 };
 
 exports.useSpreadsheetMouseUp = useSpreadsheetMouseUp;

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

@@ -13,12 +13,26 @@ var _deepCloneObject = require("../../../global/js/utils/deepCloneObject");
  * 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 checkSelectedHeaderCell = function checkSelectedHeaderCell(headerIndex, selectionAreas, headerType) {
+var checkSelectedHeaderCell = function checkSelectedHeaderCell(headerIndex, selectionAreas, headerType, items) {
   var areasCloned = (0, _deepCloneObject.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;
 };