@carbon/ibm-products 1.18.0 → 1.19.0

package/es/components/AddSelect/AddSelectList.js

@@ -7,8 +7,8 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 // LICENSE file in the root directory of this source tree.
 //
 import React from 'react';
-import { Checkbox, RadioButton, StructuredListRow, StructuredListWrapper, StructuredListBody, StructuredListCell, Dropdown } from 'carbon-components-react';
-import { ChevronRight16 } from '@carbon/icons-react';
+import { Button, Checkbox, RadioButton, StructuredListRow, StructuredListWrapper, StructuredListBody, StructuredListCell, Dropdown } from 'carbon-components-react';
+import { ChevronRight16, View16 } from '@carbon/icons-react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { UserProfileImage } from '../UserProfileImage';
@@ -16,10 +16,13 @@ import { pkg } from '../../settings';
 var componentName = 'AddSelectList';
 export var AddSelectList = function AddSelectList(_ref) {
   var filteredItems = _ref.filteredItems,
+      metaIconDescription = _ref.metaIconDescription,
       modifiers = _ref.modifiers,
       multi = _ref.multi,
       multiSelection = _ref.multiSelection,
+      navIconDescription = _ref.navIconDescription,
       path = _ref.path,
+      setDisplayMetaPanel = _ref.setDisplayMetaPanel,
       setMultiSelection = _ref.setMultiSelection,
       setPath = _ref.setPath,
       setSingleSelection = _ref.setSingleSelection,
@@ -169,7 +172,7 @@ export var AddSelectList = function AddSelectList(_ref) {
       light: true,
       label: modifiers === null || modifiers === void 0 ? void 0 : modifiers.label,
       disabled: !isSelected(item.id),
-      className: "".concat(blockClass, "-dropdown")
+      className: "".concat(blockClass, "-dropdown ").concat(blockClass, "-hidden-hover")
     })) : /*#__PURE__*/React.createElement(RadioButton, {
       className: "".concat(blockClass, "-radio"),
       name: "add-select-selections",
@@ -178,19 +181,42 @@ export var AddSelectList = function AddSelectList(_ref) {
       labelText: item.title,
       onChange: handleSingleSelection,
       selected: item.value === singleSelection
-    }), item.children && /*#__PURE__*/React.createElement(ChevronRight16, {
+    }), item.children && /*#__PURE__*/React.createElement(Button, {
+      renderIcon: ChevronRight16,
+      iconDescription: navIconDescription,
+      tooltipPosition: "left",
+      tooltipAlignment: "center",
+      hasIconOnly: true,
       onClick: function onClick() {
         return onNavigateItem(item);
-      }
-    }))));
+      },
+      kind: "ghost",
+      size: "sm"
+    }), item.meta && /*#__PURE__*/React.createElement("div", {
+      className: "".concat(blockClass, "-hidden-hover")
+    }, /*#__PURE__*/React.createElement(Button, {
+      renderIcon: View16,
+      iconDescription: metaIconDescription,
+      tooltipPosition: "left",
+      tooltipAlignment: "center",
+      hasIconOnly: true,
+      onClick: function onClick() {
+        return setDisplayMetaPanel(item);
+      },
+      kind: "ghost",
+      size: "sm"
+    })))));
   }))));
 };
 AddSelectList.propTypes = {
   filteredItems: PropTypes.array,
+  metaIconDescription: PropTypes.string,
   modifiers: PropTypes.object,
   multi: PropTypes.bool,
   multiSelection: PropTypes.array,
+  navIconDescription: PropTypes.string,
   path: PropTypes.array,
+  setDisplayMetaPanel: PropTypes.func,
   setMultiSelection: PropTypes.func,
   setPath: PropTypes.func,
   setSingleSelection: PropTypes.func,

package/es/components/AddSelect/AddSelectMetaPanel.js

@@ -0,0 +1,54 @@
+import React, { isValidElement } from 'react';
+import PropTypes from 'prop-types';
+import { Close16 } from '@carbon/icons-react';
+import { Button } from 'carbon-components-react';
+import { pkg } from '../../settings';
+var componentName = 'AddSelectMetaPanel';
+export var AddSelectMetaPanel = function AddSelectMetaPanel(_ref) {
+  var closeIconDescription = _ref.closeIconDescription,
+      meta = _ref.meta,
+      setDisplayMetaPanel = _ref.setDisplayMetaPanel,
+      title = _ref.title;
+  var blockClass = "".concat(pkg.prefix, "--add-select__meta-panel");
+
+  var onCloseHandler = function onCloseHandler() {
+    setDisplayMetaPanel({});
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: blockClass
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "-header")
+  }, /*#__PURE__*/React.createElement("p", {
+    className: "".concat(blockClass, "-title")
+  }, title), /*#__PURE__*/React.createElement(Button, {
+    renderIcon: Close16,
+    iconDescription: closeIconDescription,
+    tooltipPosition: "left",
+    tooltipAlignment: "center",
+    hasIconOnly: true,
+    onClick: onCloseHandler,
+    kind: "ghost",
+    size: "sm"
+  })), /*#__PURE__*/isValidElement(meta) ? meta : meta.map(function (entry) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: entry.id,
+      className: "".concat(blockClass, "-entry")
+    }, /*#__PURE__*/React.createElement("p", {
+      className: "".concat(blockClass, "-entry-title")
+    }, entry.title), /*#__PURE__*/React.createElement("p", {
+      className: "".concat(blockClass, "-entry-body")
+    }, entry.value));
+  }));
+};
+AddSelectMetaPanel.propTypes = {
+  closeIconDescription: PropTypes.string,
+  meta: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.string,
+    title: PropTypes.string,
+    value: PropTypes.string
+  })), PropTypes.node]),
+  setDisplayMetaPanel: PropTypes.func,
+  title: PropTypes.string
+};
+AddSelectMetaPanel.displayName = componentName;

package/es/components/AddSelect/AddSelectSidebar.js

@@ -1,5 +1,5 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["icon", "avatar"];
+var _excluded = ["meta", "icon", "avatar"];
 //
 // Copyright IBM Corp. 2022
 //
@@ -12,14 +12,19 @@ import { SubtractAlt32 } from '@carbon/icons-react';
 import PropTypes from 'prop-types';
 import { NoDataEmptyState } from '../../components/EmptyStates/NoDataEmptyState';
 import { pkg } from '../../settings';
+import { AddSelectMetaPanel } from './AddSelectMetaPanel';
 var componentName = 'AddSelectSidebar';
 export var AddSelectSidebar = function AddSelectSidebar(_ref) {
-  var influencerTitle = _ref.influencerTitle,
+  var closeIconDescription = _ref.closeIconDescription,
+      displayMetalPanel = _ref.displayMetalPanel,
+      influencerTitle = _ref.influencerTitle,
       items = _ref.items,
+      metaPanelTitle = _ref.metaPanelTitle,
       multiSelection = _ref.multiSelection,
       noSelectionDescription = _ref.noSelectionDescription,
       noSelectionTitle = _ref.noSelectionTitle,
       removeIconDescription = _ref.removeIconDescription,
+      setDisplayMetaPanel = _ref.setDisplayMetaPanel,
       setMultiSelection = _ref.setMultiSelection;
   var blockClass = "".concat(pkg.prefix, "--add-select__sidebar");
 
@@ -36,7 +41,8 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
     }); // certain properties should not be displayed in the sidebar
     // eslint-disable-next-line no-unused-vars
 
-    var icon = selectedItem.icon,
+    var meta = selectedItem.meta,
+        icon = selectedItem.icon,
         avatar = selectedItem.avatar,
         newItem = _objectWithoutProperties(selectedItem, _excluded);
 
@@ -69,6 +75,15 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
     }));
   };
 
+  if (Object.keys(displayMetalPanel).length !== 0) {
+    return /*#__PURE__*/React.createElement(AddSelectMetaPanel, {
+      closeIconDescription: closeIconDescription,
+      meta: displayMetalPanel.meta,
+      setDisplayMetaPanel: setDisplayMetaPanel,
+      title: metaPanelTitle
+    });
+  }
+
   return /*#__PURE__*/React.createElement("div", {
     className: blockClass
   }, /*#__PURE__*/React.createElement("div", {
@@ -103,12 +118,16 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
   })));
 };
 AddSelectSidebar.propTypes = {
+  closeIconDescription: PropTypes.string,
+  displayMetalPanel: PropTypes.object,
   influencerTitle: PropTypes.string,
   items: PropTypes.array,
+  metaPanelTitle: PropTypes.string,
   multiSelection: PropTypes.array,
   noSelectionDescription: PropTypes.string,
   noSelectionTitle: PropTypes.string,
   removeIconDescription: PropTypes.string,
+  setDisplayMetaPanel: PropTypes.func,
   setMultiSelection: PropTypes.func
 };
 AddSelectSidebar.displayName = componentName;

package/es/components/DataSpreadsheet/DataSpreadsheet.js

@@ -46,7 +46,7 @@ var blockClass = "".concat(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,
@@ -667,7 +667,8 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       spreadsheetRef: spreadsheetRef,
       isKeyboard: isKeyboard,
       setSelectionAreaData: setSelectionAreaData,
-      index: index
+      index: index,
+      currentMatcher: currentMatcher
     }; // Select an entire column
 
     if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header') {
@@ -768,6 +769,7 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     activeCellCoordinates: activeCellCoordinates,
     cellSize: cellSize,
     columns: columns,
+    currentMatcher: currentMatcher,
     defaultColumn: defaultColumn,
     headerGroups: headerGroups,
     rows: rows,
@@ -780,7 +782,8 @@ export var DataSpreadsheet = /*#__PURE__*/React.forwardRef(function (_ref, ref)
     totalVisibleColumns: totalVisibleColumns,
     updateActiveCellCoordinates: updateActiveCellCoordinates,
     setHeaderCellHoldActive: setHeaderCellHoldActive,
-    headerCellHoldActive: headerCellHoldActive
+    headerCellHoldActive: headerCellHoldActive,
+    visibleColumns: visibleColumns
   }), /*#__PURE__*/React.createElement(DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
     ref: spreadsheetRef,
@@ -863,7 +866,7 @@ DataSpreadsheet.propTypes = {
   /**
    * Specifies the cell height
    */
-  cellSize: PropTypes.oneOf(['compact', 'standard', 'medium', 'large']),
+  cellSize: PropTypes.oneOf(['xs', 'sm', 'md', 'lg']),
 
   /**
    * Provide an optional class to be applied to the containing node.

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,11 +396,13 @@ 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
         }
       }, index + 1)), row.cells.map(function (cell, index) {
+        var _cell$column;
+
         return /*#__PURE__*/React.createElement("div", _extends({
           key: "cell_".concat(index),
           "aria-colindex": index + 1
@@ -378,7 +410,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
           role: "gridcell",
           style: _objectSpread(_objectSpread({}, cell.getCellProps().style), {}, {
             display: 'grid',
-            minWidth: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width
+            minWidth: (cell === null || cell === void 0 ? void 0 : (_cell$column = cell.column) === null || _cell$column === void 0 ? void 0 : _cell$column.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width)
           })
         }), /*#__PURE__*/React.createElement("button", {
           id: "".concat(blockClass, "__cell--").concat(cell.row.index, "--").concat(index),
@@ -393,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,
@@ -407,7 +439,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       scrollBarSizeValue: scrollBarSize,
       totalVisibleColumns: totalVisibleColumns,
       defaultColumn: defaultColumn,
-      totalColumnsWidth: totalColumnsWidth
+      totalColumnsWidth: totalColumnsWidth,
+      visibleColumns: visibleColumns
     }),
     outerRef: contentScrollRef
   }, rows !== null && rows !== void 0 && rows.length ? RenderRow : RenderEmptyRows));

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,
@@ -41,7 +42,8 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
       totalVisibleColumns = _ref.totalVisibleColumns,
       updateActiveCellCoordinates = _ref.updateActiveCellCoordinates,
       setHeaderCellHoldActive = _ref.setHeaderCellHoldActive,
-      headerCellHoldActive = _ref.headerCellHoldActive;
+      headerCellHoldActive = _ref.headerCellHoldActive,
+      visibleColumns = _ref.visibleColumns;
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -70,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,
@@ -81,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
       });
     };
   };
@@ -102,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);
@@ -144,7 +156,8 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
           headerGroup: headerGroup,
           scrollBarSizeValue: scrollBarSizeValue,
           totalVisibleColumns: totalVisibleColumns,
-          defaultColumn: defaultColumn
+          defaultColumn: defaultColumn,
+          visibleColumns: visibleColumns
         }),
         overflow: 'hidden'
       }),
@@ -167,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",
@@ -204,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
    */
@@ -279,5 +297,10 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Function used to update the active cell coordinates
    */
-  updateActiveCellCoordinates: PropTypes.func
+  updateActiveCellCoordinates: PropTypes.func,
+
+  /**
+   * Array of visible columns provided by react-table useTable hook
+   */
+  visibleColumns: PropTypes.array
 };

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