@carbon/ibm-products 1.11.0 → 1.12.0

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof3 = require("@babel/runtime/helpers/typeof");
+var _typeof = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -11,8 +11,6 @@ exports.DataSpreadsheet = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -43,8 +41,6 @@ var _getScrollbarWidth = require("../../global/js/utils/getScrollbarWidth");
 
 var _hooks = require("../../global/js/hooks");
 
-var _deepCloneObject = require("../../global/js/utils/deepCloneObject");
-
 var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 
 var _useResetSpreadsheetFocus = require("./hooks/useResetSpreadsheetFocus");
@@ -61,11 +57,11 @@ var _handleMultipleKeys = require("./utils/handleMultipleKeys");
 
 var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
 
-var _excluded = ["cellSize", "className", "columns", "data", "onDataUpdate", "id", "onActiveCellChange"];
+var _excluded = ["cellSize", "className", "columns", "data", "onDataUpdate", "id", "onActiveCellChange", "onSelectionAreaChange"];
 
 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 || _typeof3(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; }
+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; }
 
 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; }
 
@@ -80,7 +76,9 @@ var defaults = {
   cellSize: 'standard',
   columns: Object.freeze([]),
   data: Object.freeze([]),
-  onDataUpdate: Object.freeze(function () {})
+  onDataUpdate: Object.freeze(function () {}),
+  onActiveCellChange: Object.freeze(function () {}),
+  onSelectionAreaChange: Object.freeze(function () {})
 };
 /**
  * DataSpreadsheet: used to organize and display large amounts of structured data, separated by columns and rows in a grid-like format.
@@ -97,7 +95,10 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       _ref$onDataUpdate = _ref.onDataUpdate,
       onDataUpdate = _ref$onDataUpdate === void 0 ? defaults.onDataUpdate : _ref$onDataUpdate,
       id = _ref.id,
-      onActiveCellChange = _ref.onActiveCellChange,
+      _ref$onActiveCellChan = _ref.onActiveCellChange,
+      onActiveCellChange = _ref$onActiveCellChan === void 0 ? defaults.onActiveCellChange : _ref$onActiveCellChan,
+      _ref$onSelectionAreaC = _ref.onSelectionAreaChange,
+      onSelectionAreaChange = _ref$onSelectionAreaC === void 0 ? defaults.onSelectionAreaChange : _ref$onSelectionAreaC,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var localRef = (0, _react.useRef)();
   var spreadsheetRef = ref || localRef;
@@ -118,32 +119,42 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       selectionAreas = _useState6[0],
       setSelectionAreas = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(false),
+  var _useState7 = (0, _react.useState)([]),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      clickAndHoldActive = _useState8[0],
-      setClickAndHoldActive = _useState8[1];
+      selectionAreaData = _useState8[0],
+      setSelectionAreaData = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(''),
+  var _useState9 = (0, _react.useState)(false),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      currentMatcher = _useState10[0],
-      setCurrentMatcher = _useState10[1];
+      clickAndHoldActive = _useState10[0],
+      setClickAndHoldActive = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(false),
+  var _useState11 = (0, _react.useState)(''),
       _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      isEditing = _useState12[0],
-      setIsEditing = _useState12[1];
+      currentMatcher = _useState12[0],
+      setCurrentMatcher = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(''),
+  var _useState13 = (0, _react.useState)(false),
       _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-      cellEditorValue = _useState14[0],
-      setCellEditorValue = _useState14[1];
+      isEditing = _useState14[0],
+      setIsEditing = _useState14[1];
+
+  var _useState15 = (0, _react.useState)(''),
+      _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+      cellEditorValue = _useState16[0],
+      setCellEditorValue = _useState16[1];
 
   var previousState = (0, _hooks.usePreviousValue)({
     activeCellCoordinates: activeCellCoordinates
   });
   var cellSizeValue = (0, _getCellSize.getCellSize)(cellSize);
   var cellEditorRef = (0, _react.useRef)();
-  var currentMatcherRef = (0, _react.useRef)();
+
+  var _useState17 = (0, _react.useState)(),
+      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
+      activeCellContent = _useState18[0],
+      setActiveCellContent = _useState18[1];
+
   var activeKeys = (0, _react.useRef)([]);
   var activeCellRef = (0, _react.useRef)();
   var defaultColumn = (0, _react.useMemo)(function () {
@@ -219,10 +230,18 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       removeCellEditor();
       updateData(prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row, cellProps.column.id);
     }
-  }, [activeCellCoordinates, previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates, updateData, rows, isEditing, removeCellEditor]);
-  var handleActiveCellMouseEnter = (0, _react.useCallback)(function () {
-    handleActiveCellMouseEnterCallback(selectionAreas, clickAndHoldActive);
-  }, [clickAndHoldActive, selectionAreas, handleActiveCellMouseEnterCallback]);
+
+    if ((prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row) !== (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) || (prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.column) !== (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column)) {
+      if (activeCellCoordinates && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) !== 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header') {
+        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;
+        setActiveCellContent(activeCellFullData.render('Cell'));
+      }
+
+      if (activeCellCoordinates && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
+        setActiveCellContent(null);
+      }
+    }
+  }, [activeCellCoordinates, previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates, updateData, rows, isEditing, removeCellEditor, activeCellContent]);
   var createActiveCell = (0, _react.useCallback)(function (_ref2) {
     var placementElement = _ref2.placementElement,
         coords = _ref2.coords,
@@ -326,6 +345,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
 
       if (selectionAreas !== null && selectionAreas !== void 0 && selectionAreas.length && key !== 'Shift' && !activeKeys.current.includes('Shift')) {
         setSelectionAreas([]);
+        setSelectionAreaData([]);
         removeCellSelections({
           spreadsheetRef: spreadsheetRef
         });
@@ -509,6 +529,18 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     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;
     setCellEditorValue(activeCellValue);
+  };
+
+  var handleActiveCellClick = function handleActiveCellClick() {
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
+      var indexValue = (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' ? activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column : activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row;
+      handleRowColumnHeaderClick({
+        isKeyboard: false,
+        index: indexValue
+      });
+    }
+
+    return;
   }; // Go into edit mode if 'Enter' key is pressed on activeCellRef
 
 
@@ -521,31 +553,42 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       }
 
       if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
-        var handleHeaderCellProps = {
-          activeCellCoordinates: activeCellCoordinates,
-          rows: rows,
-          columns: columns,
-          setActiveCellCoordinates: setActiveCellCoordinates,
-          setCurrentMatcher: setCurrentMatcher,
-          setSelectionAreas: setSelectionAreas,
-          spreadsheetRef: spreadsheetRef,
+        handleRowColumnHeaderClick({
           isKeyboard: true
-        }; // Select an entire column
-
-        if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header') {
-          (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
-            type: 'column'
-          }, handleHeaderCellProps));
-        } // Select an entire row
-
-
-        if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
-          (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
-            type: 'row'
-          }, handleHeaderCellProps));
-        }
+        });
       }
     }
+  };
+
+  var handleRowColumnHeaderClick = function handleRowColumnHeaderClick(_ref4) {
+    var isKeyboard = _ref4.isKeyboard,
+        _ref4$index = _ref4.index,
+        index = _ref4$index === void 0 ? null : _ref4$index;
+    var handleHeaderCellProps = {
+      activeCellCoordinates: activeCellCoordinates,
+      rows: rows,
+      columns: columns,
+      setActiveCellCoordinates: setActiveCellCoordinates,
+      setCurrentMatcher: setCurrentMatcher,
+      setSelectionAreas: setSelectionAreas,
+      spreadsheetRef: spreadsheetRef,
+      isKeyboard: isKeyboard,
+      setSelectionAreaData: setSelectionAreaData,
+      index: index
+    }; // Select an entire column
+
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header') {
+      (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
+        type: 'column'
+      }, handleHeaderCellProps));
+    } // Select an entire row
+
+
+    if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
+      (0, _handleHeaderCellSelection.handleHeaderCellSelection)(_objectSpread({
+        type: 'row'
+      }, handleHeaderCellProps));
+    }
   }; // Go into edit mode if double click is detected on activeCellRef
 
 
@@ -586,44 +629,8 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     }
 
     return;
-  }; // Only update if there are cell selection areas
-  // Find point object that matches currentMatcher and remove the second point
-  // because hovering over the active cell while clicking and holding should
-  // remove the previously existing selection area
-
-
-  var handleActiveCellMouseEnterCallback = (0, _react.useCallback)(function (areas, clickHold) {
-    var freshMatcherValue = currentMatcherRef.current;
-
-    if (!freshMatcherValue) {
-      return;
-    }
-
-    if (areas && areas.length && clickHold && freshMatcherValue) {
-      setSelectionAreas(function (prev) {
-        var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
-        var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
-          return item.matcher === freshMatcherValue;
-        });
-
-        if (indexOfItemToUpdate === -1) {
-          return prev;
-        }
-
-        if ((0, _typeof2.default)(selectionAreaClone[indexOfItemToUpdate].point2) === 'object' && selectionAreaClone[indexOfItemToUpdate].areaCreated) {
-          selectionAreaClone[indexOfItemToUpdate].point2 = null;
-          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
-          removeCellSelections({
-            matcher: freshMatcherValue,
-            spreadsheetRef: spreadsheetRef
-          });
-          return selectionAreaClone;
-        }
+  };
 
-        return prev;
-      });
-    }
-  }, [spreadsheetRef, removeCellSelections]);
   (0, _react.useEffect)(function () {
     if (isEditing) {
       var _rows$activeCellCoord, _cellProps$column, _cellEditorRef$curren;
@@ -636,7 +643,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       cellEditorRef.current.style.display = 'block';
       cellEditorRef.current.style.width = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.width;
       cellEditorRef.current.style.height = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height;
-      cellEditorRef.current.style.paddingTop = "".concat((parseInt(activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height) - 16) / 2, "px"); // calculate paddingTop based on cellHeight which could be variable depending on the cellSize prop
+      cellEditorRef.current.style.paddingTop = "".concat((parseInt(activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.height) - 16) / 2 - 1, "px"); // calculate paddingTop based on cellHeight which could be variable depending on the cellSize prop
 
       cellEditorRef.current.style.textAlign = (cellProps === null || cellProps === void 0 ? void 0 : (_cellProps$column = cellProps.column) === null || _cellProps$column === void 0 ? void 0 : _cellProps$column.placement) === 'right' ? 'right' : 'left';
       (_cellEditorRef$curren = cellEditorRef.current) === null || _cellEditorRef$curren === void 0 ? void 0 : _cellEditorRef$curren.focus();
@@ -678,15 +685,17 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
   }), /*#__PURE__*/_react.default.createElement(_DataSpreadsheetHeader.DataSpreadsheetHeader, {
     ref: spreadsheetRef,
     activeCellCoordinates: activeCellCoordinates,
-    cellSizeValue: cellSizeValue,
+    cellSize: cellSize,
     columns: columns,
     defaultColumn: defaultColumn,
     headerGroups: headerGroups,
     rows: rows,
+    scrollBarSize: scrollBarSize,
     selectionAreas: selectionAreas,
     setActiveCellCoordinates: setActiveCellCoordinates,
     setSelectionAreas: setSelectionAreas,
-    setCurrentMatcher: setCurrentMatcher
+    setCurrentMatcher: setCurrentMatcher,
+    setSelectionAreaData: setSelectionAreaData
   }), /*#__PURE__*/_react.default.createElement(_DataSpreadsheetBody.DataSpreadsheetBody, {
     activeCellCoordinates: activeCellCoordinates,
     ref: spreadsheetRef,
@@ -701,21 +710,24 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
     defaultColumn: defaultColumn,
     getTableBodyProps: getTableBodyProps,
     onActiveCellChange: onActiveCellChange,
+    onSelectionAreaChange: onSelectionAreaChange,
     prepareRow: prepareRow,
     rows: rows,
+    selectionAreaData: selectionAreaData,
+    setSelectionAreaData: setSelectionAreaData,
     setActiveCellCoordinates: setActiveCellCoordinates,
     scrollBarSize: scrollBarSize,
     totalColumnsWidth: totalColumnsWidth,
     id: id,
     columns: columns
   }), /*#__PURE__*/_react.default.createElement("button", {
+    onClick: handleActiveCellClick,
     onKeyDown: handleActiveCellKeyDown,
-    onMouseEnter: handleActiveCellMouseEnter,
     onDoubleClick: handleActiveCellDoubleClick,
     ref: activeCellRef,
     className: (0, _classnames.default)("".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__active-cell--highlight")),
     type: "button"
-  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextArea, {
+  }, activeCellContent), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextArea, {
     value: cellEditorValue,
     onKeyDown: handleEditSubmit,
     onChange: function onChange(event) {
@@ -776,7 +788,12 @@ DataSpreadsheet.propTypes = {
   /**
    * The setter fn for the data prop
    */
-  onDataUpdate: _propTypes.default.func
+  onDataUpdate: _propTypes.default.func,
+
+  /**
+   * The event handler that is called when the selection area values change
+   */
+  onSelectionAreaChange: _propTypes.default.func
   /* TODO: add types and DocGen for all props. */
 
 };

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -29,6 +29,8 @@ 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");
@@ -56,6 +58,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
       id = _ref.id,
       prepareRow = _ref.prepareRow,
       rows = _ref.rows,
+      selectionAreaData = _ref.selectionAreaData,
+      setSelectionAreaData = _ref.setSelectionAreaData,
       setActiveCellCoordinates = _ref.setActiveCellCoordinates,
       selectionAreas = _ref.selectionAreas,
       setContainerHasFocus = _ref.setContainerHasFocus,
@@ -65,24 +69,60 @@ 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
+  }); // 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 +135,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 +253,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,14 +299,15 @@ 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]); // Renders each row/cell in the spreadsheet body
 
-  var RenderRow = (0, _react.useCallback)(function (_ref2) {
-    var index = _ref2.index,
-        style = _ref2.style;
+  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({
@@ -342,6 +401,11 @@ DataSpreadsheetBody.propTypes = {
    */
   onActiveCellChange: _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 +421,11 @@ DataSpreadsheetBody.propTypes = {
    */
   scrollBarSize: _propTypes.default.number,
 
+  /**
+   * Array of selection area data
+   */
+  selectionAreaData: _propTypes.default.array,
+
   /**
    * Array of selection areas
    */
@@ -382,6 +451,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,6 +96,9 @@ 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", {
       "data-row-index": "header",
@@ -107,6 +137,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 +166,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 +186,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   setCurrentMatcher: _propTypes.default.func,
 
+  /**
+   * Setter fn for selectionAreaData state value
+   */
+  setSelectionAreaData: _propTypes.default.func,
+
   /**
    * Setter fn for selectionAreas value
    */