@carbon/ibm-products 1.15.0 → 1.18.0

package/es/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 
 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; }
 
@@ -12,7 +13,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { useRef, useCallback, useEffect, forwardRef } from 'react';
+import React, { useRef, useCallback, useEffect, forwardRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { FixedSizeList } from 'react-window';
 import cx from 'classnames';
@@ -24,7 +25,10 @@ import { usePreviousValue } from '../../global/js/hooks';
 import { removeCellSelections } from './utils/removeCellSelections';
 import { createCellSelectionArea } from './utils/createCellSelectionArea';
 import { checkActiveHeaderCell } from './utils/checkActiveHeaderCell';
+import { checkSelectedHeaderCell } from './utils/checkSelectedHeaderCell';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection';
+import { getSpreadsheetWidth } from './utils/getSpreadsheetWidth';
+import { useSpreadsheetMouseUp } from './hooks';
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
 export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var columns = _ref.columns,
@@ -50,7 +54,18 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       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 = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      validStartingPoint = _useState2[0],
+      setValidStartingPoint = _useState2[1];
+
+  var contentScrollRef = useRef();
   var previousState = usePreviousValue({
     selectionAreaData: selectionAreaData,
     clickAndHoldActive: clickAndHoldActive
@@ -114,14 +129,15 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
             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,
@@ -137,41 +153,23 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }
 
     return cellContainer;
-  }; // Mouse up
-
-
-  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 = 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
+  };
+
+  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
 
   useEffect(function () {
@@ -187,6 +185,9 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var handleBodyCellClick = 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);
@@ -247,6 +248,21 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }
     };
   }, [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;
+  };
+
+  useEffect(function () {
+    contentScrollRef.current.addEventListener('scroll', function (event) {
+      return handleBodyScroll(event);
+    });
+    var contentScrollElementRef = contentScrollRef.current;
+    return function () {
+      contentScrollElementRef.removeEventListener('scroll', handleBodyScroll);
+    };
+  });
   var handleBodyCellHover = useCallback(function (cell, columnIndex) {
     return function () {
       if (clickAndHoldActive) {
@@ -331,6 +347,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     var row = rows[index];
 
     if (rows && rows.length) {
+      var _cx;
+
       prepareRow(row);
       return /*#__PURE__*/React.createElement("div", _extends({}, row.getRowProps({
         style: style
@@ -339,7 +357,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         "data-row-index": index,
         "aria-rowindex": index + 1
       }), /*#__PURE__*/React.createElement("div", {
-        role: "rowheader"
+        role: "rowheader",
+        className: "".concat(blockClass, "__td-th--cell-container")
       }, /*#__PURE__*/React.createElement("button", {
         id: "".concat(blockClass, "__cell--").concat(index, "--header"),
         tabIndex: -1,
@@ -347,9 +366,9 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         "data-column-index": "header",
         type: "button",
         onClick: handleRowHeaderClick(index),
-        className: cx("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), _defineProperty({}, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || checkActiveHeaderCell(index, selectionAreas, 'row'))),
+        className: cx("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || checkActiveHeaderCell(index, selectionAreas, 'row')), _defineProperty(_cx, "".concat(blockClass, "__td-th--selected-header"), checkSelectedHeaderCell(index, selectionAreas, 'row')), _cx)),
         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.createElement("div", _extends({
@@ -358,7 +377,8 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }, 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.createElement("button", {
           id: "".concat(blockClass, "__cell--").concat(cell.row.index, "--").concat(index),
@@ -373,7 +393,7 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }, 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 = useRef();
   return /*#__PURE__*/React.createElement("div", _extends({
     ref: spreadsheetBodyRef,
@@ -383,7 +403,13 @@ export var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     height: 400,
     itemCount: rows.length || defaultEmptyRowCount,
     itemSize: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
-    width: totalColumnsWidth + scrollBarSize
+    width: getSpreadsheetWidth({
+      scrollBarSizeValue: scrollBarSize,
+      totalVisibleColumns: totalVisibleColumns,
+      defaultColumn: defaultColumn,
+      totalColumnsWidth: totalColumnsWidth
+    }),
+    outerRef: contentScrollRef
   }, rows !== null && rows !== void 0 && rows.length ? RenderRow : RenderEmptyRows));
 });
 DataSpreadsheetBody.propTypes = {
@@ -494,6 +520,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setClickAndHoldActive: PropTypes.func,
 
+  /**
+   * Setter fn for column ordering, provided from react-table
+   */
+  setColumnOrder: PropTypes.func,
+
   /**
    * Setter fn for containerHasFocus state value
    */
@@ -504,6 +535,11 @@ DataSpreadsheetBody.propTypes = {
    */
   setCurrentMatcher: PropTypes.func,
 
+  /**
+   * Setter fn for header cell hold active value
+   */
+  setHeaderCellHoldActive: PropTypes.func,
+
   /**
    * Setter fn for selectionAreaData state value
    */
@@ -517,5 +553,16 @@ DataSpreadsheetBody.propTypes = {
   /**
    * The total columns width
    */
-  totalColumnsWidth: PropTypes.number
+  totalColumnsWidth: PropTypes.number,
+
+  /**
+   * The total number of columns to be initially visible, additional columns will be rendered and
+   * visible via horizontal scrollbar
+   */
+  totalVisibleColumns: PropTypes.number,
+
+  /**
+   * Prop from react-table used to reorder columns
+   */
+  visibleColumns: PropTypes.array
 };

package/es/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -19,8 +19,11 @@ import { px } from '@carbon/layout';
 import { pkg } from '../../settings';
 import { usePreviousValue } from '../../global/js/hooks';
 import { checkActiveHeaderCell } from './utils/checkActiveHeaderCell';
+import { checkSelectedHeaderCell } from './utils/checkSelectedHeaderCell';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection';
 import { selectAllCells } from './utils/selectAllCells';
+import { getSpreadsheetWidth } from './utils/getSpreadsheetWidth';
+import { useSpreadsheetMouseMove } from './hooks';
 var blockClass = "".concat(pkg.prefix, "--data-spreadsheet");
 export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var activeCellCoordinates = _ref.activeCellCoordinates,
@@ -35,13 +38,21 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
       setSelectionAreas = _ref.setSelectionAreas,
       setSelectionAreaData = _ref.setSelectionAreaData,
       rows = _ref.rows,
-      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
+      totalVisibleColumns = _ref.totalVisibleColumns,
+      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates,
+      setHeaderCellHoldActive = _ref.setHeaderCellHoldActive,
+      headerCellHoldActive = _ref.headerCellHoldActive;
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
       scrollBarSizeValue = _useState2[0],
       setScrollBarSizeValue = _useState2[1];
 
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selectedHeaderReorderActive = _useState4[0],
+      setSelectedHeaderReorderActive = _useState4[1];
+
   var previousState = usePreviousValue({
     cellSize: cellSize
   });
@@ -87,6 +98,39 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
     });
   };
 
+  var handleHeaderMouseDown = function handleHeaderMouseDown(index) {
+    return function (event) {
+      var _selectionAreaToClone;
+
+      setSelectedHeaderReorderActive(true);
+      var clickXPosition = event.clientX;
+      var headerButtonCoords = event.target.getBoundingClientRect();
+      var offsetXValue = clickXPosition - headerButtonCoords.left;
+      var bodyContainer = document.querySelector(".".concat(blockClass, "__list--container")).firstElementChild;
+      var selectionAreaToClone = selectionAreas.filter(function (item) {
+        var _item$header;
+
+        return (item === null || item === void 0 ? void 0 : (_item$header = item.header) === null || _item$header === void 0 ? void 0 : _item$header.index) === index;
+      });
+      var selectionAreaElement = ref.current.querySelector("[data-matcher-id=\"".concat((_selectionAreaToClone = selectionAreaToClone[0]) === null || _selectionAreaToClone === void 0 ? void 0 : _selectionAreaToClone.matcher, "\"]"));
+      var selectionAreaClonedElement = selectionAreaElement.cloneNode();
+      var reorderIndicatorLine = selectionAreaElement.cloneNode();
+      reorderIndicatorLine.className = "".concat(blockClass, "__reorder-indicator-line");
+      reorderIndicatorLine.style.width = px(2);
+      selectionAreaClonedElement.classList.add("".concat(blockClass, "__selection-area--element-cloned"));
+      selectionAreaClonedElement.setAttribute('data-clone-offset-x', offsetXValue);
+      selectionAreaClonedElement.setAttribute('data-column-index-original', index);
+      bodyContainer.appendChild(selectionAreaClonedElement);
+      bodyContainer.appendChild(reorderIndicatorLine);
+      setHeaderCellHoldActive(true);
+    };
+  };
+
+  useSpreadsheetMouseMove({
+    ref: ref,
+    headerCellHoldActive: headerCellHoldActive,
+    defaultColumn: defaultColumn
+  });
   return /*#__PURE__*/React.createElement("div", {
     className: cx("".concat(blockClass, "__header--container")),
     role: "rowgroup"
@@ -95,13 +139,21 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
       key: "header_".concat(index)
     }, headerGroup.getHeaderGroupProps(), {
       style: _objectSpread(_objectSpread({}, headerGroup.getHeaderGroupProps().style), {}, {
-        width: px(parseInt(headerGroup.getHeaderGroupProps().style.width) + scrollBarSizeValue)
+        width: getSpreadsheetWidth({
+          type: 'header',
+          headerGroup: headerGroup,
+          scrollBarSizeValue: scrollBarSizeValue,
+          totalVisibleColumns: totalVisibleColumns,
+          defaultColumn: defaultColumn
+        }),
+        overflow: 'hidden'
       }),
       className: "".concat(blockClass, "__tr")
     }), /*#__PURE__*/React.createElement("div", {
       role: "columnheader",
+      className: "".concat(blockClass, "__select-all-cell-container"),
       style: {
-        width: (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth) - 4,
+        width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth,
         height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
       }
     }, /*#__PURE__*/React.createElement("button", {
@@ -113,6 +165,9 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
       onClick: handleSelectAllClick,
       className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), "".concat(blockClass, "__th--select-all"), _defineProperty({}, "".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) {
+      var _cx2;
+
+      var selectedHeader = checkSelectedHeaderCell(index, selectionAreas, 'column');
       return /*#__PURE__*/React.createElement("div", _extends({
         key: "column_".concat(index),
         role: "columnheader",
@@ -122,11 +177,16 @@ export var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref)
         "data-row-index": "header",
         "data-column-index": index,
         tabIndex: -1,
-        onClick: handleColumnHeaderClick(index),
+        onMouseDown: selectedHeader ? handleHeaderMouseDown(index) : null,
+        onMouseUp: selectedHeader ? function () {
+          return setSelectedHeaderReorderActive(false);
+        } : null,
+        onClick: !selectedHeader ? handleColumnHeaderClick(index) : null,
         style: {
-          height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
+          height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
+          width: (column === null || column === void 0 ? void 0 : column.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width)
         },
-        className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), _defineProperty({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || checkActiveHeaderCell(index, selectionAreas, 'column'))),
+        className: cx("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (_cx2 = {}, _defineProperty(_cx2, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || checkActiveHeaderCell(index, selectionAreas, 'column')), _defineProperty(_cx2, "".concat(blockClass, "__th--selected-header"), selectedHeader), _defineProperty(_cx2, "".concat(blockClass, "__th--selected-header-reorder-active"), selectedHeaderReorderActive), _cx2)),
         type: "button"
       }, column.render('Header')));
     }));
@@ -160,6 +220,11 @@ DataSpreadsheetHeader.propTypes = {
     width: PropTypes.number
   }),
 
+  /**
+   * Whether or not a click/hold is active on a header cell
+   */
+  headerCellHoldActive: PropTypes.bool,
+
   /**
    * Headers provided from useTable hook
    */
@@ -190,6 +255,11 @@ DataSpreadsheetHeader.propTypes = {
    */
   setCurrentMatcher: PropTypes.func,
 
+  /**
+   * Setter fn for header cell hold active value
+   */
+  setHeaderCellHoldActive: PropTypes.func,
+
   /**
    * Setter fn for selectionAreaData state value
    */
@@ -200,6 +270,12 @@ DataSpreadsheetHeader.propTypes = {
    */
   setSelectionAreas: PropTypes.func,
 
+  /**
+   * The total number of columns to be initially visible, additional columns will be rendered and
+   * visible via horizontal scrollbar
+   */
+  totalVisibleColumns: PropTypes.number,
+
   /**
    * Function used to update the active cell coordinates
    */

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

@@ -8,4 +8,6 @@ export { useMoveActiveCell } from './useMoveActiveCell';
 export { useMultipleKeyTracking } from './useMultipleKeyTracking';
 export { useResetSpreadsheetFocus } from './useResetSpreadsheetFocus';
 export { useSpreadsheetOutsideClick } from './useSpreadsheetOutsideClick';
-export { useSpreadsheetEdit } from './useSpreadsheetEdit';
+export { useSpreadsheetEdit } from './useSpreadsheetEdit';
+export { useSpreadsheetMouseUp } from './useSpreadsheetMouseUp';
+export { useSpreadsheetMouseMove } from './useSpreadsheetMouseMove';

package/es/components/DataSpreadsheet/hooks/useSpreadsheetEdit.js

@@ -1,11 +1,15 @@
-// /**
-//  * 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.
-//  */
-import { useEffect } from 'react';
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+
+/**
+ * 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.
+ */
+import { useEffect, useState } from 'react';
 import { px } from '@carbon/layout';
+import { pkg } from '../../../settings';
+import { usePreviousValue } from '../../../global/js/hooks';
 export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
   var isEditing = _ref.isEditing,
       rows = _ref.rows,
@@ -13,10 +17,29 @@ export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
       activeCellRef = _ref.activeCellRef,
       cellEditorRef = _ref.cellEditorRef,
       cellEditorRulerRef = _ref.cellEditorRulerRef,
-      columns = _ref.columns,
+      visibleColumns = _ref.visibleColumns,
       defaultColumn = _ref.defaultColumn,
-      cellEditorValue = _ref.cellEditorValue;
+      cellEditorValue = _ref.cellEditorValue,
+      _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(pkg.prefix, "--data-spreadsheet") : _ref$blockClass;
+
+  var _useState = useState(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      nextIndex = _useState2[0],
+      setNextIndex = _useState2[1];
+
+  var previousState = usePreviousValue({
+    nextIndex: nextIndex
+  });
   useEffect(function () {
+    if (!(previousState !== null && previousState !== void 0 && previousState.nextIndex)) {
+      setNextIndex(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column);
+    }
+  }, [previousState === null || previousState === void 0 ? void 0 : previousState.nextIndex, activeCellCoordinates]);
+  useEffect(function () {
+    var rulerWidth = cellEditorRulerRef.current.offsetWidth;
+    var cellEditorCurrentWidth = parseInt(cellEditorRef.current.style.width);
+
     if (isEditing) {
       var _rows$activeCellCoord, _cellProps$column, _cellEditorRef$curren;
 
@@ -26,25 +49,47 @@ export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
       cellEditorRef.current.style.left = activeCellLeftPosition;
       cellEditorRef.current.style.top = activeCellTopPosition;
       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 - 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();
-      var rulerWidth = cellEditorRulerRef.current.offsetWidth;
-      var cellWidth = activeCellRef.current.offsetWidth;
 
-      if (rulerWidth >= cellWidth) {
-        var widthMultiplier = Math.floor(rulerWidth / cellWidth) + 1;
-        var startingColumnPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column;
+      if (rulerWidth < cellEditorCurrentWidth) {
+        var _visibleColumns$nextI;
+
+        var currentColumnWidth = ((_visibleColumns$nextI = visibleColumns[nextIndex]) === null || _visibleColumns$nextI === void 0 ? void 0 : _visibleColumns$nextI.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width); // If the contents of the cell editor is deleted past the point of the next column
+
+        if (rulerWidth < cellEditorCurrentWidth - currentColumnWidth) {
+          cellEditorRef.current.style.width = px(parseInt(cellEditorRef.current.style.width) - currentColumnWidth);
+          setNextIndex(function (prev) {
+            if (prev === 0) {
+              return prev;
+            }
+
+            return prev - 1;
+          });
+        } // Decrease cell editor width by increment of current column width
+
+      }
+
+      if (rulerWidth >= cellEditorCurrentWidth) {
+        var _visibleColumns;
+
+        setNextIndex(function (prev) {
+          if (prev === visibleColumns.length - 1) {
+            return prev;
+          }
+
+          return prev + 1;
+        });
+        var onLastColumnIndex = nextIndex + 1 === visibleColumns.length;
+        var nextColumnWidth = onLastColumnIndex ? 0 : ((_visibleColumns = visibleColumns[nextIndex + 1]) === null || _visibleColumns === void 0 ? void 0 : _visibleColumns.width) || (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width);
         var startingRowPosition = activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row;
-        var totalColumns = columns.length;
         var totalRows = rows.length;
-        var totalMultiplierPossible = totalColumns - startingColumnPosition;
         var totalCellEditorMaxHeight = (totalRows - startingRowPosition) * defaultColumn.rowHeight;
         cellEditorRef.current.style.maxHeight = px(totalCellEditorMaxHeight);
-        cellEditorRef.current.style.width = px(cellWidth * (widthMultiplier <= totalMultiplierPossible ? widthMultiplier : totalMultiplierPossible));
+        cellEditorRef.current.style.width = px(nextColumnWidth + cellEditorCurrentWidth);
         cellEditorRef.current.style.height = px(cellEditorRef.current.scrollHeight); // adds dynamic height to cell editor
         // Cell editor has reached max height, we need to add the scrolling back.
         // We also need to subtract 1 to account for the fact that the cell editor
@@ -63,6 +108,7 @@ export var useSpreadsheetEdit = function useSpreadsheetEdit(_ref) {
       cellEditorRef.current.style.display = 'none';
       cellEditorRef.current.blur();
       activeCellRef.current.focus();
+      setNextIndex(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column);
     }
-  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, columns.length, defaultColumn, cellEditorValue, activeCellRef, cellEditorRef, cellEditorRulerRef]);
+  }, [isEditing, activeCellCoordinates, rows, cellEditorValue, defaultColumn, activeCellRef, cellEditorRef, cellEditorRulerRef, visibleColumns, blockClass, previousState === null || previousState === void 0 ? void 0 : previousState.cellEditorValue, nextIndex]);
 };

package/es/components/DataSpreadsheet/hooks/useSpreadsheetMouseMove.js

@@ -0,0 +1,60 @@
+/**
+ * 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.
+ */
+import { useEffect } from 'react';
+import { px } from '@carbon/layout';
+import { pkg } from '../../../settings';
+import { getScrollbarWidth } from '../../../global/js/utils/getScrollbarWidth';
+import { moveColumnIndicatorLine } from '../utils/moveColumnIndicatorLine'; // Used specifically for reordering columns, will move the position of the
+// cloned selection area to follow the position of the cursor
+
+export var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
+  var ref = _ref.ref,
+      _ref$blockClass = _ref.blockClass,
+      blockClass = _ref$blockClass === void 0 ? "".concat(pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
+      headerCellHoldActive = _ref.headerCellHoldActive,
+      defaultColumn = _ref.defaultColumn;
+  useEffect(function () {
+    var handleMouseMove = function handleMouseMove(event) {
+      var clonedSelectionElement = ref.current.querySelector(".".concat(blockClass, "__selection-area--element-cloned"));
+
+      if (clonedSelectionElement) {
+        ref.current.addEventListener('mousemove', handleMouseMove);
+      }
+
+      var spreadsheetCoords = ref.current.getBoundingClientRect();
+      moveColumnIndicatorLine({
+        clonedSelectionElement: clonedSelectionElement,
+        ref: ref,
+        spreadsheetCoords: spreadsheetCoords
+      });
+      var scrollbarWidth = getScrollbarWidth();
+      var spreadsheetWrapperElement = ref.current;
+      spreadsheetWrapperElement.getBoundingClientRect();
+      var xPositionRelativeToSpreadsheet = event.clientX - spreadsheetCoords.left;
+      var offsetXValue = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-clone-offset-x');
+      var totalSpreadsheetWidth = ref.current.offsetWidth;
+      var clonedSelectionWidth = clonedSelectionElement.offsetWidth;
+      var clonePlacement = Math.max(xPositionRelativeToSpreadsheet - offsetXValue, defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth); // Moves the position of the cloned selection area to follow mouse
+
+      clonedSelectionElement.style.left = px(totalSpreadsheetWidth - clonedSelectionWidth - scrollbarWidth >= clonePlacement ? clonePlacement : totalSpreadsheetWidth - clonedSelectionWidth - scrollbarWidth);
+    };
+
+    if (headerCellHoldActive) {
+      ref.current.addEventListener('mousemove', handleMouseMove);
+    }
+
+    var spreadsheetRef = ref.current;
+
+    if (!headerCellHoldActive) {
+      spreadsheetRef === null || spreadsheetRef === void 0 ? void 0 : spreadsheetRef.removeEventListener('mousemove', handleMouseMove);
+    }
+
+    return function () {
+      spreadsheetRef === null || spreadsheetRef === void 0 ? void 0 : spreadsheetRef.removeEventListener('mousemove', handleMouseMove);
+    };
+  });
+};