@carbon/ibm-products 1.18.1 → 1.19.1

package/es/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -68,7 +68,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var contentScrollRef = useRef();
   var previousState = usePreviousValue({
     selectionAreaData: selectionAreaData,
-    clickAndHoldActive: clickAndHoldActive
+    clickAndHoldActive: clickAndHoldActive,
+    rowHeight: defaultColumn.rowHeight
   }); // Set custom css property containing the spreadsheet total width
 
   useEffect(function () {
@@ -148,7 +149,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
     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)]);
       }
     }
 
@@ -168,18 +169,47 @@ 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
+  // cell also gets updated with the new size and new top placement
+  // value. All of the cell selections will be updated as well
 
   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 = px(newActiveCellTopPosition);
+        removeCellSelections({
+          spreadsheetRef: ref
+        });
+        selectionAreas.map(function (area) {
+          if (!area.areaCreated && area.point1 && area.point2 && area.matcher) {
+            return 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 = useCallback(function (cell, columnIndex) {
@@ -366,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
         }
@@ -395,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",
@@ -206,13 +217,18 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Specifies the cell height
    */
-  cellSize: PropTypes.oneOf(['compact', 'standard', 'medium', 'large']),
+  cellSize: PropTypes.oneOf(['xs', 'sm', 'md', 'lg']),
 
   /**
    * All of the spreadsheet columns
    */
   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
 
@@ -26,21 +25,24 @@ export var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
       }
 
       var spreadsheetCoords = ref.current.getBoundingClientRect();
+      var listContainer = ref.current.querySelector(".".concat(blockClass, "__list--container"));
+      var scrollAmount = listContainer.scrollLeft;
       moveColumnIndicatorLine({
         clonedSelectionElement: clonedSelectionElement,
         ref: ref,
-        spreadsheetCoords: spreadsheetCoords
+        spreadsheetCoords: spreadsheetCoords,
+        leftScrollAmount: scrollAmount
       });
-      var scrollbarWidth = getScrollbarWidth();
       var spreadsheetWrapperElement = ref.current;
       spreadsheetWrapperElement.getBoundingClientRect();
       var xPositionRelativeToSpreadsheet = event.clientX - spreadsheetCoords.left;
       var offsetXValue = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-clone-offset-x');
-      var totalSpreadsheetWidth = ref.current.offsetWidth;
+      var 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 = px(totalSpreadsheetWidth - clonedSelectionWidth - scrollbarWidth >= clonePlacement ? clonePlacement : totalSpreadsheetWidth - 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,22 +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 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 = px(updatedSelectionAreaPlacement);
+          var newIndexGreater = newColumnIndex > originalColumnIndex;
+          var differenceBetweenOldNewIndex = newIndexGreater ? newColumnIndex - originalColumnIndex : originalColumnIndex - newColumnIndex;
           setSelectionAreas(function (prev) {
             var selectionAreaClone = deepCloneObject(prev);
 
@@ -86,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();
@@ -149,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;
 };

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

@@ -4,7 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { baseFontSize, sizeXSmall as compact, sizeSmall as standard, sizeMedium as medium, sizeLarge as large } from '@carbon/layout';
+import { baseFontSize, sizeXSmall as xs, sizeSmall as sm, sizeMedium as md, sizeLarge as lg } from '@carbon/layout';
 
 var getSizeInPixels = function getSizeInPixels(carbonSize) {
   return Number(carbonSize.replace('rem', '') * baseFontSize);
@@ -12,19 +12,19 @@ var getSizeInPixels = function getSizeInPixels(carbonSize) {
 
 export var getCellSize = function getCellSize(cellSize) {
   switch (cellSize) {
-    case 'compact':
-      return getSizeInPixels(compact);
+    case 'xs':
+      return getSizeInPixels(xs);
 
-    case 'standard':
-      return getSizeInPixels(standard);
+    case 'sm':
+      return getSizeInPixels(sm);
 
-    case 'medium':
-      return getSizeInPixels(medium);
+    case 'md':
+      return getSizeInPixels(md);
 
-    case 'large':
-      return getSizeInPixels(large);
+    case 'lg':
+      return getSizeInPixels(lg);
 
     default:
-      return getSizeInPixels(standard);
+      return getSizeInPixels(sm);
   }
 };

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

@@ -10,19 +10,37 @@ import { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
 import uuidv4 from '../../../global/js/utils/uuidv4';
 import { removeCellSelections } from './removeCellSelections';
 import { checkActiveHeaderCell } from './checkActiveHeaderCell';
-export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref) {
-  var type = _ref.type,
-      activeCellCoordinates = _ref.activeCellCoordinates,
-      rows = _ref.rows,
-      columns = _ref.columns,
-      setActiveCellCoordinates = _ref.setActiveCellCoordinates,
-      setCurrentMatcher = _ref.setCurrentMatcher,
-      setSelectionAreas = _ref.setSelectionAreas,
-      spreadsheetRef = _ref.spreadsheetRef,
-      index = _ref.index,
-      isKeyboard = _ref.isKeyboard,
-      setSelectionAreaData = _ref.setSelectionAreaData,
-      isHoldingCommandKey = _ref.isHoldingCommandKey;
+
+var getSelectedItemIndexList = function getSelectedItemIndexList(_ref) {
+  var indexList = _ref.indexList,
+      newIndex = _ref.newIndex,
+      activeCellIndex = _ref.activeCellIndex;
+  var lowestIndex = newIndex > activeCellIndex ? activeCellIndex : Math.min.apply(Math, _toConsumableArray(indexList).concat([newIndex]));
+  var highestIndex = newIndex < activeCellIndex ? activeCellIndex : Math.max.apply(Math, _toConsumableArray(indexList).concat([newIndex]));
+  var newIndexList = [];
+
+  for (var i = lowestIndex; i <= highestIndex; i++) {
+    newIndexList.push(i);
+  }
+
+  return [].concat(newIndexList);
+};
+
+export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref2) {
+  var type = _ref2.type,
+      activeCellCoordinates = _ref2.activeCellCoordinates,
+      rows = _ref2.rows,
+      columns = _ref2.columns,
+      currentMatcher = _ref2.currentMatcher,
+      setActiveCellCoordinates = _ref2.setActiveCellCoordinates,
+      setCurrentMatcher = _ref2.setCurrentMatcher,
+      setSelectionAreas = _ref2.setSelectionAreas,
+      spreadsheetRef = _ref2.spreadsheetRef,
+      index = _ref2.index,
+      isKeyboard = _ref2.isKeyboard,
+      setSelectionAreaData = _ref2.setSelectionAreaData,
+      isHoldingCommandKey = _ref2.isHoldingCommandKey,
+      isHoldingShiftKey = _ref2.isHoldingShiftKey;
 
   if (!isHoldingCommandKey) {
     setSelectionAreaData([]);
@@ -43,11 +61,15 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref)
     column: type === 'column' ? columnValue : columns.length - 1
   };
   var tempMatcher = uuidv4();
-  setActiveCellCoordinates({
-    row: type === 'column' ? 0 : rowValue,
-    column: type === 'column' ? columnValue : 0
-  });
-  setCurrentMatcher(tempMatcher);
+
+  if (!isHoldingShiftKey) {
+    setActiveCellCoordinates({
+      row: type === 'column' ? 0 : rowValue,
+      column: type === 'column' ? columnValue : 0
+    });
+    setCurrentMatcher(tempMatcher);
+  }
+
   var newSelectionArea = {
     point1: point1,
     point2: point2,
@@ -55,7 +77,7 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref)
     matcher: tempMatcher,
     header: {
       type: type,
-      index: type === 'column' ? columnValue : rowValue
+      selectedIndexList: [type === 'column' ? columnValue : rowValue]
     }
   };
   setSelectionAreas(function (prev) {
@@ -81,6 +103,78 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref)
       return [].concat(_toConsumableArray(prev), [newSelectionArea]);
     }
 
+    if (isHoldingShiftKey) {
+      var _selectionAreasClone$, _selectionAreasClone$2;
+
+      var _selectionsFromHeaderCell = selectionsClone.filter(function (item) {
+        var _item$header3;
+
+        return (_item$header3 = item.header) === null || _item$header3 === void 0 ? void 0 : _item$header3.type;
+      }); // Shift/click behavior should not occur unless there are activeCellCoordinates set
+
+
+      var currentSelectionArea = _selectionsFromHeaderCell.filter(function (item) {
+        return item.matcher === currentMatcher;
+      })[0];
+
+      var originalAreaIndex = Math.max(currentSelectionArea === null || currentSelectionArea === void 0 ? void 0 : currentSelectionArea.point1[type], currentSelectionArea === null || currentSelectionArea === void 0 ? void 0 : currentSelectionArea.point2[type], activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]);
+      var newIndexValue = type === 'column' ? columnValue : rowValue;
+      var newPoint = {
+        row: originalAreaIndex < newIndexValue ? rows.length - 1 : 0,
+        column: columnValue
+      };
+      var selectionAreasClone = deepCloneObject(prev);
+      var indexOfCurrentArea = selectionAreasClone.findIndex(function (item) {
+        return item.matcher === currentMatcher;
+      });
+      var newIndexList = getSelectedItemIndexList({
+        indexList: ((_selectionAreasClone$ = selectionAreasClone[indexOfCurrentArea]) === null || _selectionAreasClone$ === void 0 ? void 0 : (_selectionAreasClone$2 = _selectionAreasClone$.header) === null || _selectionAreasClone$2 === void 0 ? void 0 : _selectionAreasClone$2.selectedIndexList) || [type === 'column' ? columnValue : rowValue],
+        newIndex: newIndexValue,
+        activeCellIndex: activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]
+      });
+
+      var setPoint1 = function setPoint1(value) {
+        return value < newIndexValue ? {
+          row: type === 'column' ? 0 : Math.min.apply(Math, _toConsumableArray(newIndexList)),
+          column: type === 'column' ? Math.min.apply(Math, _toConsumableArray(newIndexList)) : 0
+        } : newPoint;
+      };
+
+      var setPoint2 = function setPoint2(value) {
+        return value < newIndexValue ? newPoint : {
+          row: type === 'column' ? rows.length - 1 : Math.max.apply(Math, _toConsumableArray(newIndexList)),
+          column: type === 'column' ? Math.max.apply(Math, _toConsumableArray(newIndexList)) : columns.length - 1
+        };
+      }; // If there is no active cell set and shift is clicked on a header cell
+
+
+      if (!activeCellCoordinates || typeof activeCellCoordinates === 'undefined') {
+        // Need to set positioning of active cell because it doesn't exist yet
+        setCurrentMatcher(tempMatcher);
+        var firstSelectionArea = {
+          point1: setPoint1(type === 'column' ? columnValue : rowValue),
+          point2: setPoint2(type === 'column' ? columnValue : rowValue),
+          areaCreated: false,
+          matcher: tempMatcher,
+          header: {
+            type: type,
+            selectedIndexList: [type === 'column' ? columnValue : rowValue]
+          }
+        };
+        setActiveCellCoordinates({
+          row: type === 'column' ? 0 : rowValue,
+          column: type === 'column' ? columnValue : 0
+        });
+        return [firstSelectionArea];
+      }
+
+      selectionAreasClone[indexOfCurrentArea].point1 = setPoint1(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]);
+      selectionAreasClone[indexOfCurrentArea].point2 = setPoint2(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]);
+      selectionAreasClone[indexOfCurrentArea].areaCreated = false;
+      selectionAreasClone[indexOfCurrentArea].header.selectedIndexList = newIndexList;
+      return selectionAreasClone;
+    }
+
     return [newSelectionArea];
   });
 };

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

@@ -11,7 +11,8 @@ export var moveColumnIndicatorLine = function moveColumnIndicatorLine(_ref) {
       blockClass = _ref$blockClass === void 0 ? "".concat(pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
       clonedSelectionElement = _ref.clonedSelectionElement,
       ref = _ref.ref,
-      spreadsheetCoords = _ref.spreadsheetCoords;
+      spreadsheetCoords = _ref.spreadsheetCoords,
+      leftScrollAmount = _ref.leftScrollAmount;
   var closestCell = event.target.closest(".".concat(blockClass, "--interactive-cell-element"));
   var newColumnIndex = closestCell === null || closestCell === void 0 ? void 0 : closestCell.getAttribute('data-column-index');
   var originalColumnIndex = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-column-index-original');
@@ -21,11 +22,11 @@ export var moveColumnIndicatorLine = function moveColumnIndicatorLine(_ref) {
   var selectionAreaOrigin = ref.current.querySelector("[data-matcher-id=\"".concat(matcherId, "\"]"));
 
   if (Number(newColumnIndex) > Number(originalColumnIndex)) {
-    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2);
+    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2 + leftScrollAmount);
   }
 
   if (Number(newColumnIndex) < Number(originalColumnIndex)) {
-    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left);
+    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left + leftScrollAmount);
   }
 
   if (Number(newColumnIndex) === Number(originalColumnIndex)) {