@carbon/ibm-products 1.18.1 → 1.19.1

package/es/components/Datagrid/Datagrid/DraggableElement.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 // @flow
 
@@ -13,10 +14,12 @@ import PropTypes from 'prop-types';
 import { Draggable16 } from '@carbon/icons-react';
 import { useDrag, useDrop } from 'react-dnd';
 import cx from 'classnames';
+import { pkg } from '../../../settings';
 var useEffect = React.useEffect,
     useRef = React.useRef,
     useState = React.useState;
-var DRAG_TYPE = 'wkc-shared-ui-draggable-element';
+var blockClass = "".concat(pkg.prefix, "--datagrid");
+var DRAG_TYPE = "".concat(blockClass, "__shared-ui-draggable-element");
 
 var DraggableElement = function DraggableElement(_ref) {
   var id = _ref.id,
@@ -55,7 +58,6 @@ var DraggableElement = function DraggableElement(_ref) {
       var dragIndex = item.index;
       var hoverIndex = index; // Don't replace items with themselves
 
-      // Don't replace items with themselves
       if (dragIndex === hoverIndex || disabled) {
         return;
       }
@@ -67,12 +69,6 @@ var DraggableElement = function DraggableElement(_ref) {
       // to avoid expensive index searches.
       // eslint-disable-next-line no-param-reassign
 
-      // Time to actually perform the action
-      // Note: we're mutating the monitor item here!
-      // Generally it's better to avoid mutations,
-      // but it's good here for the sake of performance
-      // to avoid expensive index searches.
-      // eslint-disable-next-line no-param-reassign
       item.index = hoverIndex;
     }
   }),
@@ -120,14 +116,10 @@ var DraggableElement = function DraggableElement(_ref) {
   var content = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: cx({
       disabled: disabled
-    }, 'wkc-draggable-handleStyle')
+    }, "".concat(blockClass, "__draggable-handleStyle"))
   }, /*#__PURE__*/React.createElement(Draggable16, null)), children);
   return /*#__PURE__*/React.createElement("li", {
-    className: cx({
-      'wkc-draggable-handleHolder-isOver': isOver && !disabled
-    }, {
-      'wkc-draggable-handleHolder--grabbed': isGrabbed
-    }, 'wkc-draggable-handleHolder'),
+    className: cx(_defineProperty({}, "".concat(blockClass, "__draggable-handleHolder-isOver"), isOver && !disabled), _defineProperty({}, "".concat(blockClass, "__wkc-draggable-handleHolder--grabbed"), isGrabbed), "".concat(blockClass, "__draggable-handleHolder")),
     ref: ref,
     "aria-selected": isFocused,
     role: "option",
@@ -155,17 +147,15 @@ var DraggableElement = function DraggableElement(_ref) {
       setIsFocusedOnItem(e.currentTarget === e.target);
     }
   }, /*#__PURE__*/React.createElement("span", {
-    className: "wkc-shared-ui--assistive-text"
+    className: "".concat(blockClass, "__shared-ui--assistive-text")
   }, ariaLabel), isDragging && !isOver ? /*#__PURE__*/React.createElement("div", {
     ref: preview,
-    className: "wkc-draggable-handleHolder-droppable"
+    className: "${blockClass}__draggable-handleHolder-droppable"
   }, content) : /*#__PURE__*/React.createElement("div", {
     ref: drag,
     "aria-hidden": isFocused && isFocusedOnItem // if focus on li, hide the children from aria
     ,
-    className: cx({
-      'wkc-draggable-handleStyle': !disabled
-    }, 'wkc-draggable-handleHolder-droppable')
+    className: cx(_defineProperty({}, "".concat(blockClass, "__draggable-handleStyle"), !disabled), ["".concat(blockClass, "__draggable-handleHolder-droppable")])
   }, (!isOver || disabled) && content));
 };
 

package/es/components/ExportModal/ExportModal.js

@@ -79,7 +79,7 @@ export var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
     setName(filename);
     setExtension(preformattedExtensions === null || preformattedExtensions === void 0 ? void 0 : (_preformattedExtensio = preformattedExtensions[0]) === null || _preformattedExtensio === void 0 ? void 0 : _preformattedExtensio.extension);
-  }, [filename, preformattedExtensions]);
+  }, [filename, preformattedExtensions, open]);
 
   var onNameChangeHandler = function onNameChangeHandler(evt) {
     setName(evt.target.value);

package/es/global/js/hooks/useWindowResize.js

@@ -1,11 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _typeof from "@babel/runtime/helpers/typeof";
 
 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; }
 
 import { useRef, useLayoutEffect } from 'react';
-var windowExists = typeof window !== "undefined";
+var windowExists = (typeof window === "undefined" ? "undefined" : _typeof(window)) !== "undefined";
 
 var getWindowSize = function getWindowSize() {
   if (!windowExists) {

package/es/global/js/hooks/useWindowScroll.js

@@ -1,6 +1,7 @@
+import _typeof from "@babel/runtime/helpers/typeof";
 import { useRef, useLayoutEffect } from 'react';
 import { scrollableAncestor } from '../utils/scrollableAncestor';
-var windowExists = typeof window !== "undefined";
+var windowExists = (typeof window === "undefined" ? "undefined" : _typeof(window)) !== "undefined";
 
 var useTargetScroll = function useTargetScroll(target, effect, deps, throttleInterval) {
   var scrollPosition = useRef({});

package/es/global/js/utils/scrollableAncestor.js

@@ -1,4 +1,5 @@
-var windowExists = typeof window !== "undefined"; // determine whether the target is scrollable
+import _typeof from "@babel/runtime/helpers/typeof";
+var windowExists = (typeof window === "undefined" ? "undefined" : _typeof(window)) !== "undefined"; // determine whether the target is scrollable
 
 var scrollable = function scrollable(target) {
   var style = window.getComputedStyle(target);

package/lib/components/ActionSet/ActionSet.js

@@ -148,6 +148,7 @@ ActionSet.validateActions = function (sizeFn) {
     var problems = [];
 
     if (actions > 0) {
+      // eslint-disable-next-line react/prop-types
       var size = sizeFn ? sizeFn(props) : props.size || defaults.size;
       var stacking = willStack(size, actions);
 

package/lib/components/AddSelect/AddSelectFilter.js

@@ -17,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _carbonComponentsReact = require("carbon-components-react");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _iconsReact = require("@carbon/icons-react");
@@ -79,6 +81,7 @@ var AddSelectFilter = function AddSelectFilter(_ref) {
 
 
   var applyFilters = function applyFilters() {
+    setOpen(false);
     handleFilter(filters);
   };
 
@@ -104,6 +107,8 @@ var AddSelectFilter = function AddSelectFilter(_ref) {
   };
 
   var showFilter = multi && (filterOpts === null || filterOpts === void 0 ? void 0 : filterOpts.length) > 0;
+  var filterBtnClassnames = (0, _classnames.default)("".concat(blockClass, "-toggle"), (0, _defineProperty2.default)({}, "".concat(blockClass, "-toggle--open"), open));
+  var dirtyInput = Object.keys(filters).length > 0;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "-search")
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, {
@@ -120,7 +125,7 @@ var AddSelectFilter = function AddSelectFilter(_ref) {
       return setOpen(!open);
     },
     iconDescription: iconDescription,
-    className: "".concat(blockClass, "-toggle"),
+    className: filterBtnClassnames,
     size: "md"
   }), open && /*#__PURE__*/_react.default.createElement("div", {
     className: blockClass
@@ -146,11 +151,13 @@ var AddSelectFilter = function AddSelectFilter(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
     kind: "secondary",
     onClick: resetFilters,
-    className: "".concat(blockClass, "-button")
+    className: "".concat(blockClass, "-button"),
+    disabled: !dirtyInput
   }, secondaryButtonText), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
     kind: "primary",
     onClick: applyFilters,
-    className: "".concat(blockClass, "-button")
+    className: "".concat(blockClass, "-button"),
+    disabled: !dirtyInput && !hasFiltersApplied
   }, primaryButtonText)))), hasFiltersApplied && /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "-applied")
   }, Object.keys(appliedFilters).map(function (filterType) {

package/lib/components/AddSelect/AddSelectSidebar.js

@@ -23,7 +23,7 @@ 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) {
@@ -53,7 +53,8 @@ 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);

package/lib/components/ComboButton/ComboButton.js

@@ -23,8 +23,6 @@ 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"));
@@ -83,7 +81,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 +119,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/DataSpreadsheet/DataSpreadsheet.js

@@ -81,7 +81,7 @@ var blockClass = "".concat(_settings.pkg.prefix, "--data-spreadsheet");
 var componentName = 'DataSpreadsheet'; // Default values for props
 
 var defaults = {
-  cellSize: 'standard',
+  cellSize: 'sm',
   columns: Object.freeze([]),
   data: Object.freeze([]),
   defaultEmptyRowCount: 16,
@@ -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,
@@ -900,7 +902,7 @@ DataSpreadsheet.propTypes = {
   /**
    * Specifies the cell height
    */
-  cellSize: _propTypes.default.oneOf(['compact', 'standard', 'medium', 'large']),
+  cellSize: _propTypes.default.oneOf(['xs', 'sm', 'md', 'lg']),
 
   /**
    * Provide an optional class to be applied to the containing node.

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -96,7 +96,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
   var contentScrollRef = (0, _react.useRef)();
   var previousState = (0, _hooks.usePreviousValue)({
     selectionAreaData: selectionAreaData,
-    clickAndHoldActive: clickAndHoldActive
+    clickAndHoldActive: clickAndHoldActive,
+    rowHeight: defaultColumn.rowHeight
   }); // Set custom css property containing the spreadsheet total width
 
   (0, _react.useEffect)(function () {
@@ -176,7 +177,7 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
 
     for (var rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {
       for (var columnIndex = columnStart; columnIndex <= columnEnd; columnIndex++) {
-        cellContainer.push([rowIndex, columnIndex]);
+        cellContainer.push([rowIndex, columnIndex, "".concat(blockClass, "__cell--").concat(rowIndex, "--").concat(columnIndex)]);
       }
     }
 
@@ -196,18 +197,47 @@ 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
+  // cell also gets updated with the new size and new top placement
+  // value. All of the cell selections will be updated as well
 
   (0, _react.useEffect)(function () {
     var listContainer = spreadsheetBodyRef === null || spreadsheetBodyRef === void 0 ? void 0 : spreadsheetBodyRef.current;
     var activeCellButton = listContainer.querySelector(".".concat(blockClass, "__active-cell--highlight"));
 
-    if (activeCellButton) {
+    if (activeCellButton && defaultColumn.rowHeight !== previousState.rowHeight) {
       activeCellButton.style.height = "".concat(defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight, "px");
+
+      if (activeCellCoordinates) {
+        var activeTargetElement = ref.current.querySelector("[data-row-index=\"".concat(activeCellCoordinates.row, "\"][data-column-index=\"").concat(activeCellCoordinates.column, "\"]"));
+
+        var _listContainer = ref.current.querySelector(".".concat(blockClass, "__list--container"));
+
+        var newActiveCellTopPosition = activeTargetElement.getBoundingClientRect().top - _listContainer.getBoundingClientRect().top;
+
+        activeCellButton.style.top = (0, _layout.px)(newActiveCellTopPosition);
+        (0, _removeCellSelections.removeCellSelections)({
+          spreadsheetRef: ref
+        });
+        selectionAreas.map(function (area) {
+          if (!area.areaCreated && area.point1 && area.point2 && area.matcher) {
+            return (0, _createCellSelectionArea.createCellSelectionArea)({
+              ref: ref,
+              area: area,
+              blockClass: blockClass,
+              defaultColumn: defaultColumn,
+              selectionAreas: selectionAreas,
+              setSelectionAreas: setSelectionAreas,
+              setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea,
+              visibleColumns: visibleColumns
+            });
+          }
+        });
+      }
     }
-  }, [defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight]); // onClick fn for each cell in the data spreadsheet body,
+  }, [defaultColumn, ref, activeCellCoordinates, previousState === null || previousState === void 0 ? void 0 : previousState.rowHeight, selectionAreas, setActiveCellInsideSelectionArea, setSelectionAreas, visibleColumns]); // onClick fn for each cell in the data spreadsheet body,
   // adds the active cell highlight
 
   var handleBodyCellClick = (0, _react.useCallback)(function (cell, columnIndex) {
@@ -392,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
         }
@@ -421,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",
@@ -230,13 +241,18 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Specifies the cell height
    */
-  cellSize: _propTypes.default.oneOf(['compact', 'standard', 'medium', 'large']),
+  cellSize: _propTypes.default.oneOf(['xs', 'sm', 'md', 'lg']),
 
   /**
    * All of the spreadsheet columns
    */
   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");
 
 /**
@@ -38,21 +36,24 @@ var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
       }
 
       var spreadsheetCoords = ref.current.getBoundingClientRect();
+      var listContainer = ref.current.querySelector(".".concat(blockClass, "__list--container"));
+      var scrollAmount = listContainer.scrollLeft;
       (0, _moveColumnIndicatorLine.moveColumnIndicatorLine)({
         clonedSelectionElement: clonedSelectionElement,
         ref: ref,
-        spreadsheetCoords: spreadsheetCoords
+        spreadsheetCoords: spreadsheetCoords,
+        leftScrollAmount: scrollAmount
       });
-      var scrollbarWidth = (0, _getScrollbarWidth.getScrollbarWidth)();
       var spreadsheetWrapperElement = ref.current;
       spreadsheetWrapperElement.getBoundingClientRect();
       var xPositionRelativeToSpreadsheet = event.clientX - spreadsheetCoords.left;
       var offsetXValue = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-clone-offset-x');
-      var totalSpreadsheetWidth = ref.current.offsetWidth;
+      var totalSpreadsheetScrollingWidth = listContainer.scrollWidth;
       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
+      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)(totalSpreadsheetWidth - clonedSelectionWidth - scrollbarWidth >= clonePlacement ? clonePlacement : totalSpreadsheetWidth - 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,22 +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 relativeNewPosition = newIndexPosition.left - spreadsheetPosition.left;
-          var cloneColumnWidth = selectionAreaCloneElement.offsetWidth;
-          var columnsWidthUpToNewIndex = 0;
+          var listContainer = ref.current.querySelector(".".concat(blockClass, "__list--container"));
+          var leftScrollAmount = listContainer.scrollLeft;
           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);
 
@@ -94,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();
@@ -155,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;