@carbon/ibm-products 1.15.0 → 1.18.0

package/lib/components/AddSelect/AddSelectSort.js

@@ -0,0 +1,79 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AddSelectSort = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _carbonComponentsReact = require("carbon-components-react");
+
+var _iconsReact = require("@carbon/icons-react");
+
+var _settings = require("../../settings");
+
+//
+// Copyright IBM Corp. 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.
+//
+var componentName = 'AddSelect';
+
+var AddSelectSort = function AddSelectSort(_ref) {
+  var setSortAttribute = _ref.setSortAttribute,
+      setSortDirection = _ref.setSortDirection,
+      sortBy = _ref.sortBy;
+  var blockClass = "".concat(_settings.pkg.prefix, "--add-select-sort");
+  var sortByOpts = sortBy ? sortBy.reduce(function (acc, cur) {
+    var opts = [{
+      id: "".concat(cur, "-asc"),
+      itemText: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_iconsReact.ArrowUp16, null), cur),
+      direction: 'asc',
+      attribute: cur
+    }, {
+      id: "".concat(cur, "-desc"),
+      itemText: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_iconsReact.ArrowDown16, null), cur),
+      direction: 'desc',
+      attribute: cur
+    }];
+    return [].concat((0, _toConsumableArray2.default)(acc), opts);
+  }, []) : []; // handlers
+
+  var sortHandler = function sortHandler(_ref2) {
+    var direction = _ref2.direction,
+        attribute = _ref2.attribute;
+    setSortAttribute(attribute);
+    setSortDirection(direction);
+  };
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: blockClass
+  }, sortByOpts.length > 0 && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
+    renderIcon: _iconsReact.ArrowsVertical32,
+    flipped: true
+  }, sortByOpts.map(function (opt) {
+    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
+      key: opt.id,
+      itemText: opt.itemText,
+      onClick: function onClick() {
+        return sortHandler(opt);
+      }
+    });
+  })));
+};
+
+exports.AddSelectSort = AddSelectSort;
+AddSelectSort.propTypes = {
+  setSortAttribute: _propTypes.default.func,
+  setSortDirection: _propTypes.default.func,
+  sortBy: _propTypes.default.array
+};
+AddSelectSort.displayName = componentName;

package/lib/components/AddSelect/add-select-utils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalize = exports.getGlobalFilterValues = exports.flatten = void 0;
+exports.sortItems = exports.normalize = exports.getSortBy = exports.getGlobalFilterValues = exports.flatten = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -108,4 +108,31 @@ var getGlobalFilterValues = function getGlobalFilterValues(globalFilters, items)
   return filterOpts;
 };
 
-exports.getGlobalFilterValues = getGlobalFilterValues;
+exports.getGlobalFilterValues = getGlobalFilterValues;
+
+var sortItems = function sortItems(attribute, direction) {
+  return function (a, b) {
+    var _a$attribute, _b$attribute;
+
+    var valueA = (_a$attribute = a[attribute]) === null || _a$attribute === void 0 ? void 0 : _a$attribute.split(' ').join('');
+    var valueB = (_b$attribute = b[attribute]) === null || _b$attribute === void 0 ? void 0 : _b$attribute.split(' ').join('');
+
+    if (direction === 'desc') {
+      return valueA > valueB ? -1 : 1;
+    }
+
+    return valueA < valueB ? -1 : 1;
+  };
+};
+
+exports.sortItems = sortItems;
+
+var getSortBy = function getSortBy(items) {
+  var _items$find;
+
+  return (_items$find = items.find(function (item) {
+    return item.sortBy;
+  })) === null || _items$find === void 0 ? void 0 : _items$find.sortBy;
+};
+
+exports.getSortBy = getSortBy;

package/lib/components/AddSelect/hooks/useItemSort.js

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useItemSort = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = require("react");
+
+var useItemSort = function useItemSort() {
+  var _useState = (0, _react.useState)(''),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      sortDirection = _useState2[0],
+      setSortDirection = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(''),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      sortAttribute = _useState4[0],
+      setSortAttribute = _useState4[1];
+
+  return {
+    sortDirection: sortDirection,
+    setSortDirection: setSortDirection,
+    sortAttribute: sortAttribute,
+    setSortAttribute: setSortAttribute
+  };
+};
+
+exports.useItemSort = useItemSort;

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -65,7 +65,7 @@ var _handleActiveCellInSelectionEnter = require("./utils/handleActiveCellInSelec
 
 var _handleActiveCellInSelectionTab = require("./utils/handleActiveCellInSelectionTab");
 
-var _excluded = ["cellSize", "className", "columns", "data", "defaultEmptyRowCount", "onDataUpdate", "id", "onActiveCellChange", "onSelectionAreaChange"];
+var _excluded = ["cellSize", "className", "columns", "data", "defaultEmptyRowCount", "onDataUpdate", "id", "onActiveCellChange", "onSelectionAreaChange", "totalVisibleColumns"];
 
 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); }
 
@@ -110,6 +110,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       onActiveCellChange = _ref$onActiveCellChan === void 0 ? defaults.onActiveCellChange : _ref$onActiveCellChan,
       _ref$onSelectionAreaC = _ref.onSelectionAreaChange,
       onSelectionAreaChange = _ref$onSelectionAreaC === void 0 ? defaults.onSelectionAreaChange : _ref$onSelectionAreaC,
+      totalVisibleColumns = _ref.totalVisibleColumns,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var multiKeyTrackingRef = (0, _react.useRef)();
   var localRef = (0, _react.useRef)();
@@ -158,8 +159,13 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
 
   var _useState17 = (0, _react.useState)(false),
       _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-      activeCellInsideSelectionArea = _useState18[0],
-      setActiveCellInsideSelectionArea = _useState18[1];
+      headerCellHoldActive = _useState18[0],
+      setHeaderCellHoldActive = _useState18[1];
+
+  var _useState19 = (0, _react.useState)(false),
+      _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
+      activeCellInsideSelectionArea = _useState20[0],
+      setActiveCellInsideSelectionArea = _useState20[1];
 
   var previousState = (0, _hooks.usePreviousValue)({
     activeCellCoordinates: activeCellCoordinates,
@@ -168,10 +174,10 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
   var cellSizeValue = (0, _getCellSize.getCellSize)(cellSize);
   var cellEditorRef = (0, _react.useRef)();
 
-  var _useState19 = (0, _react.useState)(),
-      _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
-      activeCellContent = _useState20[0],
-      setActiveCellContent = _useState20[1];
+  var _useState21 = (0, _react.useState)(),
+      _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
+      activeCellContent = _useState22[0],
+      setActiveCellContent = _useState22[1];
 
   var activeCellRef = (0, _react.useRef)();
   var cellEditorRulerRef = (0, _react.useRef)();
@@ -199,13 +205,15 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     columns: columns,
     data: data,
     defaultColumn: defaultColumn
-  }, _reactTable.useBlockLayout),
+  }, _reactTable.useBlockLayout, _reactTable.useColumnOrder),
       getTableProps = _useTable.getTableProps,
       getTableBodyProps = _useTable.getTableBodyProps,
       headerGroups = _useTable.headerGroups,
       rows = _useTable.rows,
       totalColumnsWidth = _useTable.totalColumnsWidth,
-      prepareRow = _useTable.prepareRow; // Update the spreadsheet data after editing a cell
+      prepareRow = _useTable.prepareRow,
+      setColumnOrder = _useTable.setColumnOrder,
+      visibleColumns = _useTable.visibleColumns; // Update the spreadsheet data after editing a cell
 
 
   var updateData = (0, _react.useCallback)(function (rowIndex, columnId) {
@@ -608,10 +616,12 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
 
   var startEditMode = function startEditMode() {
     setIsEditing(true);
+    setClickAndHoldActive(false);
     var activeCellFullData = typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'number' && typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'number' ? rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row].cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column] : null;
-    var activeCellValue = activeCellFullData ? Object.values(activeCellFullData.row.values)[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column] : null;
+    var activeCellValue = activeCellFullData ? activeCellFullData.row.cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column].value : null;
     setCellEditorValue(activeCellValue);
     cellEditorRulerRef.current.textContent = activeCellValue;
+    cellEditorRef.current.style.width = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.width;
   }; // Sets the initial placement of the cell editor cursor at the end of the text area
   // this is not done for us by default in Safari
 
@@ -732,7 +742,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     activeCellRef: activeCellRef,
     cellEditorRef: cellEditorRef,
     cellEditorRulerRef: cellEditorRulerRef,
-    columns: columns,
+    visibleColumns: visibleColumns,
     defaultColumn: defaultColumn,
     cellEditorValue: cellEditorValue
   });
@@ -801,7 +811,10 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     setSelectionAreas: setSelectionAreas,
     setCurrentMatcher: setCurrentMatcher,
     setSelectionAreaData: setSelectionAreaData,
-    updateActiveCellCoordinates: updateActiveCellCoordinates
+    totalVisibleColumns: totalVisibleColumns,
+    updateActiveCellCoordinates: updateActiveCellCoordinates,
+    setHeaderCellHoldActive: setHeaderCellHoldActive,
+    headerCellHoldActive: headerCellHoldActive
   }), /*#__PURE__*/_react.default.createElement(_DataSpreadsheetBody.DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
     ref: spreadsheetRef,
@@ -829,7 +842,11 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     id: id,
     columns: columns,
     defaultEmptyRowCount: defaultEmptyRowCount,
-    setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea
+    setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea,
+    totalVisibleColumns: totalVisibleColumns,
+    setHeaderCellHoldActive: setHeaderCellHoldActive,
+    setColumnOrder: setColumnOrder,
+    visibleColumns: visibleColumns
   }), /*#__PURE__*/_react.default.createElement("button", {
     onMouseDown: handleActiveCellMouseDown,
     onClick: handleActiveCellClick,
@@ -927,7 +944,13 @@ DataSpreadsheet.propTypes = {
   /**
    * The event handler that is called when the selection area values change
    */
-  onSelectionAreaChange: _propTypes.default.func
+  onSelectionAreaChange: _propTypes.default.func,
+
+  /**
+   * The total number of columns to be initially visible, additional columns will be rendered and
+   * visible via horizontal scrollbar
+   */
+  totalVisibleColumns: _propTypes.default.number
   /* TODO: add types and DocGen for all props. */
 
 };

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -15,6 +15,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -39,8 +41,14 @@ var _createCellSelectionArea = require("./utils/createCellSelectionArea");
 
 var _checkActiveHeaderCell = require("./utils/checkActiveHeaderCell");
 
+var _checkSelectedHeaderCell = require("./utils/checkSelectedHeaderCell");
+
 var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
 
+var _getSpreadsheetWidth = require("./utils/getSpreadsheetWidth");
+
+var _hooks2 = require("./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; }
@@ -74,7 +82,18 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
       currentMatcher = _ref.currentMatcher,
       setCurrentMatcher = _ref.setCurrentMatcher,
       onSelectionAreaChange = _ref.onSelectionAreaChange,
-      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea;
+      setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea,
+      totalVisibleColumns = _ref.totalVisibleColumns,
+      setHeaderCellHoldActive = _ref.setHeaderCellHoldActive,
+      setColumnOrder = _ref.setColumnOrder,
+      visibleColumns = _ref.visibleColumns;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      validStartingPoint = _useState2[0],
+      setValidStartingPoint = _useState2[1];
+
+  var contentScrollRef = (0, _react.useRef)();
   var previousState = (0, _hooks.usePreviousValue)({
     selectionAreaData: selectionAreaData,
     clickAndHoldActive: clickAndHoldActive
@@ -138,14 +157,15 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
             defaultColumn: defaultColumn,
             selectionAreas: selectionAreas,
             setSelectionAreas: setSelectionAreas,
-            setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea
+            setActiveCellInsideSelectionArea: setActiveCellInsideSelectionArea,
+            visibleColumns: visibleColumns
           });
         }
 
         return;
       });
     }
-  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData, ref, activeCellCoordinates, setActiveCellInsideSelectionArea]);
+  }, [selectionAreas, setSelectionAreas, defaultColumn, onSelectionAreaChange, setSelectionAreaData, ref, activeCellCoordinates, setActiveCellInsideSelectionArea, visibleColumns]);
 
   var populateSelectionAreaCellData = function populateSelectionAreaCellData(_ref2) {
     var rowStart = _ref2.rowStart,
@@ -161,41 +181,23 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
     }
 
     return cellContainer;
-  }; // Mouse up
-
-
-  (0, _react.useEffect)(function () {
-    var handleMouseUp = function handleMouseUp(event) {
-      setClickAndHoldActive(false);
-      var cellButton = event.target.closest(".".concat(blockClass, "__body--td"));
-
-      if (cellButton) {
-        var endCellCoordinates = {
-          row: Number(cellButton.getAttribute('data-row-index')),
-          column: Number(cellButton.getAttribute('data-column-index'))
-        };
-        setSelectionAreas(function (prev) {
-          var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
-          var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
-            return item.matcher === currentMatcher;
-          }); // No items in the array have an object that matches the value of currentMatcher
-
-          if (indexOfItemToUpdate === -1) {
-            return prev;
-          }
-
-          selectionAreaClone[indexOfItemToUpdate].point2 = endCellCoordinates;
-          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
-          return selectionAreaClone;
-        });
-      }
-    };
-
-    document.addEventListener('mouseup', handleMouseUp);
-    return function () {
-      document.removeEventListener('mouseup', handleMouseUp);
-    };
-  }, [selectionAreas, currentMatcher, setSelectionAreas, setClickAndHoldActive, setCurrentMatcher, ref]); // Make sure that if the cellSize prop changes, the active
+  };
+
+  (0, _hooks2.useSpreadsheetMouseUp)({
+    currentMatcher: currentMatcher,
+    setClickAndHoldActive: setClickAndHoldActive,
+    setSelectionAreas: setSelectionAreas,
+    setValidStartingPoint: setValidStartingPoint,
+    validStartingPoint: validStartingPoint,
+    ref: ref,
+    setHeaderCellHoldActive: setHeaderCellHoldActive,
+    setColumnOrder: setColumnOrder,
+    visibleColumns: visibleColumns,
+    setActiveCellCoordinates: setActiveCellCoordinates,
+    rows: rows,
+    activeCellCoordinates: activeCellCoordinates,
+    defaultColumn: defaultColumn
+  }); // Make sure that if the cellSize prop changes, the active
   // cell also gets updated with the new size
 
   (0, _react.useEffect)(function () {
@@ -211,6 +213,9 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
   var handleBodyCellClick = (0, _react.useCallback)(function (cell, columnIndex) {
     return function (event) {
       event.preventDefault();
+      var closestBodyCell = event.target.closest(".".concat(blockClass, "__body--td"));
+      var isValidSelectionAreaStart = closestBodyCell.classList.contains("".concat(blockClass, "__body--td"));
+      setValidStartingPoint(isValidSelectionAreaStart);
       var isHoldingCommandKey = event.metaKey || event.ctrlKey;
       var isHoldingShiftKey = event.shiftKey;
       setContainerHasFocus(true);
@@ -271,6 +276,21 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
       }
     };
   }, [currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher, ref, setSelectionAreaData, setActiveCellInsideSelectionArea]);
+
+  var handleBodyScroll = function handleBodyScroll() {
+    var headerRowElement = ref.current.querySelector("\n        .".concat(blockClass, "__header--container .").concat(blockClass, "__tr"));
+    headerRowElement.scrollLeft = contentScrollRef.current.scrollLeft;
+  };
+
+  (0, _react.useEffect)(function () {
+    contentScrollRef.current.addEventListener('scroll', function (event) {
+      return handleBodyScroll(event);
+    });
+    var contentScrollElementRef = contentScrollRef.current;
+    return function () {
+      contentScrollElementRef.removeEventListener('scroll', handleBodyScroll);
+    };
+  });
   var handleBodyCellHover = (0, _react.useCallback)(function (cell, columnIndex) {
     return function () {
       if (clickAndHoldActive) {
@@ -353,6 +373,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
     var row = rows[index];
 
     if (rows && rows.length) {
+      var _cx;
+
       prepareRow(row);
       return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, row.getRowProps({
         style: style
@@ -361,7 +383,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         "data-row-index": index,
         "aria-rowindex": index + 1
       }), /*#__PURE__*/_react.default.createElement("div", {
-        role: "rowheader"
+        role: "rowheader",
+        className: "".concat(blockClass, "__td-th--cell-container")
       }, /*#__PURE__*/_react.default.createElement("button", {
         id: "".concat(blockClass, "__cell--").concat(index, "--header"),
         tabIndex: -1,
@@ -369,9 +392,9 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         "data-column-index": "header",
         type: "button",
         onClick: handleRowHeaderClick(index),
-        className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (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'))),
+        className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row')), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__td-th--selected-header"), (0, _checkSelectedHeaderCell.checkSelectedHeaderCell)(index, selectionAreas, 'row')), _cx)),
         style: {
-          width: (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth) - 4
+          width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
         }
       }, index + 1)), row.cells.map(function (cell, index) {
         return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
@@ -380,7 +403,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         }, cell.getCellProps(), {
           role: "gridcell",
           style: _objectSpread(_objectSpread({}, cell.getCellProps().style), {}, {
-            display: 'grid'
+            display: 'grid',
+            minWidth: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width
           })
         }), /*#__PURE__*/_react.default.createElement("button", {
           id: "".concat(blockClass, "__cell--").concat(cell.row.index, "--").concat(index),
@@ -395,7 +419,7 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
         }, cell.render('Cell')));
       }));
     }
-  }, [prepareRow, rows, defaultColumn.rowHeaderWidth, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover]);
+  }, [prepareRow, rows, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover, defaultColumn]);
   var spreadsheetBodyRef = (0, _react.useRef)();
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: spreadsheetBodyRef,
@@ -405,7 +429,13 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
     height: 400,
     itemCount: rows.length || defaultEmptyRowCount,
     itemSize: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
-    width: totalColumnsWidth + scrollBarSize
+    width: (0, _getSpreadsheetWidth.getSpreadsheetWidth)({
+      scrollBarSizeValue: scrollBarSize,
+      totalVisibleColumns: totalVisibleColumns,
+      defaultColumn: defaultColumn,
+      totalColumnsWidth: totalColumnsWidth
+    }),
+    outerRef: contentScrollRef
   }, rows !== null && rows !== void 0 && rows.length ? RenderRow : RenderEmptyRows));
 });
 exports.DataSpreadsheetBody = DataSpreadsheetBody;
@@ -517,6 +547,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setClickAndHoldActive: _propTypes.default.func,
 
+  /**
+   * Setter fn for column ordering, provided from react-table
+   */
+  setColumnOrder: _propTypes.default.func,
+
   /**
    * Setter fn for containerHasFocus state value
    */
@@ -527,6 +562,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setCurrentMatcher: _propTypes.default.func,
 
+  /**
+   * Setter fn for header cell hold active value
+   */
+  setHeaderCellHoldActive: _propTypes.default.func,
+
   /**
    * Setter fn for selectionAreaData state value
    */
@@ -540,5 +580,16 @@ DataSpreadsheetBody.propTypes = {
   /**
    * The total columns width
    */
-  totalColumnsWidth: _propTypes.default.number
+  totalColumnsWidth: _propTypes.default.number,
+
+  /**
+   * The total number of columns to be initially visible, additional columns will be rendered and
+   * visible via horizontal scrollbar
+   */
+  totalVisibleColumns: _propTypes.default.number,
+
+  /**
+   * Prop from react-table used to reorder columns
+   */
+  visibleColumns: _propTypes.default.array
 };