@carbon/ibm-products 2.43.2-canary.3 → 2.43.2-canary.31

package/es/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -31,6 +31,8 @@ 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,
@@ -46,10 +48,6 @@ 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
   }) || {};
@@ -107,11 +105,16 @@ 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');
@@ -189,7 +192,7 @@ var DataSpreadsheetHeader = /*#__PURE__*/forwardRef(function (_ref, ref) {
         "data-column-index": index,
         tabIndex: -1,
         onMouseDown: selectedHeader ? handleHeaderMouseDown(index) : undefined,
-        onMouseUp: selectedHeader ? function () {
+        onMouseUp: selectedHeader && typeof setSelectedHeaderReorderActive === 'function' ? function () {
           return setSelectedHeaderReorderActive(false);
         } : undefined,
         onClick: !selectedHeader ? handleColumnHeaderClick(index) : undefined,
@@ -254,6 +257,10 @@ 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
    */
@@ -271,6 +278,10 @@ 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,9 +40,12 @@ 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
-      clonedSelectionElement.style.left = px(totalSpreadsheetScrollingWidth - clonedSelectionWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth);
+      if (leftPosition < spreadsheetCoords.right - 40) {
+        clonedSelectionElement.style.left = px(leftPosition);
+      }
     };
     if (headerCellHoldActive) {
       ref.current.addEventListener('mousemove', handleMouseMove);

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

@@ -1,6 +1,8 @@
-export function useSpreadsheetMouseUp({ currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, blockClass, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas, }: {
+export function useSpreadsheetMouseUp({ currentMatcher, setSelectionAreas, selectedHeaderReorderActive, setSelectedHeaderReorderActive, 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,6 +14,8 @@ 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,
@@ -30,15 +32,22 @@ 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) {
+      if (!validStartingPoint && isHoldingColumn) {
         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'));
@@ -81,6 +90,7 @@ 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
@@ -125,11 +135,13 @@ 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) {
+      if (validStartingPoint || event.type === 'mouseup') {
         setClickAndHoldActive(false);
         setValidStartingPoint(false);
         var cellButton = event.target.closest(".".concat(blockClass, "__body--td"));
@@ -158,7 +170,7 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
     return function () {
       document.removeEventListener('mouseup', handleMouseUp);
     };
-  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas]);
+  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, selectedHeaderReorderActive, setSelectedHeaderReorderActive, 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?: object[];
+    selectionAreaData?: any[];
     clickAndHoldActive?: boolean;
     rowHeight?: number;
     cellSize?: Size;

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

@@ -22,11 +22,43 @@ 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)) {
-    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2 + leftScrollAmount);
+    var leftPosition = closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2 + leftScrollAmount;
+    indicatorLineElement.style.left = px(leftPosition);
   }
   if (Number(newColumnIndex) < Number(originalColumnIndex)) {
-    indicatorLineElement.style.left = px(closestCellCoords.left - spreadsheetCoords.left + leftScrollAmount);
+    var _leftPosition = closestCellCoords.left - spreadsheetCoords.left + leftScrollAmount;
+    indicatorLineElement.style.left = px(_leftPosition);
   }
   if (Number(newColumnIndex) === Number(originalColumnIndex)) {
     indicatorLineElement.style.left = selectionAreaOrigin.style.left;

package/es/components/Datagrid/Datagrid/Datagrid.js

@@ -46,7 +46,8 @@ var Datagrid = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
   };
   return /*#__PURE__*/React__default.createElement(FilterProvider, {
     filters: state === null || state === void 0 ? void 0 : state.filters,
-    filterProps: filterProps
+    filterProps: filterProps,
+    tableId: tableId
   }, /*#__PURE__*/React__default.createElement(InlineEditProvider, null, /*#__PURE__*/React__default.createElement("div", _extends({}, rest, {
     id: tableId,
     ref: ref,

package/es/components/Datagrid/Datagrid/DatagridContent.js

@@ -158,7 +158,7 @@ var DatagridContent = function DatagridContent(_ref) {
       className: "".concat(blockClass, "__filter-summary"),
       filters: filterTags,
       clearFilters: function clearFilters() {
-        return EventEmitter.dispatch(CLEAR_FILTERS);
+        return EventEmitter.dispatch(CLEAR_FILTERS, tableId);
       },
       renderLabel: filterProps === null || filterProps === void 0 ? void 0 : filterProps.renderLabel,
       overflowType: "tag"

package/es/components/Datagrid/Datagrid/DatagridHeaderRow.js

@@ -90,7 +90,8 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
   var resizerAriaLabel = datagridState.resizerAriaLabel,
     isTableSortable = datagridState.isTableSortable,
     rows = datagridState.rows,
-    isFetching = datagridState.isFetching;
+    isFetching = datagridState.isFetching,
+    headers = datagridState.headers;
   useInitialColumnSort(datagridState);
   // Used to measure the height of the table and uses that value
   // to display a vertical line to indicate the column you are resizing
@@ -152,6 +153,9 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
   });
   var key = headerGroupProps.key,
     rowProps = _objectWithoutProperties(headerGroupProps, _excluded2);
+  var withActionsColumn = headers ? !!headers.filter(function (header) {
+    return header.isAction;
+  }).length : false;
   return /*#__PURE__*/React__default.createElement(TableRow, _extends({
     key: key
   }, rowProps, {
@@ -184,6 +188,12 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
     var _header$getHeaderProp = header.getHeaderProps(),
       headerProps = _extends({}, (_objectDestructuringEmpty(_header$getHeaderProp), _header$getHeaderProp));
     var resizerProps = header === null || header === void 0 || (_header$getResizerPro = header.getResizerProps) === null || _header$getResizerPro === void 0 ? void 0 : _header$getResizerPro.call(header);
+    var headerStyle = headerProps === null || headerProps === void 0 ? void 0 : headerProps.style;
+    var lastVisibleIndex = withActionsColumn ? 2 : 1;
+    var lastVisibleFlexStyle = index === visibleColumns.length - lastVisibleIndex ? '1 1 0' : '0 0 auto';
+    if (headerStyle) {
+      headerStyle.flex = lastVisibleFlexStyle;
+    }
     return /*#__PURE__*/React__default.createElement(TableHeader, _extends({}, headerProps, {
       className: cx(header === null || header === void 0 ? void 0 : header.className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(blockClass, "__resizableColumn"), resizerProps), "".concat(blockClass, "__isResizing"), header === null || header === void 0 ? void 0 : header.isResizing), "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable && header.id !== 'spacer'), "".concat(blockClass, "__isSorted"), header === null || header === void 0 ? void 0 : header.isSorted), "".concat(blockClass, "__header-actions-column"), header === null || header === void 0 ? void 0 : header.isAction), "".concat(blockClass, "__with-slug"), header.slug && /*#__PURE__*/React__default.isValidElement(header === null || header === void 0 ? void 0 : header.slug)), headerProps.className),
       key: header.id,

package/es/components/Datagrid/Datagrid/DatagridRow.js

@@ -16,7 +16,7 @@ import { DatagridSlug } from './addons/Slug/DatagridSlug.js';
 
 var _SkeletonText;
 var _excluded = ["className"],
-  _excluded2 = ["children"];
+  _excluded2 = ["style", "children"];
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var rowHeights = {
   xs: 24,
@@ -39,7 +39,8 @@ var DatagridRow = function DatagridRow(datagridState) {
     withExpandedRows = datagridState.withExpandedRows,
     withMouseHover = datagridState.withMouseHover,
     setMouseOverRowIndex = datagridState.setMouseOverRowIndex,
-    headers = datagridState.headers;
+    headers = datagridState.headers,
+    visibleColumns = datagridState.visibleColumns;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -115,6 +116,9 @@ var DatagridRow = function DatagridRow(datagridState) {
     return /*#__PURE__*/isValidElement(r === null || r === void 0 || (_r$original = r.original) === null || _r$original === void 0 ? void 0 : _r$original.slug);
   });
   var rowClassNames = cx("".concat(blockClass, "__carbon-row"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), "".concat(carbon.prefix, "--data-table--selected"), row.isSelected), "".concat(blockClass, "__slug--row"), /*#__PURE__*/isValidElement(row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.slug)));
+  var withActionsColumn = headers ? !!headers.filter(function (header) {
+    return header.isAction;
+  }).length : false;
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
     key: key
   }, /*#__PURE__*/React__default.createElement(TableRow, _extends({}, rowProps, {
@@ -136,6 +140,7 @@ var DatagridRow = function DatagridRow(datagridState) {
     var cellProps = cell.getCellProps();
     // eslint-disable-next-line no-unused-vars
     var _ref2 = cellProps,
+      style = _ref2.style,
       children = _ref2.children,
       restProps = _objectWithoutProperties(_ref2, _excluded2);
     var columnClassname = cell === null || cell === void 0 || (_cell$column = cell.column) === null || _cell$column === void 0 ? void 0 : _cell$column.className;
@@ -150,9 +155,15 @@ var DatagridRow = function DatagridRow(datagridState) {
     var associatedHeader = headers === null || headers === void 0 ? void 0 : headers.filter(function (h) {
       return h.id === cell.column.id;
     });
+    var lastVisibleIndex = withActionsColumn ? 2 : 1;
+    var lastVisibleFlexStyle = index === visibleColumns.length - lastVisibleIndex ? '1 1 0' : '0 0 auto';
+    if (style) {
+      style.flex = lastVisibleFlexStyle;
+    }
     return /*#__PURE__*/React__default.createElement(TableCell, _extends({
       className: cx("".concat(blockClass, "__cell"), _defineProperty(_defineProperty(_defineProperty({}, "".concat(blockClass, "__expandable-row-cell"), row.canExpand && index === 0), "".concat(blockClass, "__expandable-row-cell--is-expanded"), row.isExpanded && index === 0), "".concat(blockClass, "__slug--cell"), associatedHeader && associatedHeader.length && /*#__PURE__*/isValidElement((_associatedHeader$ = associatedHeader[0]) === null || _associatedHeader$ === void 0 ? void 0 : _associatedHeader$.slug)), columnClassname)
     }, restProps, {
+      style: style,
       key: cell.column.id,
       title: title
     }), content);

package/es/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js

@@ -209,7 +209,12 @@ var FilterFlyout = function FilterFlyout(_ref) {
     closeFlyout();
     cancel();
   });
-  useSubscribeToEventEmitter(CLEAR_FILTERS, reset);
+
+  // tableId is passed in from the event emitter from the FilterSummary component
+  // in  DatagridContent
+  useSubscribeToEventEmitter(CLEAR_FILTERS, function (tableId) {
+    reset(tableId);
+  });
   useEffect(function reflectLastAppliedFiltersWhenReactTableUpdates() {
     lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
   }, [reactTableFiltersState, lastAppliedFilters]);

package/es/components/Datagrid/Datagrid/addons/Filtering/FilterPanel.js

@@ -183,7 +183,12 @@ var FilterPanel = function FilterPanel(_ref) {
     var _filterPanelRef$curre;
     (_filterPanelRef$curre = filterPanelRef.current) === null || _filterPanelRef$curre === void 0 || _filterPanelRef$curre.style.setProperty('--filter-panel-min-height', rem(filterPanelMinHeight));
   }, [filterPanelMinHeight]);
-  useSubscribeToEventEmitter(CLEAR_FILTERS, reset);
+
+  // tableId is passed in from the event emitter from the FilterSummary component
+  // in  DatagridContent
+  useSubscribeToEventEmitter(CLEAR_FILTERS, function (tableId) {
+    reset(tableId);
+  });
   var getScrollableContainerHeight = function getScrollableContainerHeight() {
     var _filterHeadingRef$cur, _filterSearchRef$curr, _actionSetRef$current;
     var filterHeadingHeight = (_filterHeadingRef$cur = filterHeadingRef.current) === null || _filterHeadingRef$cur === void 0 ? void 0 : _filterHeadingRef$cur.getBoundingClientRect().height;

package/es/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.d.ts

@@ -3,16 +3,18 @@ export function clearSingleFilter({ key, value }: {
     key: any;
     value: any;
 }, setAllFilters: any, state: any): void;
-export function FilterProvider({ children, filters, filterProps }: {
+export function FilterProvider({ children, filters, filterProps, tableId }: {
     children: any;
     filters: any;
     filterProps: any;
+    tableId: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace FilterProvider {
     namespace propTypes {
         let children: PropTypes.Validator<NonNullable<NonNullable<PropTypes.ReactNodeLike>>>;
         let filterProps: PropTypes.Requireable<object>;
         let filters: PropTypes.Validator<(object | null | undefined)[]>;
+        let tableId: PropTypes.Requireable<string>;
     }
 }
 import React from 'react';

package/es/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.js

@@ -156,7 +156,8 @@ var filteringReducer = function filteringReducer(state, action) {
 var FilterProvider = function FilterProvider(_ref4) {
   var children = _ref4.children,
     filters = _ref4.filters,
-    filterProps = _ref4.filterProps;
+    filterProps = _ref4.filterProps,
+    tableId = _ref4.tableId;
   var _ref5 = filterProps || {},
     renderDateLabel = _ref5.renderDateLabel;
   var filterTags = prepareFiltersForTags(filters, renderDateLabel);
@@ -177,7 +178,8 @@ var FilterProvider = function FilterProvider(_ref4) {
     panelOpen: panelOpen,
     setPanelOpen: setPanelOpen,
     state: state,
-    dispatch: dispatch
+    dispatch: dispatch,
+    tableId: tableId
   };
   return /*#__PURE__*/React__default.createElement(FilterContext.Provider, {
     value: value
@@ -186,7 +188,8 @@ var FilterProvider = function FilterProvider(_ref4) {
 FilterProvider.propTypes = {
   children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
   filterProps: PropTypes.object,
-  filters: PropTypes.arrayOf(PropTypes.object).isRequired
+  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  tableId: PropTypes.string
 };
 
 export { FilterContext, FilterProvider, clearSingleFilter };

package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.d.ts

@@ -15,7 +15,7 @@ declare function useFilters({ updateMethod, filters, setAllFilters, variation, r
     prevFiltersObjectArrayRef: React.MutableRefObject<string>;
     prevFiltersRef: React.MutableRefObject<string>;
     revertToPreviousFilters: () => void;
-    reset: () => void;
+    reset: (tableId: any) => void;
     renderFilter: ({ type, column, props: components }: {
         type: any;
         column: any;

package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js

@@ -28,7 +28,8 @@ var useFilters = function useFilters(_ref) {
     isFetching = _ref.isFetching;
   var _useContext = useContext(FilterContext),
     state = _useContext.state,
-    localDispatch = _useContext.dispatch;
+    localDispatch = _useContext.dispatch,
+    contextTableId = _useContext.tableId;
   var savedFilters = state.savedFilters;
   /** State */
   var _useState = useState(getInitialStateFromFilters(filters, variation, reactTableFiltersState)),
@@ -69,24 +70,28 @@ var useFilters = function useFilters(_ref) {
     holdingLastAppliedFiltersRef.current = JSON.parse(prevFiltersObjectArrayRef.current);
     holdingPrevFiltersObjectArrayRef.current = JSON.parse(lastAppliedFilters.current);
   }, [setAllFilters]);
-  var reset = useCallback(function () {
-    // When we reset we want the "initialFilters" to be an empty array
-    var resetFiltersArray = [];
+  var reset = useCallback(function (tableId) {
+    // only reset filters if tableid of the datagrid that triggered "clear filters"
+    // matches the table id stored in its context instance
+    if (tableId === contextTableId) {
+      // When we reset we want the "initialFilters" to be an empty array
+      var resetFiltersArray = [];
 
-    // Get the initial values for the filters
-    var initialFiltersState = getInitialStateFromFilters(filters, variation, resetFiltersArray);
-    var initialFiltersObjectArray = [];
+      // Get the initial values for the filters
+      var initialFiltersState = getInitialStateFromFilters(filters, variation, resetFiltersArray);
+      var initialFiltersObjectArray = [];
 
-    // Set the state to the initial values
-    setFiltersState(initialFiltersState);
-    setFiltersObjectArray(initialFiltersObjectArray);
-    setAllFilters([]);
+      // Set the state to the initial values
+      setFiltersState(initialFiltersState);
+      setFiltersObjectArray(initialFiltersObjectArray);
+      setAllFilters([]);
 
-    // Update their respective refs so everything is in sync
-    prevFiltersRef.current = JSON.stringify(initialFiltersState);
-    prevFiltersObjectArrayRef.current = JSON.stringify(initialFiltersObjectArray);
-    lastAppliedFilters.current = JSON.stringify([]);
-  }, [filters, setAllFilters, variation]);
+      // Update their respective refs so everything is in sync
+      prevFiltersRef.current = JSON.stringify(initialFiltersState);
+      prevFiltersObjectArrayRef.current = JSON.stringify(initialFiltersObjectArray);
+      lastAppliedFilters.current = JSON.stringify([]);
+    }
+  }, [filters, setAllFilters, variation, contextTableId]);
   var applyFilters = function applyFilters(_ref2) {
     var column = _ref2.column,
       value = _ref2.value,

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -19,7 +19,7 @@ import { InlineEditButton } from '../InlineEditButton/InlineEditButton.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var InlineEditCell = function InlineEditCell(_ref) {
-  var _config$validator, _value$text;
+  var _config$validator;
   var cell = _ref.cell,
     config = _ref.config,
     _ref$disabledCell = _ref.disabledCell,
@@ -447,6 +447,24 @@ var InlineEditCell = function InlineEditCell(_ref) {
       ref: textInputRef
     }));
   };
+  var getLabel = function getLabel() {
+    var _value$text, _checkStaticCell;
+    var checkStaticCell = function checkStaticCell(val) {
+      if (_typeof(val) === 'object' && val !== null && val !== void 0 && val.isStaticCell) {
+        return val === null || val === void 0 ? void 0 : val.value;
+      }
+    };
+    switch (type) {
+      case 'selection':
+        checkStaticCell(value);
+        return (_value$text = value === null || value === void 0 ? void 0 : value.text) !== null && _value$text !== void 0 ? _value$text : value;
+      case 'date':
+        checkStaticCell(value);
+        return buildDate(value);
+      default:
+        return (_checkStaticCell = checkStaticCell(value)) !== null && _checkStaticCell !== void 0 ? _checkStaticCell : value;
+    }
+  };
   return (
     /*#__PURE__*/
     // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
@@ -455,7 +473,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       "data-cell-id": cellId,
       "data-column-index": columnIndex,
       "data-row-index": cell.row.index,
-      "data-disabled": disabledCell,
+      "data-disabled": disabledCell || nonEditCell,
       "data-inline-type": type,
       onClick: !nonEditCell ? handleInlineCellClick : addActiveState,
       onKeyDown: !nonEditCell ? handleKeyDown : null,
@@ -463,7 +481,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
     }, !nonEditCell && !disabledCell && renderRegularCell(), (!inEditMode || disabledCell) && /*#__PURE__*/React__default.createElement(InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
-      label: type === 'selection' ? (_value$text = value === null || value === void 0 ? void 0 : value.text) !== null && _value$text !== void 0 ? _value$text : value : type === 'date' ? buildDate(value) : value,
+      label: getLabel(),
       disabledCell: disabledCell,
       labelIcon: (value === null || value === void 0 ? void 0 : value.icon) || null,
       placeholder: placeholder,

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 { 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 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 { CarbonIconType } from '@carbon/react/icons';
-import { type ButtonProps } from '@carbon/react';
+import { IconButton, 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,9 +85,10 @@ 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> {
+export interface DatagridColumn<T extends object = any> extends ColumnInstance<T>, UseSortByOptions<T> {
     sticky?: 'left' | 'right';
     className?: string;
+    rightAlignedColumn?: boolean;
     disableSortBy?: boolean;
     centerAlignedColumn?: boolean;
 }
@@ -100,6 +101,7 @@ 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: {
@@ -120,6 +122,16 @@ 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>;
@@ -142,6 +154,7 @@ 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;
@@ -217,4 +230,5 @@ 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,2 +1,9 @@
+/**
+ * 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,9 +17,10 @@ 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 rowActions = instance.rowActions,
-      isFetching = instance.isFetching,
-      selectedRowIds = instance.state.selectedRowIds;
+    var _ref = instance,
+      rowActions = _ref.rowActions,
+      isFetching = _ref.isFetching,
+      selectedRowIds = _ref.state.selectedRowIds;
     var getDisabledState = function getDisabledState(rowIndex) {
       var selectedRowIndexes = Object.keys(selectedRowIds).map(function (n) {
         return Number(n);
@@ -79,10 +80,10 @@ var useActionsColumn = function useActionsColumn(hooks) {
                     return;
                   }
                   e.stopPropagation();
-                  _onClick(id, row, e);
+                  _onClick === null || _onClick === void 0 || _onClick(id, row, e);
                 },
                 disabled: isDisabledByRow
-              }), /*#__PURE__*/React__default.createElement(Icon, null)));
+              }), Icon && /*#__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",
@@ -108,7 +109,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
                 disabled: isDisabledByRow,
                 onClick: function onClick(e) {
                   e.stopPropagation();
-                  _onClick2(id, row, e);
+                  _onClick2 === null || _onClick2 === void 0 || _onClick2(id, row, e);
                 },
                 key: id
               }));