@carbon/ibm-products 1.11.2 → 1.14.0

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -23,12 +23,16 @@ var _reactWindow = require("react-window");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _layout = require("@carbon/layout");
+
 var _settings = require("../../settings");
 
 var _deepCloneObject = require("../../global/js/utils/deepCloneObject");
 
 var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 
+var _hooks = require("../../global/js/hooks");
+
 var _removeCellSelections = require("./utils/removeCellSelections");
 
 var _createCellSelectionArea = require("./utils/createCellSelectionArea");
@@ -41,21 +45,24 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-/**
- * Copyright IBM Corp. 2022, 2022
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
+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) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var blockClass = "".concat(_settings.pkg.prefix, "--data-spreadsheet");
 var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var columns = _ref.columns,
       activeCellCoordinates = _ref.activeCellCoordinates,
       defaultColumn = _ref.defaultColumn,
+      defaultEmptyRowCount = _ref.defaultEmptyRowCount,
       getTableBodyProps = _ref.getTableBodyProps,
+      headerGroups = _ref.headerGroups,
       id = _ref.id,
+      onDataUpdate = _ref.onDataUpdate,
       prepareRow = _ref.prepareRow,
       rows = _ref.rows,
+      selectionAreaData = _ref.selectionAreaData,
+      setSelectionAreaData = _ref.setSelectionAreaData,
       setActiveCellCoordinates = _ref.setActiveCellCoordinates,
       selectionAreas = _ref.selectionAreas,
       setContainerHasFocus = _ref.setContainerHasFocus,
@@ -65,24 +72,64 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
       clickAndHoldActive = _ref.clickAndHoldActive,
       setClickAndHoldActive = _ref.setClickAndHoldActive,
       currentMatcher = _ref.currentMatcher,
-      setCurrentMatcher = _ref.setCurrentMatcher;
-  // Create cell selection areas based on selectionAreas array
+      setCurrentMatcher = _ref.setCurrentMatcher,
+      onSelectionAreaChange = _ref.onSelectionAreaChange;
+  var previousState = (0, _hooks.usePreviousValue)({
+    selectionAreaData: selectionAreaData,
+    clickAndHoldActive: clickAndHoldActive
+  }); // Set custom css property containing the spreadsheet total width
+
+  (0, _react.useEffect)(function () {
+    ref === null || ref === void 0 ? void 0 : ref.current.style.setProperty("--".concat(blockClass, "--total-width"), (0, _layout.px)(totalColumnsWidth + scrollBarSize));
+  }, [ref, scrollBarSize, totalColumnsWidth]); // Call the `onSelectionAreaChange` handler to send selection area data
+  // back to the consumer
+
+  (0, _react.useEffect)(function () {
+    if (selectionAreaData.length) {
+      var _previousState$select;
+
+      if (!clickAndHoldActive && previousState !== null && previousState !== void 0 && previousState.clickAndHoldActive || (previousState === null || previousState === void 0 ? void 0 : (_previousState$select = previousState.selectionAreaData) === null || _previousState$select === void 0 ? void 0 : _previousState$select.length) !== (selectionAreaData === null || selectionAreaData === void 0 ? void 0 : selectionAreaData.length)) {
+        onSelectionAreaChange(selectionAreaData);
+      }
+    }
+  }, [previousState === null || previousState === void 0 ? void 0 : previousState.selectionAreaData, selectionAreaData, onSelectionAreaChange, clickAndHoldActive, previousState === null || previousState === void 0 ? void 0 : previousState.clickAndHoldActive]); // Create cell selection areas based on selectionAreas array
+
   (0, _react.useEffect)(function () {
     if (selectionAreas && selectionAreas.length) {
       selectionAreas.map(function (area) {
-        if (!area.areaCreated && area.point1 && area.point2 && area.matcher) {
-          // Do not create a cell selection area if point1 and point2 have the same values
-          // Cell selections must have two distinctly different points for an area to be created
-          if (area.point1.row === area.point2.row && area.point1.column === area.point2.column) {
-            var selectionAreasClone = (0, _deepCloneObject.deepCloneObject)(selectionAreas);
-            var indexOfCurrentArea = selectionAreasClone.findIndex(function (item) {
-              return item.matcher === area.matcher;
+        // Setup selection area data that will be sent back to consumer via onSelectionAreaChange prop
+        if (area.areaCreated) {
+          var rowStart = Math.min(area.point1.row, area.point2.row);
+          var rowEnd = Math.max(area.point1.row, area.point2.row);
+          var columnStart = Math.min(area.point1.column, area.point2.column);
+          var columnEnd = Math.max(area.point1.column, area.point2.column);
+          var selectionData = {
+            rows: {
+              start: rowStart,
+              end: rowEnd
+            },
+            columns: {
+              start: columnStart,
+              end: columnEnd
+            },
+            cells: populateSelectionAreaCellData({
+              rowStart: rowStart,
+              rowEnd: rowEnd,
+              columnStart: columnStart,
+              columnEnd: columnEnd
+            }),
+            selectionId: area.matcher
+          };
+          setSelectionAreaData(function (prev) {
+            var prevValues = (0, _deepCloneObject.deepCloneObject)(prev);
+            var newAreaData = prevValues.filter(function (item) {
+              return item.selectionId !== area.matcher;
             });
-            selectionAreasClone[indexOfCurrentArea].areaCreated = false;
-            selectionAreasClone[indexOfCurrentArea].point2 = null;
-            return setSelectionAreas(selectionAreasClone);
-          }
+            return [].concat((0, _toConsumableArray2.default)(newAreaData), [selectionData]);
+          });
+        }
 
+        if (!area.areaCreated && area.point1 && area.point2 && area.matcher) {
           (0, _createCellSelectionArea.createCellSelectionArea)({
             area: area,
             blockClass: blockClass,
@@ -95,7 +142,24 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         return;
       });
     }
-  }, [selectionAreas, setSelectionAreas, defaultColumn]); // Mouse up
+  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData]);
+
+  var populateSelectionAreaCellData = function populateSelectionAreaCellData(_ref2) {
+    var rowStart = _ref2.rowStart,
+        rowEnd = _ref2.rowEnd,
+        columnStart = _ref2.columnStart,
+        columnEnd = _ref2.columnEnd;
+    var cellContainer = [];
+
+    for (var rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {
+      for (var columnIndex = columnStart; columnIndex <= columnEnd; columnIndex++) {
+        cellContainer.push([rowIndex, columnIndex]);
+      }
+    }
+
+    return cellContainer;
+  }; // Mouse up
+
 
   (0, _react.useEffect)(function () {
     var handleMouseUp = function handleMouseUp(event) {
@@ -196,9 +260,10 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
           matcher: tempMatcher
         }]);
         setCurrentMatcher(tempMatcher);
+        setSelectionAreaData([]);
       }
     };
-  }, [currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher, ref]);
+  }, [currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher, ref, setSelectionAreaData]);
   var handleBodyCellHover = (0, _react.useCallback)(function (cell, columnIndex) {
     return function () {
       if (clickAndHoldActive) {
@@ -241,45 +306,84 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         setCurrentMatcher: setCurrentMatcher,
         setSelectionAreas: setSelectionAreas,
         spreadsheetRef: ref,
-        index: index
+        index: index,
+        setSelectionAreaData: setSelectionAreaData
       });
     };
-  }, [columns, ref, setSelectionAreas, setCurrentMatcher, setActiveCellCoordinates, activeCellCoordinates, rows]); // Renders each row/cell in the spreadsheet body
+  }, [columns, ref, setSelectionAreas, setCurrentMatcher, setActiveCellCoordinates, activeCellCoordinates, rows, setSelectionAreaData]); // Builds the empty rows and calls `onDataUpdate` to set the new empty rows
+  // using defaultEmptyRowCount to determine how many empty rows are created.
+
+  (0, _react.useEffect)(function () {
+    if (!(rows !== null && rows !== void 0 && rows.length)) {
+      var buildEmptyRows = function buildEmptyRows() {
+        var emptyRowData = [];
+        (0, _toConsumableArray2.default)(Array(defaultEmptyRowCount)).map(function () {
+          var _headerGroups$;
+
+          var emptyCell = {};
+          (_headerGroups$ = headerGroups[0]) === null || _headerGroups$ === void 0 ? void 0 : _headerGroups$.headers.map(function (header) {
+            emptyCell[header.id] = null;
+          });
+          emptyRowData.push(emptyCell);
+        });
+        onDataUpdate(emptyRowData);
+      };
 
-  var RenderRow = (0, _react.useCallback)(function (_ref2) {
-    var index = _ref2.index,
-        style = _ref2.style;
+      buildEmptyRows();
+    }
+  }, [rows, headerGroups, defaultEmptyRowCount, onDataUpdate]);
+
+  var RenderEmptyRows = function RenderEmptyRows() {
+    return /*#__PURE__*/_react.default.createElement("div", null);
+  }; // Renders each row/cell in the spreadsheet body
+
+
+  var RenderRow = (0, _react.useCallback)(function (_ref3) {
+    var index = _ref3.index,
+        style = _ref3.style;
     var row = rows[index];
-    prepareRow(row);
-    return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, row.getRowProps({
-      style: style
-    }), {
-      className: (0, _classnames.default)("".concat(blockClass, "__tr")),
-      "data-row-index": index
-    }), /*#__PURE__*/_react.default.createElement("button", {
-      tabIndex: -1,
-      "data-row-index": index,
-      "data-column-index": "header",
-      type: "button",
-      onClick: handleRowHeaderClick(index),
-      className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row'))),
-      style: {
-        width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
-      }
-    }, index + 1), row.cells.map(function (cell, index) {
-      return /*#__PURE__*/_react.default.createElement("button", (0, _extends2.default)({
+
+    if (rows && rows.length) {
+      prepareRow(row);
+      return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, row.getRowProps({
+        style: style
+      }), {
+        className: (0, _classnames.default)("".concat(blockClass, "__tr")),
+        "data-row-index": index,
+        "aria-rowindex": index
+      }), /*#__PURE__*/_react.default.createElement("div", {
+        role: "rowheader"
+      }, /*#__PURE__*/_react.default.createElement("button", {
         tabIndex: -1,
-        "data-row-index": cell.row.index,
-        "data-column-index": index
-      }, cell.getCellProps(), {
-        className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__body--td"), "".concat(blockClass, "--interactive-cell-element")),
-        key: "cell_".concat(index),
-        onMouseDown: handleBodyCellClick(cell, index),
-        onMouseOver: handleBodyCellHover(cell, index),
-        onFocus: function onFocus() {},
-        type: "button"
-      }), cell.render('Cell'));
-    }));
+        "data-row-index": index,
+        "data-column-index": "header",
+        type: "button",
+        onClick: handleRowHeaderClick(index),
+        className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row'))),
+        style: {
+          width: (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth) - 4
+        }
+      }, index + 1)), row.cells.map(function (cell, index) {
+        return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
+          key: "cell_".concat(index),
+          "aria-colindex": index
+        }, cell.getCellProps(), {
+          role: "gridcell",
+          style: _objectSpread(_objectSpread({}, cell.getCellProps().style), {}, {
+            display: 'grid'
+          })
+        }), /*#__PURE__*/_react.default.createElement("button", {
+          tabIndex: -1,
+          "data-row-index": cell.row.index,
+          "data-column-index": index,
+          className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__body--td"), "".concat(blockClass, "--interactive-cell-element")),
+          onMouseDown: handleBodyCellClick(cell, index),
+          onMouseOver: handleBodyCellHover(cell, index),
+          onFocus: function onFocus() {},
+          type: "button"
+        }, cell.render('Cell')));
+      }));
+    }
   }, [prepareRow, rows, defaultColumn.rowHeaderWidth, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover]);
   var spreadsheetBodyRef = (0, _react.useRef)();
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
@@ -288,10 +392,10 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
   }, getTableBodyProps()), /*#__PURE__*/_react.default.createElement(_reactWindow.FixedSizeList, {
     className: (0, _classnames.default)("".concat(blockClass, "__list--container"), "".concat(blockClass, "__list--container--").concat(id)),
     height: 400,
-    itemCount: rows.length,
+    itemCount: rows.length || defaultEmptyRowCount,
     itemSize: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
     width: totalColumnsWidth + scrollBarSize
-  }, RenderRow));
+  }, rows !== null && rows !== void 0 && rows.length ? RenderRow : RenderEmptyRows));
 });
 exports.DataSpreadsheetBody = DataSpreadsheetBody;
 DataSpreadsheetBody.propTypes = {
@@ -327,11 +431,21 @@ DataSpreadsheetBody.propTypes = {
     width: _propTypes.default.number
   }),
 
+  /**
+   * Sets the number of empty rows to be created when there is no data provided
+   */
+  defaultEmptyRowCount: _propTypes.default.number,
+
   /**
    * Function to set table body prop values
    */
   getTableBodyProps: _propTypes.default.func,
 
+  /**
+   * Headers provided from useTable hook
+   */
+  headerGroups: _propTypes.default.arrayOf(_propTypes.default.object),
+
   /**
    * The spreadsheet id
    */
@@ -342,6 +456,16 @@ DataSpreadsheetBody.propTypes = {
    */
   onActiveCellChange: _propTypes.default.func,
 
+  /**
+   * The event handler that is called to set the rows for the empty spreadsheet
+   */
+  onDataUpdate: _propTypes.default.func,
+
+  /**
+   * The event handler that is called when the selection areas change
+   */
+  onSelectionAreaChange: _propTypes.default.func,
+
   /**
    * Prepare row function from react-table
    */
@@ -357,6 +481,11 @@ DataSpreadsheetBody.propTypes = {
    */
   scrollBarSize: _propTypes.default.number,
 
+  /**
+   * Array of selection area data
+   */
+  selectionAreaData: _propTypes.default.array,
+
   /**
    * Array of selection areas
    */
@@ -382,6 +511,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setCurrentMatcher: _propTypes.default.func,
 
+  /**
+   * Setter fn for selectionAreaData state value
+   */
+  setSelectionAreaData: _propTypes.default.func,
+
   /**
    * Setter fn for selectionAreas state value
    */

package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -13,40 +13,66 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _layout = require("@carbon/layout");
+
 var _settings = require("../../settings");
 
 var _checkActiveHeaderCell = require("./utils/checkActiveHeaderCell");
 
 var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
 
+var _hooks = require("../../global/js/hooks");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-/**
- * Copyright IBM Corp. 2022, 2022
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
+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) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var blockClass = "".concat(_settings.pkg.prefix, "--data-spreadsheet");
 var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var activeCellCoordinates = _ref.activeCellCoordinates,
+      cellSize = _ref.cellSize,
       columns = _ref.columns,
       defaultColumn = _ref.defaultColumn,
       headerGroups = _ref.headerGroups,
+      scrollBarSize = _ref.scrollBarSize,
       selectionAreas = _ref.selectionAreas,
       setActiveCellCoordinates = _ref.setActiveCellCoordinates,
       setCurrentMatcher = _ref.setCurrentMatcher,
       setSelectionAreas = _ref.setSelectionAreas,
+      setSelectionAreaData = _ref.setSelectionAreaData,
       rows = _ref.rows;
 
+  var _useState = (0, _react.useState)(0),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      scrollBarSizeValue = _useState2[0],
+      setScrollBarSizeValue = _useState2[1];
+
+  var previousState = (0, _hooks.usePreviousValue)({
+    cellSize: cellSize
+  });
+  (0, _react.useEffect)(function () {
+    if ((previousState === null || previousState === void 0 ? void 0 : previousState.cellSize) !== cellSize) {
+      var _ref$current;
+
+      var scrollContainer = ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector(".".concat(blockClass, "__list--container"));
+      var hasScrollBar = (scrollContainer === null || scrollContainer === void 0 ? void 0 : scrollContainer.scrollHeight) > (scrollContainer === null || scrollContainer === void 0 ? void 0 : scrollContainer.clientHeight);
+      var scrollBarValue = hasScrollBar ? 0 : scrollBarSize;
+      setScrollBarSizeValue(scrollBarValue);
+    }
+  }, [cellSize, ref, scrollBarSize, previousState === null || previousState === void 0 ? void 0 : previousState.cellSize]);
+
   var handleColumnHeaderClick = function handleColumnHeaderClick(index) {
     return function () {
       (0, _handleHeaderCellSelection.handleHeaderCellSelection)({
@@ -58,7 +84,8 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
         setCurrentMatcher: setCurrentMatcher,
         setSelectionAreas: setSelectionAreas,
         spreadsheetRef: ref,
-        index: index
+        index: index,
+        setSelectionAreaData: setSelectionAreaData
       });
     };
   };
@@ -69,31 +96,38 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
       key: "header_".concat(index)
     }, headerGroup.getHeaderGroupProps(), {
+      style: _objectSpread(_objectSpread({}, headerGroup.getHeaderGroupProps().style), {}, {
+        width: (0, _layout.px)(parseInt(headerGroup.getHeaderGroupProps().style.width) + scrollBarSizeValue)
+      }),
       className: "".concat(blockClass, "__tr")
-    }), /*#__PURE__*/_react.default.createElement("button", {
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      role: "columnheader",
+      style: {
+        width: (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth) - 4,
+        height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
+      }
+    }, /*#__PURE__*/_react.default.createElement("button", {
       "data-row-index": "header",
       "data-column-index": "header",
       type: "button",
       tabIndex: -1,
-      className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header')),
-      style: {
-        width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth,
-        height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
-      }
-    }, "\xA0"), headerGroup.headers.map(function (column, index) {
-      return /*#__PURE__*/_react.default.createElement("button", (0, _extends2.default)({
+      className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__th--select-all"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header'))
+    }, "\xA0")), headerGroup.headers.map(function (column, index) {
+      return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
         key: "column_".concat(index),
+        role: "columnheader",
+        className: "".concat(blockClass, "__columnheader")
+      }, column.getHeaderProps()), /*#__PURE__*/_react.default.createElement("button", {
         "data-row-index": "header",
         "data-column-index": index,
         tabIndex: -1,
         onClick: handleColumnHeaderClick(index),
         style: {
           height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
-        }
-      }, column.getHeaderProps(), {
+        },
         className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'column'))),
         type: "button"
-      }), column.render('Header'));
+      }, column.render('Header')));
     }));
   }));
 });
@@ -107,6 +141,11 @@ DataSpreadsheetHeader.propTypes = {
     column: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string])
   }),
 
+  /**
+   * Specifies the cell height
+   */
+  cellSize: _propTypes.default.oneOf(['compact', 'standard', 'medium', 'large']),
+
   /**
    * All of the spreadsheet columns
    */
@@ -131,6 +170,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   rows: _propTypes.default.arrayOf(_propTypes.default.object),
 
+  /**
+   * The scrollbar width
+   */
+  scrollBarSize: _propTypes.default.number,
+
   /**
    * All of the cell selection area items
    */
@@ -146,6 +190,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   setCurrentMatcher: _propTypes.default.func,
 
+  /**
+   * Setter fn for selectionAreaData state value
+   */
+  setSelectionAreaData: _propTypes.default.func,
+
   /**
    * Setter fn for selectionAreas value
    */

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

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "useMoveActiveCell", {
+  enumerable: true,
+  get: function get() {
+    return _useMoveActiveCell.useMoveActiveCell;
+  }
+});
+Object.defineProperty(exports, "useMultipleKeyTracking", {
+  enumerable: true,
+  get: function get() {
+    return _useMultipleKeyTracking.useMultipleKeyTracking;
+  }
+});
+Object.defineProperty(exports, "useResetSpreadsheetFocus", {
+  enumerable: true,
+  get: function get() {
+    return _useResetSpreadsheetFocus.useResetSpreadsheetFocus;
+  }
+});
+Object.defineProperty(exports, "useSpreadsheetOutsideClick", {
+  enumerable: true,
+  get: function get() {
+    return _useSpreadsheetOutsideClick.useSpreadsheetOutsideClick;
+  }
+});
+
+var _useMoveActiveCell = require("./useMoveActiveCell");
+
+var _useMultipleKeyTracking = require("./useMultipleKeyTracking");
+
+var _useResetSpreadsheetFocus = require("./useResetSpreadsheetFocus");
+
+var _useSpreadsheetOutsideClick = require("./useSpreadsheetOutsideClick");