@carbon/ibm-products 2.43.2-canary.1 → 2.43.2-canary.100

package/lib/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/lib/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.js

@@ -70,7 +70,7 @@ var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
           This checks if all the checkboxes are selected = false and removes it from the array
         */
         var valueIndex = filterValues.findIndex(function (val) {
-          return val.id === value;
+          return val.value === value;
         });
         filterValues[valueIndex].selected = false;
         var updatedFilterObject = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, f), {}, {
@@ -164,7 +164,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);
@@ -185,7 +186,8 @@ var FilterProvider = function FilterProvider(_ref4) {
     panelOpen: panelOpen,
     setPanelOpen: setPanelOpen,
     state: state,
-    dispatch: dispatch
+    dispatch: dispatch,
+    tableId: tableId
   };
   return /*#__PURE__*/React__default["default"].createElement(FilterContext.Provider, {
     value: value
@@ -194,7 +196,8 @@ var FilterProvider = function FilterProvider(_ref4) {
 FilterProvider.propTypes = {
   children: index["default"].oneOfType([index["default"].arrayOf(index["default"].node), index["default"].node]).isRequired,
   filterProps: index["default"].object,
-  filters: index["default"].arrayOf(index["default"].object).isRequired
+  filters: index["default"].arrayOf(index["default"].object).isRequired,
+  tableId: index["default"].string
 };
 
 exports.FilterContext = FilterContext;

package/lib/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/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js

@@ -17,6 +17,7 @@ var OverflowCheckboxes = require('../OverflowCheckboxes.js');
 var utils = require('../utils.js');
 var FilterProvider = require('../FilterProvider.js');
 var handleCheckboxChange = require('../handleCheckboxChange.js');
+var uuidv4 = require('../../../../../../global/js/utils/uuidv4.js');
 var usePreviousValue = require('../../../../../../global/js/hooks/usePreviousValue.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -36,7 +37,8 @@ var useFilters = function useFilters(_ref) {
     isFetching = _ref.isFetching;
   var _useContext = React.useContext(FilterProvider.FilterContext),
     state = _useContext.state,
-    localDispatch = _useContext.dispatch;
+    localDispatch = _useContext.dispatch,
+    contextTableId = _useContext.tableId;
   var savedFilters = state.savedFilters;
   /** State */
   var _useState = React.useState(utils.getInitialStateFromFilters(filters, variation, reactTableFiltersState)),
@@ -54,6 +56,7 @@ var useFilters = function useFilters(_ref) {
   var previousState = usePreviousValue.usePreviousValue({
     panelOpen: panelOpen
   });
+  var filteredItemsRef = React.useRef();
 
   // When using batch actions we have to store the filters to then apply them later
   var prevFiltersRef = React.useRef(JSON.stringify(filtersState));
@@ -77,24 +80,28 @@ var useFilters = function useFilters(_ref) {
     holdingLastAppliedFiltersRef.current = JSON.parse(prevFiltersObjectArrayRef.current);
     holdingPrevFiltersObjectArrayRef.current = JSON.parse(lastAppliedFilters.current);
   }, [setAllFilters]);
-  var reset = React.useCallback(function () {
-    // When we reset we want the "initialFilters" to be an empty array
-    var resetFiltersArray = [];
+  var reset = React.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 = utils.getInitialStateFromFilters(filters, variation, resetFiltersArray);
-    var initialFiltersObjectArray = [];
+      // Get the initial values for the filters
+      var initialFiltersState = utils.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,
@@ -310,8 +317,18 @@ var useFilters = function useFilters(_ref) {
             }
             return null;
           }).filter(Boolean);
+          var isEqual = compareFilterItems(filteredItems);
+          if (!isEqual) {
+            filteredItemsRef.current = _rollupPluginBabelHelpers.toConsumableArray(filteredItems);
+          }
+          var getKey = function getKey() {
+            return isEqual ? {
+              key: uuidv4["default"]()
+            } : column;
+          };
           filter = /*#__PURE__*/React__default["default"].createElement(react.MultiSelect, _rollupPluginBabelHelpers["extends"]({}, components.MultiSelect, {
             selectedItems: filteredItems,
+            key: getKey(),
             onChange: function onChange(_ref9) {
               var _components$MultiSele, _components$MultiSele2;
               var selectedItems = _ref9.selectedItems;
@@ -327,6 +344,7 @@ var useFilters = function useFilters(_ref) {
                 }
                 return null;
               }).filter(Boolean);
+              filteredItemsRef.current = _rollupPluginBabelHelpers.toConsumableArray(foundItems);
 
               // Change selected state for those items that have been selected
               allOptions.map(function (a) {
@@ -369,6 +387,25 @@ var useFilters = function useFilters(_ref) {
       key: column
     }, filter);
   };
+  var compareFilterItems = function compareFilterItems(filteredItems) {
+    var _filteredItems$map, _filteredItemsRef$cur, _filteredItemsRef$cur2;
+    var filteredItemsId = (_filteredItems$map = filteredItems.map(function (item) {
+      return item.id;
+    })) !== null && _filteredItems$map !== void 0 ? _filteredItems$map : [];
+    var previousFilteredItemsId = (_filteredItemsRef$cur = filteredItemsRef === null || filteredItemsRef === void 0 || (_filteredItemsRef$cur2 = filteredItemsRef.current) === null || _filteredItemsRef$cur2 === void 0 ? void 0 : _filteredItemsRef$cur2.map(function (item) {
+      return item.id;
+    })) !== null && _filteredItemsRef$cur !== void 0 ? _filteredItemsRef$cur : [];
+    var set1 = new Set(filteredItemsId);
+    var set2 = new Set(previousFilteredItemsId);
+    // Check if the sets have the same size (same number of unique elements)
+    if (set1.size !== set2.size) {
+      return false;
+    }
+    // Check if all elements in set1 are also present in set2 (using spread syntax)
+    return _rollupPluginBabelHelpers.toConsumableArray(set1).every(function (element) {
+      return set2.has(element);
+    });
+  };
 
   /** This useEffect will properly handle the previous filters when the panel closes
    * 1. If the panel closes we need to call the reset fn but also store the

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditButton/InlineEditButton.js

@@ -36,8 +36,7 @@ var InlineEditButton = function InlineEditButton(_ref) {
     tabIndex: isActiveCell ? 0 : -1,
     "data-disabled": disabledCell,
     "aria-disabled": disabledCell,
-    role: "button",
-    title: label
+    role: "button"
   }, LabelIcon && /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(blockClass, "__label-icon")
   }, /*#__PURE__*/React__default["default"].createElement(LabelIcon, null)), label !== '' ? /*#__PURE__*/React__default["default"].createElement("span", {
@@ -57,7 +56,7 @@ InlineEditButton.propTypes = {
   nonEditCell: index["default"].bool,
   placeholder: index["default"].string,
   renderIcon: index["default"].oneOfType([index["default"].func, index["default"].object]),
-  type: index["default"].oneOf(['text', 'number', 'selection', 'date']),
+  type: index["default"].oneOf(['text', 'number', 'selection', 'date', 'checkbox']),
   value: index["default"].oneOfType([index["default"].string, index["default"].node])
 };
 

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

@@ -28,7 +28,7 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var blockClass = "".concat(settings.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,
@@ -75,6 +75,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
   var _ref2 = config || {},
     inputProps = _ref2.inputProps;
   var textInputRef = React.useRef();
+  var checkboxRef = React.useRef();
   var numberInputRef = React.useRef();
   var dropdownRef = React.useRef();
   var datePickerRef = React.useRef();
@@ -211,16 +212,42 @@ var InlineEditCell = function InlineEditCell(_ref) {
   };
   var getNewCellId = function getNewCellId(key) {
     var totalRows = instance.rows.length;
-    var newCellId = key === 'Enter' ? "column-".concat(columnIndex, "-row-").concat(cell.row.index < totalRows - 1 ? cell.row.index + 1 : cell.row.index) : "column-".concat(columnIndex < instance.columns.length - 1 ? columnIndex + 1 : columnIndex, "-row-").concat(cell.row.index);
+    var newCellId = key === 'Enter' ? "column-".concat(columnIndex, "-row-").concat(cell.row.index < totalRows - 1 && type === 'checkbox' ? cell.row.index + 1 : cell.row.index) : "column-".concat(columnIndex < instance.columns.length - 1 ? columnIndex + 1 : columnIndex, "-row-").concat(cell.row.index);
     return newCellId;
   };
   var handleKeyDown = function handleKeyDown(event) {
     var key = event.key;
     switch (key) {
+      case 'ArrowRight':
+      case 'ArrowLeft':
+      case 'ArrowUp':
+      case 'ArrowDown':
+        if (inEditMode && event.target.type === 'checkbox') {
+          var newCellId = getNewCellId(key);
+          saveCellData(cellValue);
+          setInitialValue(cellValue);
+          dispatch({
+            type: 'EXIT_EDIT_MODE',
+            payload: newCellId
+          });
+          setInEditMode(false);
+          sendFocusBackToGrid();
+        }
+        break;
       // Save cell contents to data
       case 'Tab':
       case 'Enter':
         {
+          if (type === 'checkbox') {
+            // Since checkbox doesn't need to click into it to enter `inEditMode` we don't need to check for it
+            var _newCellId = getNewCellId(key);
+            dispatch({
+              type: 'EXIT_EDIT_MODE',
+              payload: _newCellId
+            });
+            setInEditMode(false);
+            sendFocusBackToGrid();
+          }
           if (inEditMode) {
             // Dropdown saves are handled in the Dropdown's/DatePicker's onChange prop
             if (type === 'selection' || type === 'date') {
@@ -234,12 +261,12 @@ var InlineEditCell = function InlineEditCell(_ref) {
             if (isInvalid) {
               return;
             }
-            var newCellId = getNewCellId(key);
+            var _newCellId2 = getNewCellId(key);
             saveCellData(cellValue);
             setInitialValue(cellValue);
             dispatch({
               type: 'EXIT_EDIT_MODE',
-              payload: newCellId
+              payload: _newCellId2
             });
             setInEditMode(false);
             sendFocusBackToGrid();
@@ -434,9 +461,27 @@ var InlineEditCell = function InlineEditCell(_ref) {
       ref: numberInputRef
     }));
   };
+  var renderCheckBoxCell = function renderCheckBoxCell() {
+    return /*#__PURE__*/React__default["default"].createElement(react.Checkbox, _rollupPluginBabelHelpers["extends"]({
+      labelText: cellLabel || 'Checkbox'
+    }, inputProps, {
+      className: cx__default["default"]("".concat(blockClass, "__inline-edit--outer-cell-checkbox"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--outer-cell-checkbox-focus"), activeCellId === cellId)),
+      id: cellId,
+      hideLabel: true,
+      checked: cellValue,
+      onChange: function onChange(event, _ref10) {
+        var checked = _ref10.checked;
+        setCellValue(checked);
+        if (inputProps.onChange) {
+          inputProps.onChange(checked);
+        }
+      },
+      ref: checkboxRef
+    }));
+  };
   var renderTextInput = function renderTextInput() {
-    var _ref10 = config || {},
-      validator = _ref10.validator;
+    var _ref11 = config || {},
+      validator = _ref11.validator;
     var isInvalid = validator === null || validator === void 0 ? void 0 : validator(cellValue);
     return /*#__PURE__*/React__default["default"].createElement(react.TextInput, _rollupPluginBabelHelpers["extends"]({
       labelText: cellLabel,
@@ -456,6 +501,24 @@ var InlineEditCell = function InlineEditCell(_ref) {
       ref: textInputRef
     }));
   };
+  var getLabel = function getLabel() {
+    var _value$text, _checkStaticCell;
+    var checkStaticCell = function checkStaticCell(val) {
+      if (_rollupPluginBabelHelpers["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
@@ -464,15 +527,15 @@ 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,
       className: cx__default["default"]("".concat(blockClass, "__inline-edit--outer-cell-button"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--invalid"), inEditMode && (config === null || config === void 0 || (_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, cellValue))), "".concat(blockClass, "__static--outer-cell"), !disabledCell))
-    }, !nonEditCell && !disabledCell && renderRegularCell(), (!inEditMode || disabledCell) && /*#__PURE__*/React__default["default"].createElement(InlineEditButton.InlineEditButton, {
+    }, !nonEditCell && !disabledCell && type !== 'checkbox' && renderRegularCell(), (!inEditMode || disabledCell) && type !== 'checkbox' && /*#__PURE__*/React__default["default"].createElement(InlineEditButton.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,
@@ -480,7 +543,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       nonEditCell: nonEditCell,
       columnConfig: cell.column,
       type: type
-    }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
+    }), type === 'checkbox' && renderCheckBoxCell(), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
   );
 };
 InlineEditCell.propTypes = {
@@ -498,7 +561,7 @@ InlineEditCell.propTypes = {
   nonEditCell: index["default"].bool,
   placeholder: index["default"].string,
   tabIndex: index["default"].number,
-  type: index["default"].oneOf(['text', 'number', 'selection', 'date']),
+  type: index["default"].oneOf(['text', 'number', 'selection', 'date', 'checkbox']),
   value: index["default"].oneOfType([index["default"].string, index["default"].node, index["default"].object])
 };
 

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/handleGridKeyPress.js

@@ -78,7 +78,7 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
   };
 
   // Stop grid key listener when in edit mode
-  var isEditing = document.activeElement.id === activeCellId && document.activeElement.id === editId || dropdownIsActive() || datePickerIsActive();
+  var isEditing = focusedCell.getAttribute('data-inline-type') !== 'checkbox' && document.activeElement.id === activeCellId && document.activeElement.id === editId || dropdownIsActive() || datePickerIsActive();
   if (isEditing || !gridActive) {
     return;
   }
@@ -91,6 +91,7 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
     event.preventDefault();
   }
   var isDisabledCell = focusedCell.getAttribute('data-disabled') === 'false' ? false : true;
+  var isEditableCell = !event.target.classList.contains("".concat(blockClass, "__inline-edit-button--non-edit"));
   var sharedUpdateParams = {
     oldId: activeCellId,
     instance: instance
@@ -198,7 +199,7 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
       case 'Enter':
         {
           // Disabled cells are not allowed to go into edit mode
-          if (isDisabledCell) {
+          if (isDisabledCell || !isEditableCell) {
             return;
           }
           // Only go into edit mode if there is no editId, meaning that we're not already in edit mode
@@ -211,6 +212,13 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
                 dropdownTrigger === null || dropdownTrigger === void 0 || dropdownTrigger.click();
               }, 1);
             }
+            if (focusedType === 'checkbox') {
+              setTimeout(function () {
+                var checkboxTrigger = focusedCell.querySelector('input');
+                checkboxTrigger === null || checkboxTrigger === void 0 || checkboxTrigger.click();
+                checkboxTrigger === null || checkboxTrigger === void 0 || checkboxTrigger.focus();
+              }, 1);
+            }
             if (focusedType === 'date') {
               setTimeout(function () {
                 var dateInputTrigger = focusedCell.querySelector('input');

package/lib/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, ColumnInstance, FilterValue, Filters, HeaderGroup, 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, TableState, TableToggleAllRowsSelectedProps, UseExpandedRowProps, UseFiltersInstanceProps, UsePaginationInstanceProps, UseResizeColumnsColumnProps, UseResizeColumnsOptions, 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 {
@@ -59,6 +59,18 @@ interface Labels {
     allPageRows?: object;
     allRows?: object;
 }
+interface ColumnLabels {
+    findColumnPlaceholderLabel?: string;
+    resetToDefaultLabel?: string;
+    customizeTearsheetHeadingLabel?: string;
+    primaryButtonTextLabel?: string;
+    secondaryButtonTextLabel?: string;
+    instructionsLabel?: string;
+    iconTooltipLabel?: string;
+    assistiveTextInstructionsLabel?: string;
+    assistiveTextDisabledInstructionsLabel?: string;
+    selectAllLabel?: string;
+}
 interface Section {
     categoryTitle?: string;
     filters?: DataGridFilter[];
@@ -85,9 +97,12 @@ 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>, Partial<UseResizeColumnsColumnProps<T>>, UseResizeColumnsOptions<T> {
     sticky?: 'left' | 'right';
     className?: string;
+    rightAlignedColumn?: boolean;
+    disableSortBy?: boolean;
+    centerAlignedColumn?: boolean;
 }
 export interface DataGridCell<T extends object = any> extends Omit<Cell<T>, 'column'> {
     column: DatagridColumn<any>;
@@ -98,6 +113,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: {
@@ -108,15 +124,31 @@ export interface DataGridHeader<T extends object = any> extends ColumnInstance,
 }
 export interface DataGridHeaderGroup<T extends object = any> extends HeaderGroup<T>, UseResizeColumnsColumnProps<T> {
 }
-export interface TableProps {
-    className?: string;
-    role?: string;
-    style?: CSSStyleDeclaration;
+export interface DataGridTableProps extends TableCommonProps {
 }
 interface DataGridTableState extends UseResizeColumnsState<any>, UseRowSelectState<any> {
     filters: Filters<DataGridFilter>;
 }
-export interface DataGridTableInstance<T extends object = any> extends TableInstance<T> {
+export interface DataGridTableInstance<T extends object = any> extends Omit<TableInstance<T>, 'state'>, Partial<UsePaginationInstanceProps<any>> {
+    shouldDisableSelectRow?: (...args: any[]) => void | boolean;
+    state?: Partial<TableState & UseRowSelectState<any>>;
+    disableSelectAll?: boolean;
+    disableSelectRowsProps?: {
+        labels?: {
+            toggleAllRowsLabel?: string;
+        };
+    };
+    withSelectRows?: boolean;
+}
+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;
@@ -140,6 +172,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;
@@ -195,10 +228,23 @@ export interface DataGridState<T extends object = any> extends TableCommonProps,
     expandedRowIds?: object;
     onRowClick?: (row: any, event: any) => void;
     onSort?: boolean;
+    customizeColumnsProps?: {
+        onSaveColumnPrefs?: (args: any) => void;
+        labels?: ColumnLabels;
+        isTearsheetOpen?: boolean;
+        setIsTearsheetOpen?: (args: boolean) => void;
+    };
+    CustomizeColumnsButton?: (args: any) => ReactNode;
+    column?: DatagridColumn;
     expandedContentHeight?: number;
     onRowExpand?: (row: DatagridRow, event: React.MouseEvent<HTMLElement>) => void;
     ExpandedRowContentComponent?: JSXElementConstructor<any>;
 }
+export interface DataGridData {
+    instance?: DataGridTableInstance;
+    column?: DatagridColumn;
+    cell?: DataGridCell;
+}
 export interface ResizeHeaderProps {
     resizerProps?: ResizerProps;
     header: DataGridHeader;
@@ -213,4 +259,10 @@ export interface ResizeHeaderProps {
     resizerAriaLabel?: string;
     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 interface PropGetterMeta {
+    instance?: DataGridTableInstance;
+    row?: Partial<Row<any> & DatagridRow<any>>;
+}
 export {};

package/lib/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/lib/components/Datagrid/useActionsColumn.js

@@ -26,9 +26,10 @@ var _excluded = ["align", "id", "itemText", "onClick", "icon", "shouldHideMenuIt
 var blockClass = "".concat(settings.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);
@@ -88,10 +89,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["default"].createElement(Icon, null)));
+              }), Icon && /*#__PURE__*/React__default["default"].createElement(Icon, null)));
             })), !isFetching && (rowActions.length > 2 || isColumnSticky) && /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(react.OverflowMenu, {
               align: "left",
               size: "sm",
@@ -117,7 +118,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
               }));

package/lib/components/Datagrid/useColumnCenterAlign.d.ts

@@ -1,2 +1,9 @@
+/**
+ * Copyright IBM Corp. 2020, 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 useColumnCenterAlign: (hooks: Hooks) => void;
 export default useColumnCenterAlign;
-declare function useColumnCenterAlign(hooks: any): void;

package/lib/components/Datagrid/useColumnCenterAlign.js

@@ -24,7 +24,7 @@ var useColumnCenterAlign = function useColumnCenterAlign(hooks) {
   var centerAlignRenderer = function centerAlignRenderer(tableProps, column) {
     return /*#__PURE__*/React__default["default"].createElement("div", {
       className: cx__default["default"]("".concat(blockClass, "__center-align-cell-renderer"), {
-        sortDisabled: !tableProps.isTableSortable || tableProps.column.disableSortBy === true
+        sortDisabled: !tableProps.isTableSortable || tableProps.column && tableProps.column.disableSortBy === true
       })
     }, column.Cell(tableProps));
   };

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

@@ -1,2 +1,9 @@
+/**
+ * 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;