@carbon/ibm-products 2.43.2-canary.15 → 2.43.2-canary.2

package/es/components/DataSpreadsheet/DataSpreadsheet.js

@@ -112,19 +112,15 @@ var DataSpreadsheet = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
     _useState18 = _slicedToArray(_useState17, 2),
     headerCellHoldActive = _useState18[0],
     setHeaderCellHoldActive = _useState18[1];
+  var isBlurSpreadsheet = useRef(false);
   var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    selectedHeaderReorderActive = _useState20[0],
-    setSelectedHeaderReorderActive = _useState20[1];
-  var isBlurSpreadsheet = useRef(false);
+    isActiveHeaderCellChanged = _useState20[0],
+    setIsActiveHeaderCellChanged = _useState20[1];
   var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    isActiveHeaderCellChanged = _useState22[0],
-    setIsActiveHeaderCellChanged = _useState22[1];
-  var _useState23 = useState(false),
-    _useState24 = _slicedToArray(_useState23, 2),
-    activeCellInsideSelectionArea = _useState24[0],
-    setActiveCellInsideSelectionArea = _useState24[1];
+    activeCellInsideSelectionArea = _useState22[0],
+    setActiveCellInsideSelectionArea = _useState22[1];
   var previousState = usePreviousValue({
     activeCellCoordinates: activeCellCoordinates,
     isEditing: isEditing,
@@ -132,10 +128,10 @@ var DataSpreadsheet = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
   }) || {};
   var cellSizeValue = getCellSize(cellSize);
   var cellEditorRef = useRef();
-  var _useState25 = useState(),
-    _useState26 = _slicedToArray(_useState25, 2),
-    activeCellContent = _useState26[0],
-    setActiveCellContent = _useState26[1];
+  var _useState23 = useState(),
+    _useState24 = _slicedToArray(_useState23, 2),
+    activeCellContent = _useState24[0],
+    setActiveCellContent = _useState24[1];
   var activeCellRef = useRef();
   var cellEditorRulerRef = useRef();
   var defaultColumn = useMemo(function () {
@@ -211,12 +207,9 @@ var DataSpreadsheet = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
     }
     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$r;
         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;
-        if (activeCellFullData) {
-          setActiveCellContent(activeCellFullData.render('Cell'));
-        } else {
-          setActiveCellContent(null);
-        }
+        setActiveCellContent((_activeCellFullData$r = activeCellFullData === null || activeCellFullData === void 0 ? void 0 : activeCellFullData.render('Cell')) !== null && _activeCellFullData$r !== void 0 ? _activeCellFullData$r : null);
       }
       if (activeCellCoordinates && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
         setActiveCellContent(null);
@@ -431,8 +424,8 @@ 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;
     if (activeCellFullData && activeCellCoordinates !== null && activeCellCoordinates !== void 0 && activeCellCoordinates.column) {
-      var _activeCellFullData$r;
-      activeCellValue = activeCellFullData ? (_activeCellFullData$r = activeCellFullData.row.cells) === null || _activeCellFullData$r === void 0 || (_activeCellFullData$r = _activeCellFullData$r[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column]) === null || _activeCellFullData$r === void 0 ? void 0 : _activeCellFullData$r.value : null;
+      var _activeCellFullData$r2;
+      activeCellValue = activeCellFullData ? (_activeCellFullData$r2 = activeCellFullData.row.cells) === null || _activeCellFullData$r2 === void 0 || (_activeCellFullData$r2 = _activeCellFullData$r2[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column]) === null || _activeCellFullData$r2 === void 0 ? void 0 : _activeCellFullData$r2.value : null;
     }
     setCellEditorValue(activeCellValue || '');
     if (cellEditorRulerRef !== null && cellEditorRulerRef !== void 0 && cellEditorRulerRef.current) {
@@ -622,8 +615,6 @@ var DataSpreadsheet = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
     columns: columns,
     currentMatcher: currentMatcher,
     defaultColumn: defaultColumn,
-    selectedHeaderReorderActive: selectedHeaderReorderActive,
-    setSelectedHeaderReorderActive: setSelectedHeaderReorderActive,
     headerGroups: headerGroups,
     rows: rows,
     scrollBarSize: scrollBarSize,
@@ -647,8 +638,6 @@ var DataSpreadsheet = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
     currentMatcher: currentMatcher,
     setCurrentMatcher: setCurrentMatcher,
     setContainerHasFocus: setContainerHasFocus,
-    selectedHeaderReorderActive: selectedHeaderReorderActive,
-    setSelectedHeaderReorderActive: setSelectedHeaderReorderActive,
     selectionAreas: selectionAreas,
     setSelectionAreas: setSelectionAreas,
     headerGroups: headerGroups,
@@ -699,11 +688,9 @@ var DataSpreadsheet = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
       updateData: updateData
     }),
     onChange: function onChange(event) {
-      if (previousState.isEditing) {
-        setCellEditorValue(event.target.value);
-        if (cellEditorRulerRef !== null && cellEditorRulerRef !== void 0 && cellEditorRulerRef.current) {
-          cellEditorRulerRef.current.textContent = event.target.value;
-        }
+      setCellEditorValue(event.target.value);
+      if (cellEditorRulerRef !== null && cellEditorRulerRef !== void 0 && cellEditorRulerRef.current) {
+        cellEditorRulerRef.current.textContent = event.target.value;
       }
     },
     ref: cellEditorRef,

package/es/components/DataSpreadsheet/DataSpreadsheetBody.d.ts

@@ -79,15 +79,7 @@ interface DataSpreadsheetBodyProps {
     /**
      * Array of selection area data
      */
-    selectionAreaData?: any[];
-    /**
-     * Header reordering is active
-     */
-    selectedHeaderReorderActive?: boolean;
-    /**
-     * Set header reordering active or not
-     */
-    setSelectedHeaderReorderActive?: Dispatch<SetStateAction<boolean>>;
+    selectionAreaData?: object[];
     /**
      * Array of selection areas
      */

package/es/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -40,8 +40,6 @@ var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     selectionAreaData = _ref.selectionAreaData,
     setSelectionAreaData = _ref.setSelectionAreaData,
     setActiveCellCoordinates = _ref.setActiveCellCoordinates,
-    selectedHeaderReorderActive = _ref.selectedHeaderReorderActive,
-    setSelectedHeaderReorderActive = _ref.setSelectedHeaderReorderActive,
     selectionAreas = _ref.selectionAreas,
     setContainerHasFocus = _ref.setContainerHasFocus,
     setSelectionAreas = _ref.setSelectionAreas,
@@ -77,12 +75,8 @@ var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   // back to the consumer
   useEffect(function () {
     if (selectionAreaData !== null && selectionAreaData !== void 0 && selectionAreaData.length) {
-      var _previousState$select, _selectionAreaData$, _previousState$select2;
-      var selectionChanged = false;
-      if ((previousState === null || previousState === 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) || (selectionAreaData === null || selectionAreaData === void 0 || (_selectionAreaData$ = selectionAreaData[0]) === null || _selectionAreaData$ === void 0 ? void 0 : _selectionAreaData$.cells.length) !== (previousState === null || previousState === void 0 || (_previousState$select2 = previousState.selectionAreaData) === null || _previousState$select2 === void 0 || (_previousState$select2 = _previousState$select2[0]) === null || _previousState$select2 === void 0 ? void 0 : _previousState$select2.cells.length)) {
-        selectionChanged = true;
-      }
-      if (!clickAndHoldActive && previousState !== null && previousState !== void 0 && previousState.clickAndHoldActive || selectionChanged) {
+      var _previousState$select;
+      if (!clickAndHoldActive && previousState !== null && previousState !== void 0 && previousState.clickAndHoldActive || (previousState === null || previousState === 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 === null || onSelectionAreaChange === void 0 || onSelectionAreaChange(selectionAreaData);
       }
     }
@@ -157,8 +151,6 @@ var DataSpreadsheetBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setClickAndHoldActive: setClickAndHoldActive,
     setSelectionAreas: setSelectionAreas,
     setValidStartingPoint: setValidStartingPoint,
-    selectedHeaderReorderActive: selectedHeaderReorderActive,
-    setSelectedHeaderReorderActive: setSelectedHeaderReorderActive,
     validStartingPoint: validStartingPoint,
     ref: ref,
     setHeaderCellHoldActive: setHeaderCellHoldActive,
@@ -465,10 +457,6 @@ DataSpreadsheetBody.propTypes = {
    * The scrollbar width
    */
   scrollBarSize: PropTypes.number,
-  /**
-   * Header reordering is active
-   */
-  selectedHeaderReorderActive: PropTypes.bool,
   /**
    * Array of selection area data
    */
@@ -505,10 +493,6 @@ DataSpreadsheetBody.propTypes = {
    * Setter fn for header cell hold active value
    */
   setHeaderCellHoldActive: PropTypes.func,
-  /**
-   * Set header reordering active or not
-   */
-  setSelectedHeaderReorderActive: PropTypes.func,
   /**
    * Setter fn for selectionAreaData state value
    */

package/es/components/DataSpreadsheet/DataSpreadsheetHeader.d.ts

@@ -56,14 +56,6 @@ interface DataSpreadsheetHeaderProps {
      * Setter fn for activeCellCoordinates value
      */
     setActiveCellCoordinates?: Dispatch<SetStateAction<ActiveCellCoordinates | null>>;
-    /**
-     * Header reordering is active
-     */
-    selectedHeaderReorderActive?: boolean;
-    /**
-     * Set header reordering active or not
-     */
-    setSelectedHeaderReorderActive?: Dispatch<SetStateAction<boolean>>;
     /**
      * Setter fn for currentMatcher value
      */

package/es/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -31,8 +31,6 @@ var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
     headerGroups = _ref.headerGroups,
     scrollBarSize = _ref.scrollBarSize,
     selectionAreas = _ref.selectionAreas,
-    selectedHeaderReorderActive = _ref.selectedHeaderReorderActive,
-    setSelectedHeaderReorderActive = _ref.setSelectedHeaderReorderActive,
     setActiveCellCoordinates = _ref.setActiveCellCoordinates,
     setCurrentMatcher = _ref.setCurrentMatcher,
     setSelectionAreas = _ref.setSelectionAreas,
@@ -48,6 +46,10 @@ var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _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
   }) || {};
@@ -105,16 +107,11 @@ var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
         // Remove columns, need to call handleHeaderCellSelection
         return;
       }
+      setSelectedHeaderReorderActive(true);
       var selectionAreaToClone = selectionAreas === null || selectionAreas === void 0 ? void 0 : selectionAreas.filter(function (item) {
         return (item === null || item === void 0 ? void 0 : item.matcher) === currentMatcher;
       });
       var selectionAreaElement = ref.current.querySelector("[data-matcher-id=\"".concat(selectionAreaToClone === null || selectionAreaToClone === void 0 || (_selectionAreaToClone = selectionAreaToClone[0]) === null || _selectionAreaToClone === void 0 ? void 0 : _selectionAreaToClone.matcher, "\"]"));
-      if (selectionAreaElement) {
-        selectionAreaElement.classList.add("".concat(blockClass, "__selection-area--element"));
-      }
-      if (typeof setSelectedHeaderReorderActive === 'function') {
-        setSelectedHeaderReorderActive(true);
-      }
       var clickXPosition = event.clientX;
       var headerButtonCoords = event.target.getBoundingClientRect();
       var headerIndex = event.target.getAttribute('data-column-index');
@@ -192,7 +189,7 @@ var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
         "data-column-index": index,
         tabIndex: -1,
         onMouseDown: selectedHeader ? handleHeaderMouseDown(index) : undefined,
-        onMouseUp: selectedHeader && typeof setSelectedHeaderReorderActive === 'function' ? function () {
+        onMouseUp: selectedHeader ? function () {
           return setSelectedHeaderReorderActive(false);
         } : undefined,
         onClick: !selectedHeader ? handleColumnHeaderClick(index) : undefined,
@@ -257,10 +254,6 @@ DataSpreadsheetHeader.propTypes = {
    * The aria label applied to the Select all button
    */
   selectAllAriaLabel: PropTypes.string.isRequired,
-  /**
-   * Header reordering is active
-   */
-  selectedHeaderReorderActive: PropTypes.bool,
   /**
    * All of the cell selection area items
    */
@@ -278,10 +271,6 @@ DataSpreadsheetHeader.propTypes = {
    * Setter fn for header cell hold active value
    */
   setHeaderCellHoldActive: PropTypes.func,
-  /**
-   * Set header reordering active or not
-   */
-  setSelectedHeaderReorderActive: PropTypes.func,
   /**
    * Setter fn for selectionAreaData state value
    */

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

@@ -40,12 +40,9 @@ var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
       var totalSpreadsheetScrollingWidth = listContainer.scrollWidth;
       var clonedSelectionWidth = clonedSelectionElement.offsetWidth;
       var clonePlacement = Math.max(xPositionRelativeToSpreadsheet - offsetXValue, defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth);
-      var leftPosition = totalSpreadsheetScrollingWidth - clonedSelectionWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth;
       // Moves the position of the cloned selection area to follow mouse, and
       // add the amount horizontally scrolled
-      if (leftPosition < spreadsheetCoords.right - 40) {
-        clonedSelectionElement.style.left = px(leftPosition);
-      }
+      clonedSelectionElement.style.left = px(totalSpreadsheetScrollingWidth - clonedSelectionWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth);
     };
     if (headerCellHoldActive) {
       ref.current.addEventListener('mousemove', handleMouseMove);

package/es/components/DataSpreadsheet/hooks/useSpreadsheetMouseUp.d.ts

@@ -1,8 +1,6 @@
-export function useSpreadsheetMouseUp({ currentMatcher, setSelectionAreas, selectedHeaderReorderActive, setSelectedHeaderReorderActive, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, blockClass, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas, }: {
+export function useSpreadsheetMouseUp({ currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, blockClass, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas, }: {
     currentMatcher: any;
     setSelectionAreas: any;
-    selectedHeaderReorderActive: any;
-    setSelectedHeaderReorderActive: any;
     setClickAndHoldActive: any;
     setValidStartingPoint: any;
     validStartingPoint: any;

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

@@ -14,8 +14,6 @@ import { deepCloneObject } from '../../../global/js/utils/deepCloneObject.js';
 var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
   var currentMatcher = _ref.currentMatcher,
     setSelectionAreas = _ref.setSelectionAreas,
-    selectedHeaderReorderActive = _ref.selectedHeaderReorderActive,
-    setSelectedHeaderReorderActive = _ref.setSelectedHeaderReorderActive,
     setClickAndHoldActive = _ref.setClickAndHoldActive,
     setValidStartingPoint = _ref.setValidStartingPoint,
     validStartingPoint = _ref.validStartingPoint,
@@ -32,22 +30,15 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
     selectionAreas = _ref.selectionAreas;
   useEffect(function () {
     var handleMouseUp = function handleMouseUp(event) {
-      var _selectionAreas$;
-      var isHoldingColumn = false;
-      if (selectionAreas !== null && selectionAreas !== void 0 && (_selectionAreas$ = selectionAreas[0]) !== null && _selectionAreas$ !== void 0 && _selectionAreas$.header && selectionAreas[0].header.type === 'column') {
-        isHoldingColumn = true;
-      }
       // Remove the cloned selection area on mouse up
-      if (!validStartingPoint && isHoldingColumn) {
+      if (!validStartingPoint) {
         setHeaderCellHoldActive(false);
-        var selectionAreaElement = ref.current.querySelector(".".concat(blockClass, "__selection-area--element"));
         var selectionAreaCloneElement = ref.current.querySelector(".".concat(blockClass, "__selection-area--element-cloned"));
         if (!selectionAreaCloneElement) {
           return;
         }
         // Mouse up while a cloned selection area exists/a column is being reordered
         if (selectionAreaCloneElement) {
-          var _selectionAreaElement;
           var closestCell = event.target.closest(".".concat(blockClass, "--interactive-cell-element"));
           var newColumnIndex = parseInt === null || parseInt === void 0 ? void 0 : parseInt(closestCell === null || closestCell === void 0 ? void 0 : closestCell.getAttribute('data-column-index'));
           var originalColumnIndex = parseInt === null || parseInt === void 0 ? void 0 : parseInt(selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 ? void 0 : selectionAreaCloneElement.getAttribute('data-column-index-original'));
@@ -90,7 +81,6 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
               selectionAreaClone[indexOfItemToUpdate].point1.column = Math.min.apply(Math, _toConsumableArray(newIndexArray));
               selectionAreaClone[indexOfItemToUpdate].point2.column = Math.max.apply(Math, _toConsumableArray(newIndexArray));
             }
-            selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
             return selectionAreaClone;
           });
           // Only reorder columns if the new index is _not_ part of the
@@ -135,13 +125,11 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
           var indicatorLineElement = ref.current.querySelector(".".concat(blockClass, "__reorder-indicator-line"));
           indicatorLineElement === null || indicatorLineElement === void 0 || indicatorLineElement.remove();
           selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 || selectionAreaCloneElement.remove();
-          selectionAreaElement === null || selectionAreaElement === void 0 || (_selectionAreaElement = selectionAreaElement.classList) === null || _selectionAreaElement === void 0 || _selectionAreaElement.remove("".concat(blockClass, "__selection-area--element"));
-          setSelectedHeaderReorderActive(false);
         }
       }
       // Mouse up was on a spreadsheet body cell which is a valid
       // start/end point for creating a selection area
-      if (validStartingPoint || event.type === 'mouseup') {
+      if (validStartingPoint) {
         setClickAndHoldActive(false);
         setValidStartingPoint(false);
         var cellButton = event.target.closest(".".concat(blockClass, "__body--td"));
@@ -170,7 +158,7 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
     return function () {
       document.removeEventListener('mouseup', handleMouseUp);
     };
-  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, selectedHeaderReorderActive, setSelectedHeaderReorderActive, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas]);
+  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas]);
 };
 
 export { useSpreadsheetMouseUp };

package/es/components/DataSpreadsheet/types/index.d.ts

@@ -13,7 +13,7 @@ export interface PrevState {
     cellEditorValue?: string;
     activeCellCoordinates?: ActiveCellCoordinates;
     isEditing?: boolean;
-    selectionAreaData?: any[];
+    selectionAreaData?: object[];
     clickAndHoldActive?: boolean;
     rowHeight?: number;
     cellSize?: Size;

package/es/components/DataSpreadsheet/utils/moveColumnIndicatorLine.js

@@ -22,43 +22,11 @@ var moveColumnIndicatorLine = function moveColumnIndicatorLine(_ref) {
   var indicatorLineElement = ref.current.querySelector(".".concat(blockClass, "__reorder-indicator-line"));
   var matcherId = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-matcher-id');
   var selectionAreaOrigin = ref.current.querySelector("[data-matcher-id=\"".concat(matcherId, "\"]"));
-  var listContainer = ref.current.querySelector(".".concat(blockClass, "__list--container"));
-  var scrollSpeed = 10; // Scrolling speed
-  var leftEdgeThreshold = 120; // Distance from the left edge to start scrolling
-  var rightEdgeThreshold = 100; // Distance from the right edge to start scrolling
-
-  var _event = event,
-    clientX = _event.clientX;
-  var _listContainer$getBou = listContainer.getBoundingClientRect(),
-    left = _listContainer$getBou.left,
-    right = _listContainer$getBou.right;
-
-  // Is near left side of viewport
-  if (clientX < leftEdgeThreshold) {
-    window.scrollBy(-scrollSpeed, 0);
-  }
-
-  // Is near right side of viewport
-  if (clientX > window.innerWidth - rightEdgeThreshold) {
-    window.scrollBy(scrollSpeed, 0);
-  }
-
-  // Is near left edge of table
-  if (clientX > left && clientX < left + leftEdgeThreshold) {
-    listContainer.scrollBy(-scrollSpeed, 0);
-  }
-
-  // Is near right edge of table
-  if (clientX < right && clientX > right - rightEdgeThreshold) {
-    listContainer.scrollBy(scrollSpeed, 0);
-  }
   if (Number(newColumnIndex) > Number(originalColumnIndex)) {
-    var leftPosition = closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2 + leftScrollAmount;
-    indicatorLineElement.style.left = px(leftPosition);
+    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2 + leftScrollAmount);
   }
   if (Number(newColumnIndex) < Number(originalColumnIndex)) {
-    var _leftPosition = closestCellCoords.left - spreadsheetCoords.left + leftScrollAmount;
-    indicatorLineElement.style.left = px(_leftPosition);
+    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left + leftScrollAmount);
   }
   if (Number(newColumnIndex) === Number(originalColumnIndex)) {
     indicatorLineElement.style.left = selectionAreaOrigin.style.left;

package/es/components/Datagrid/types/index.d.ts

@@ -5,10 +5,10 @@ import { RadioButtonProps } from '@carbon/react/lib/components/RadioButton/Radio
 import { RadioButtonGroupProps } from '@carbon/react/lib/components/RadioButtonGroup/RadioButtonGroup';
 import { CheckboxProps } from '@carbon/react/lib/components/Checkbox';
 import { NumberInputProps } from '@carbon/react/lib/components/NumberInput/NumberInput';
-import React, { CSSProperties, ComponentType, FunctionComponent, JSXElementConstructor, MutableRefObject, ReactNode, TouchEventHandler } from 'react';
-import { Cell, Column, ColumnInstance, FilterValue, Filters, HeaderGroup, Meta, Row, TableCommonProps, TableDispatch, TableInstance, TableToggleAllRowsSelectedProps, UseExpandedRowProps, UseFiltersInstanceProps, UsePaginationInstanceProps, UseResizeColumnsColumnProps, UseResizeColumnsState, UseRowSelectInstanceProps, UseRowSelectRowProps, UseRowSelectState, UseSortByColumnProps, UseSortByOptions, UseTableHooks } from 'react-table';
+import { CSSProperties, JSXElementConstructor, MutableRefObject, ReactNode, TouchEventHandler } from 'react';
+import { Cell, Column, ColumnInstance, FilterValue, Filters, HeaderGroup, Meta, Row, TableCommonProps, TableDispatch, TableInstance, TableToggleAllRowsSelectedProps, UseExpandedRowProps, UseFiltersInstanceProps, UsePaginationInstanceProps, UseResizeColumnsColumnProps, UseResizeColumnsState, UseRowSelectInstanceProps, UseRowSelectRowProps, UseRowSelectState, UseSortByColumnProps, UseTableHooks } from 'react-table';
 import { CarbonIconType } from '@carbon/react/icons';
-import { IconButton, type ButtonProps } from '@carbon/react';
+import { type ButtonProps } from '@carbon/react';
 import { TableBatchActionsProps } from '@carbon/react/lib/components/DataTable/TableBatchActions';
 export type Size = 'xs' | 'sm' | 'md' | 'lg';
 export interface ResizerProps {
@@ -85,10 +85,9 @@ export interface DataGridToggleAllRowsProps extends TableToggleAllRowsSelectedPr
 }
 export interface DatagridTableHooks<T extends object = any> extends UseTableHooks<T> {
 }
-export interface DatagridColumn<T extends object = any> extends ColumnInstance<T>, UseSortByOptions<T> {
+export interface DatagridColumn<T extends object = any> extends ColumnInstance<T> {
     sticky?: 'left' | 'right';
     className?: string;
-    rightAlignedColumn?: boolean;
     disableSortBy?: boolean;
     centerAlignedColumn?: boolean;
 }
@@ -101,7 +100,6 @@ export interface DatagridRow<T extends object = any> extends Omit<Row<T>, 'cells
     RowExpansionRenderer?: (state?: DataGridState) => void;
     cells: Array<DataGridCell>;
     isSkeleton?: boolean;
-    hasExpanded?: boolean;
 }
 export interface DataGridHeader<T extends object = any> extends ColumnInstance, UseResizeColumnsColumnProps<T>, UseSortByColumnProps<T> {
     className(className: any, arg1: {
@@ -122,16 +120,6 @@ interface DataGridTableState extends UseResizeColumnsState<any>, UseRowSelectSta
 }
 export interface DataGridTableInstance<T extends object = any> extends TableInstance<T> {
 }
-export interface RowAction {
-    id?: string;
-    itemText?: string;
-    icon?: ComponentType | FunctionComponent;
-    align?: React.ComponentProps<typeof IconButton>['align'];
-    shouldHideMenuItem?: (...args: any[]) => void;
-    shouldDisableMenuItem?: (...args: any[]) => void;
-    disabled?: boolean;
-    onClick?: (...args: any[]) => void;
-}
 export interface DataGridState<T extends object = any> extends TableCommonProps, UsePaginationInstanceProps<T>, Omit<TableInstance<T>, 'state' | 'headers' | 'rows' | 'columns'>, Omit<UseFiltersInstanceProps<T>, 'rows'>, UseRowSelectInstanceProps<T>, Pick<UseRowSelectInstanceProps<T>, 'toggleAllRowsSelected'> {
     withVirtualScroll?: boolean;
     DatagridPagination?: JSXElementConstructor<any>;
@@ -154,7 +142,6 @@ export interface DataGridState<T extends object = any> extends TableCommonProps,
     batchActions?: boolean;
     row: DatagridRow;
     rows: Array<DatagridRow<any>>;
-    rowActions?: RowAction[];
     columns: Array<DatagridColumn>;
     key?: any;
     rowSize?: Size;
@@ -230,5 +217,4 @@ export interface ResizeHeaderProps {
     isFetching?: boolean;
 }
 export type VisibleColumns<T extends object = {}> = (allColumns: Array<ColumnInstance<T>>, meta: Meta<T>) => Array<Column<T>>;
-export type NodeFuncType = (props: any) => ReactNode;
 export {};

package/es/components/Datagrid/useActionsColumn.d.ts

@@ -1,9 +1,2 @@
-/**
- * Copyright IBM Corp. 2021, 2023
- *
- * 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 { Hooks } from 'react-table';
-declare const useActionsColumn: (hooks: Hooks) => void;
 export default useActionsColumn;
+declare function useActionsColumn(hooks: any): void;

package/es/components/Datagrid/useActionsColumn.js

@@ -17,10 +17,9 @@ var _excluded = ["align", "id", "itemText", "onClick", "icon", "shouldHideMenuIt
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useActionsColumn = function useActionsColumn(hooks) {
   var useAttachActionsOnInstance = function useAttachActionsOnInstance(instance) {
-    var _ref = instance,
-      rowActions = _ref.rowActions,
-      isFetching = _ref.isFetching,
-      selectedRowIds = _ref.state.selectedRowIds;
+    var rowActions = instance.rowActions,
+      isFetching = instance.isFetching,
+      selectedRowIds = instance.state.selectedRowIds;
     var getDisabledState = function getDisabledState(rowIndex) {
       var selectedRowIndexes = Object.keys(selectedRowIds).map(function (n) {
         return Number(n);
@@ -80,10 +79,10 @@ var useActionsColumn = function useActionsColumn(hooks) {
                     return;
                   }
                   e.stopPropagation();
-                  _onClick === null || _onClick === void 0 || _onClick(id, row, e);
+                  _onClick(id, row, e);
                 },
                 disabled: isDisabledByRow
-              }), Icon && /*#__PURE__*/React__default.createElement(Icon, null)));
+              }), /*#__PURE__*/React__default.createElement(Icon, null)));
             })), !isFetching && (rowActions.length > 2 || isColumnSticky) && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(OverflowMenu, {
               align: "left",
               size: "sm",
@@ -109,7 +108,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
                 disabled: isDisabledByRow,
                 onClick: function onClick(e) {
                   e.stopPropagation();
-                  _onClick2 === null || _onClick2 === void 0 || _onClick2(id, row, e);
+                  _onClick2(id, row, e);
                 },
                 key: id
               }));

package/es/components/Datagrid/useColumnRightAlign.d.ts

@@ -1,9 +1,2 @@
-/**
- * Copyright IBM Corp. 2020, 2023
- *
- * 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 { Hooks } from 'react-table';
-declare const useColumnRightAlign: (hooks: Hooks) => void;
 export default useColumnRightAlign;
+declare function useColumnRightAlign(hooks: any): void;

package/es/components/Datagrid/useColumnRightAlign.js

@@ -13,17 +13,16 @@ import { pkg } from '../../settings.js';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useColumnRightAlign = function useColumnRightAlign(hooks) {
   var RightAlignRenderer = function RightAlignRenderer(tableProps, column) {
-    var _tableProps$column, _column$Cell;
     return /*#__PURE__*/React__default.createElement("div", {
       className: cx("".concat(blockClass, "__right-align-cell-renderer"), {
-        sortDisabled: !tableProps.isTableSortable || (tableProps === null || tableProps === void 0 || (_tableProps$column = tableProps.column) === null || _tableProps$column === void 0 ? void 0 : _tableProps$column.disableSortBy) === true
+        sortDisabled: !tableProps.isTableSortable || tableProps.column.disableSortBy === true
       })
-    }, column === null || column === void 0 || (_column$Cell = column.Cell) === null || _column$Cell === void 0 ? void 0 : _column$Cell.call(column, tableProps));
+    }, column.Cell(tableProps));
   };
   var RightAlignHeader = function RightAlignHeader(headerProp, column) {
     return /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(blockClass, "__right-align-header")
-    }, typeof column.Header === 'function' ? (column === null || column === void 0 ? void 0 : column.Header.bind(column))(headerProp) : column.Header);
+    }, typeof column.Header === 'function' ? column.Header(headerProp) : column.Header);
   };
   var rightAlignedColumns = function rightAlignedColumns(columns) {
     var columnsWithDefaultCells = columns.map(function (column) {

package/es/components/Datagrid/useInlineEdit.d.ts

@@ -1,9 +1,2 @@
-/**
- * Copyright IBM Corp. 2022, 2024
- *
- * 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 { Hooks } from 'react-table';
-declare const useInlineEdit: (hooks: Hooks) => void;
 export default useInlineEdit;
+declare function useInlineEdit(hooks: any): void;

package/es/components/Datagrid/useInlineEdit.js

@@ -25,7 +25,7 @@ var useInlineEdit = function useInlineEdit(hooks) {
         tabIndex: -1,
         value: cell.value,
         cell: cell,
-        disabledCell: isDisabled,
+        isDisabled: isDisabled,
         instance: instance,
         type: type
       });

package/es/components/Datagrid/useNestedRows.js

@@ -15,30 +15,12 @@ var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   useNestedRowExpander(hooks);
   var useInstance = function useInstance(instance) {
-    useEffect(function () {
-      var _ref = instance,
-        rows = _ref.rows;
-      var defaultExpandedRows = rows.filter(function (row) {
-        var _row$original;
-        return row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.defaultExpanded;
-      });
-      if (defaultExpandedRows !== null && defaultExpandedRows !== void 0 && defaultExpandedRows.length) {
-        defaultExpandedRows.map(function (defaultExpandedRow) {
-          if (!(defaultExpandedRow !== null && defaultExpandedRow !== void 0 && defaultExpandedRow.isExpanded) && !(defaultExpandedRow !== null && defaultExpandedRow !== void 0 && defaultExpandedRow.hasExpanded)) {
-            var _defaultExpandedRow$t;
-            defaultExpandedRow === null || defaultExpandedRow === void 0 || (_defaultExpandedRow$t = defaultExpandedRow.toggleRowExpanded) === null || _defaultExpandedRow$t === void 0 || _defaultExpandedRow$t.call(defaultExpandedRow);
-            defaultExpandedRow.hasExpanded = true;
-            return;
-          }
-        });
-      }
-    }, [instance, instance.rows]);
     // This useEffect will expand rows if they exist in the initialState obj
     useEffect(function () {
       var rows = instance.rows,
         initialState = instance.initialState;
-      var _ref2 = initialState,
-        expandedRowIds = _ref2.expandedRowIds;
+      var _ref = initialState,
+        expandedRowIds = _ref.expandedRowIds;
       if (expandedRowIds) {
         Object.keys(expandedRowIds).forEach(function (key) {
           var row = rows.filter(function (r) {
@@ -52,14 +34,14 @@ var useNestedRows = function useNestedRows(hooks) {
       }
     }, [instance]);
     var marginLeft = 24;
-    var getRowProps = function getRowProps(props, _ref3) {
-      var row = _ref3.row;
+    var getRowProps = function getRowProps(props, _ref2) {
+      var row = _ref2.row;
       return [props, {
         className: cx(_defineProperty(_defineProperty({}, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded))
       }];
     };
-    var getRowStyles = function getRowStyles(props, _ref4) {
-      var row = _ref4.row;
+    var getRowStyles = function getRowStyles(props, _ref3) {
+      var row = _ref3.row;
       return [props, {
         style: {
           paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
@@ -69,9 +51,9 @@ var useNestedRows = function useNestedRows(hooks) {
     var getIndentation = function getIndentation(depth) {
       return 32 * depth + 16;
     }; // row indentation padding
-    var getCellProps = function getCellProps(props, _ref5) {
-      var cell = _ref5.cell,
-        instance = _ref5.instance;
+    var getCellProps = function getCellProps(props, _ref4) {
+      var cell = _ref4.cell,
+        instance = _ref4.instance;
       // we add a dynamic -ve margin right only if the cell is resized below minimum width i.e 50px, else we set the width based on indentation at different levels
       var isFirstCell = instance.columns.findIndex(function (c) {
         return c.id === cell.column.id;