@carbon/ibm-products 1.18.0 → 1.19.0

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/getSpreadsheetWidth.js

@@ -11,7 +11,8 @@ export var getSpreadsheetWidth = function getSpreadsheetWidth(_ref) {
       scrollBarSizeValue = _ref.scrollBarSizeValue,
       totalVisibleColumns = _ref.totalVisibleColumns,
       defaultColumn = _ref.defaultColumn,
-      totalColumnsWidth = _ref.totalColumnsWidth;
+      totalColumnsWidth = _ref.totalColumnsWidth,
+      visibleColumns = _ref.visibleColumns;
   var additionalWidth = scrollBarSizeValue + defaultColumn.rowHeaderWidth;
 
   if (!totalVisibleColumns) {
@@ -25,6 +26,11 @@ export var getSpreadsheetWidth = function getSpreadsheetWidth(_ref) {
   }
 
   if (totalVisibleColumns) {
-    return totalVisibleColumns * (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width) + additionalWidth;
+    var totalVisibleColumnWidth = visibleColumns.map(function (item, index) {
+      return index <= totalVisibleColumns - 1 && ((item === null || item === void 0 ? void 0 : item.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width));
+    }).reduce(function (prev, curr) {
+      return prev + curr;
+    }, 0);
+    return totalVisibleColumnWidth + additionalWidth;
   }
 };

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: index
+      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)) {

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

@@ -60,7 +60,7 @@ export var Datagrid = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React.createElement("div", _extends({}, rest, {
     id: tableId,
     ref: ref,
-    className: cx(className, blockClass, withVirtualScroll ? "".concat(blockClass, "__datagridWrap") : "".concat(blockClass, "__datagridWrap-simple"))
+    className: cx(className, blockClass, withVirtualScroll ? "".concat(blockClass, "__datagridWrap") : "".concat(blockClass, "__datagridWrap-simple"), !isFetching && rows.length === 0 ? "".concat(blockClass, "__empty-state") : '')
   }, getDevtoolsProps(componentName)), /*#__PURE__*/React.createElement(DatagridToolbar, datagridState), leftPanel && /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__grid-container ").concat(blockClass, "__displayFlex")
   }, leftPanel && leftPanel.isOpen && /*#__PURE__*/React.createElement("div", {

package/es/components/Datagrid/Datagrid/DatagridEmptyBody.js

@@ -1,3 +1,5 @@
+import _extends from "@babel/runtime/helpers/extends";
+
 /*
  * Licensed Materials - Property of IBM
  * 5724-Q36
@@ -7,13 +9,30 @@
  */
 import React from 'react';
 import { pkg } from '../../../settings';
+import { DataTable } from 'carbon-components-react';
+import { NoDataEmptyState } from '../../EmptyStates/NoDataEmptyState';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
+var TableBody = DataTable.TableBody,
+    TableRow = DataTable.TableRow,
+    TableCell = DataTable.TableCell;
 
 var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
-  var EmptyState = datagridState.EmptyState;
-  return /*#__PURE__*/React.createElement("div", {
+  var getTableBodyProps = datagridState.getTableBodyProps,
+      headers = datagridState.headers,
+      emptyStateTitle = datagridState.emptyStateTitle,
+      emptyStateDescription = datagridState.emptyStateDescription,
+      emptyStateSize = datagridState.emptyStateSize,
+      illustrationTheme = datagridState.illustrationTheme;
+  return /*#__PURE__*/React.createElement(TableBody, _extends({}, getTableBodyProps(), {
     className: "".concat(blockClass, "__empty-state-body")
-  }, EmptyState);
+  }), /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableCell, {
+    colSpan: headers.length
+  }, /*#__PURE__*/React.createElement(NoDataEmptyState, {
+    illustrationTheme: illustrationTheme,
+    size: emptyStateSize,
+    title: emptyStateTitle,
+    subtitle: emptyStateDescription
+  }))));
 };
 
 export default DatagridEmptyBody;

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

@@ -55,7 +55,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 +66,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;
     }
   }),

package/es/components/Datagrid/Datagrid/addons/RowSize/RowSizeDropdown.js

@@ -54,9 +54,9 @@ var RowSizeDropdown = function RowSizeDropdown(_ref) {
 
 RowSizeDropdown.propTypes = {
   buttonLabel: PropTypes.string,
-  datagridName: PropTypes.string.isRequired,
-  light: PropTypes.bool.isRequired,
+  datagridName: PropTypes.string,
+  light: PropTypes.bool,
   onChange: PropTypes.func.isRequired,
-  selectedOption: PropTypes.string.isRequired
+  selectedOption: PropTypes.string
 };
 export default RowSizeDropdown;

package/es/components/Datagrid/Datagrid/addons/RowSize/RowSizeRadioGroup.js

@@ -128,7 +128,7 @@ RowSizeRadioGroup.defaultProps = {
 };
 RowSizeRadioGroup.propTypes = {
   buttonRef: PropTypes.any.isRequired,
-  datagridName: PropTypes.string.isRequired,
+  datagridName: PropTypes.string,
   hideRadioGroup: PropTypes.func.isRequired,
   legendText: PropTypes.string,
   onChange: PropTypes.func.isRequired,

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