@carbon/ibm-products 2.43.2-canary.16 → 2.43.2-canary.161

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

@@ -19,6 +19,7 @@ var cx = require('classnames');
 var propsHelper = require('../../../../../../global/js/utils/props-helper.js');
 var InlineEditContext = require('../InlineEditContext/InlineEditContext.js');
 var usePreviousValue = require('../../../../../../global/js/hooks/usePreviousValue.js');
+var useIsomorphicEffect = require('../../../../../../global/js/hooks/useIsomorphicEffect.js');
 var InlineEditButton = require('../InlineEditButton/InlineEditButton.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -28,7 +29,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,9 +76,9 @@ 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();
   var outerButtonElement = React.useRef();
   var rowSize = instance.rowSize,
     onDataUpdate = instance.onDataUpdate;
@@ -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();
@@ -281,6 +308,13 @@ var InlineEditCell = function InlineEditCell(_ref) {
       return renderDropdownItem(item);
     } : null;
   };
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    if (dropdownRef.current && dropdownRef.current.style) {
+      var closestElement = dropdownRef.current.closest(".".concat(blockClass, "__inline-edit--select"));
+      closestElement.style.width = "".concat(cell.column.totalWidth, "px");
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dropdownRef.current, cell.column.totalWidth]);
   var renderSelectCell = function renderSelectCell() {
     var _ref6 = config || {},
       inputProps = _ref6.inputProps;
@@ -290,9 +324,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
       ariaLabel: cellLabel || 'Dropdown menu options'
     }, inputProps, {
       hideLabel: true,
-      style: {
-        width: cell.column.totalWidth
-      },
       className: cx__default["default"]("".concat(blockClass, "__inline-edit--select"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--select-").concat(rowSize), rowSize)),
       items: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.items) || [],
       initialSelectedItem: cell.value,
@@ -327,7 +358,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
           }
         }
       },
-      ref: dropdownRef
+      ref: dropdownRef,
+      autoAlign: true
     }));
   };
   var setRenderIcon = function setRenderIcon() {
@@ -355,9 +387,15 @@ var InlineEditCell = function InlineEditCell(_ref) {
     var datePickerInputProps = config === null || config === void 0 || (_config$inputProps = config.inputProps) === null || _config$inputProps === void 0 ? void 0 : _config$inputProps.datePickerInputProps;
     return /*#__PURE__*/React__default["default"].createElement(react.DatePicker, _rollupPluginBabelHelpers["extends"]({}, datePickerPreparedProps, {
       appendTo: outerButtonElement === null || outerButtonElement === void 0 || (_outerButtonElement$c = outerButtonElement.current) === null || _outerButtonElement$c === void 0 ? void 0 : _outerButtonElement$c.parentElement,
-      ref: datePickerRef,
-      style: {
-        width: cell.column.totalWidth
+      ref: function ref(el) {
+        if (el && el.style) {
+          el.style.width = "".concat(cell.column.totalWidth, "px");
+          var elementId = "".concat(blockClass, "__inline-edit--date-picker--").concat(cell.row.index);
+          var element = el.querySelector("input#".concat(elementId));
+          if (element) {
+            element.style.position = 'static';
+          }
+        }
       },
       datePickerType: "single",
       className: cx__default["default"]("".concat(blockClass, "__inline-edit--date"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--date-").concat(rowSize), rowSize)),
@@ -380,9 +418,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
       },
       value: cell.value
     }), /*#__PURE__*/React__default["default"].createElement(react.DatePickerInput, _rollupPluginBabelHelpers["extends"]({}, datePickerInputProps, {
-      style: {
-        position: 'static'
-      },
       placeholder: (datePickerInputProps === null || datePickerInputProps === void 0 ? void 0 : datePickerInputProps.placeholder) || 'mm/dd/yyyy',
       labelText: (datePickerInputProps === null || datePickerInputProps === void 0 ? void 0 : datePickerInputProps.labelText) || cellLabel || 'Set date',
       id: "".concat(blockClass, "__inline-edit--date-picker--").concat(cell.row.index),
@@ -434,9 +469,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 +509,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 +535,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 +551,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 +569,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/Datagrid/addons/stateReducer.d.ts

@@ -14,4 +14,11 @@ export function handleSelectAllRowData({ dispatch, rows, getRowId, indeterminate
     indeterminate: any;
     isChecked: any;
 }): any;
+export function handleDynamicRowCheck({ dispatch, status, rowId, depth, index, }: {
+    dispatch: any;
+    status: any;
+    rowId: any;
+    depth: any;
+    index: any;
+}): any;
 export function stateReducer(newState: any, action: any): any;

package/lib/components/Datagrid/Datagrid/addons/stateReducer.js

@@ -18,6 +18,7 @@ var COLUMN_RESIZE_END = 'columnDoneResizing';
 var INIT = 'init';
 var TOGGLE_ROW_SELECTED = 'toggleRowSelected';
 var TOGGLE_ALL_ROWS_SELECTED = 'toggleAllRowsSelected';
+var DYNAMIC_ROW_CHECK = 'dynamicRowCheck';
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var handleColumnResizeEndEvent = function handleColumnResizeEndEvent(dispatch, onColResizeEnd, headerId, isKeyEvent) {
   dispatch({
@@ -81,15 +82,57 @@ var handleSelectAllRowData = function handleSelectAllRowData(_ref2) {
     }
   });
 };
+var handleDynamicRowCheck = function handleDynamicRowCheck(_ref3) {
+  var dispatch = _ref3.dispatch,
+    status = _ref3.status,
+    rowId = _ref3.rowId,
+    depth = _ref3.depth,
+    index = _ref3.index;
+  return dispatch({
+    type: DYNAMIC_ROW_CHECK,
+    payload: {
+      status: status,
+      rowId: rowId,
+      depth: depth,
+      index: index
+    }
+  });
+};
 var stateReducer = function stateReducer(newState, action) {
   switch (action.type) {
+    case DYNAMIC_ROW_CHECK:
+      {
+        var _action$payload = action.payload,
+          status = _action$payload.status,
+          rowId = _action$payload.rowId,
+          depth = _action$payload.depth,
+          index = _action$payload.index;
+        if (status === 'start') {
+          var skeletonRow = function skeletonRow(id) {
+            return {
+              isSkeleton: true,
+              values: 'skeleton',
+              id: id,
+              depth: depth,
+              index: index,
+              skeletonKey: "".concat(id, "__skeleton")
+            };
+          };
+          return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState), {}, {
+            dynamicRowSkeleton: skeletonRow(rowId)
+          });
+        }
+        return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState), {}, {
+          dynamicRowSkeleton: null
+        });
+      }
     case TOGGLE_ALL_ROWS_SELECTED:
       {
-        var _ref3 = action.payload || {},
-          rows = _ref3.rows,
-          getRowId = _ref3.getRowId,
-          indeterminate = _ref3.indeterminate,
-          isChecked = _ref3.isChecked;
+        var _ref4 = action.payload || {},
+          rows = _ref4.rows,
+          getRowId = _ref4.getRowId,
+          indeterminate = _ref4.indeterminate,
+          isChecked = _ref4.isChecked;
         var newSelectedRowIds = {};
         if (rows) {
           var newSelectedRowData = {};
@@ -111,10 +154,10 @@ var stateReducer = function stateReducer(newState, action) {
       }
     case TOGGLE_ROW_SELECTED:
       {
-        var _ref4 = action.payload || {},
-          rowData = _ref4.rowData,
-          _isChecked = _ref4.isChecked,
-          _getRowId = _ref4.getRowId;
+        var _ref5 = action.payload || {},
+          rowData = _ref5.rowData,
+          _isChecked = _ref5.isChecked,
+          _getRowId = _ref5.getRowId;
         if (!rowData) {
           return;
         }
@@ -125,9 +168,9 @@ var stateReducer = function stateReducer(newState, action) {
         }
         if (rowData && !_isChecked) {
           var newData = _rollupPluginBabelHelpers.objectSpread2({}, newState.selectedRowData);
-          var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref5) {
-            var _ref6 = _rollupPluginBabelHelpers.slicedToArray(_ref5, 1),
-              key = _ref6[0];
+          var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref6) {
+            var _ref7 = _rollupPluginBabelHelpers.slicedToArray(_ref6, 1),
+              key = _ref7[0];
             return parseInt(key) !== parseInt(_getRowId(rowData.original, rowData.index));
           }));
           return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState), {}, {
@@ -144,27 +187,27 @@ var stateReducer = function stateReducer(newState, action) {
       }
     case COLUMN_RESIZE_START:
       {
-        var _ref7 = action.payload || {},
-          headerId = _ref7.headerId;
+        var _ref8 = action.payload || {},
+          headerId = _ref8.headerId;
         return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, newState), {}, {
           isResizing: headerId
         });
       }
     case COLUMN_RESIZING:
       {
-        var _ref8 = action.payload || {},
-          _headerId = _ref8.headerId,
-          newWidth = _ref8.newWidth,
-          defaultWidth = _ref8.defaultWidth;
+        var _ref9 = action.payload || {},
+          _headerId = _ref9.headerId,
+          newWidth = _ref9.newWidth,
+          defaultWidth = _ref9.defaultWidth;
         var newColumnWidth = {};
         if (typeof _headerId === 'undefined') {
           return _rollupPluginBabelHelpers.objectSpread2({}, newState);
         }
         newColumnWidth[_headerId] = newWidth;
-        var cleanedWidths = Object.fromEntries(Object.entries(newState.columnResizing.columnWidths).filter(function (_ref9) {
-          var _ref10 = _rollupPluginBabelHelpers.slicedToArray(_ref9, 2);
-            _ref10[0];
-            var value = _ref10[1];
+        var cleanedWidths = Object.fromEntries(Object.entries(newState.columnResizing.columnWidths).filter(function (_ref10) {
+          var _ref11 = _rollupPluginBabelHelpers.slicedToArray(_ref10, 2);
+            _ref11[0];
+            var value = _ref11[1];
           return !isNaN(value);
         }));
         var headerIdArray = newState.columnResizing.headerIdWidths || [];
@@ -179,10 +222,10 @@ var stateReducer = function stateReducer(newState, action) {
       }
     case COLUMN_RESIZE_END:
       {
-        var _ref11 = action.payload || {},
-          onColResizeEnd = _ref11.onColResizeEnd,
-          _headerId2 = _ref11.headerId,
-          isKeyEvent = _ref11.isKeyEvent;
+        var _ref12 = action.payload || {},
+          onColResizeEnd = _ref12.onColResizeEnd,
+          _headerId2 = _ref12.headerId,
+          isKeyEvent = _ref12.isKeyEvent;
         var currentColumn = {};
         currentColumn[_headerId2] = newState.columnResizing.columnWidths[_headerId2];
         var allChangedColumns = newState.columnResizing.columnWidths;
@@ -210,6 +253,7 @@ var stateReducer = function stateReducer(newState, action) {
 
 exports.handleColumnResizeEndEvent = handleColumnResizeEndEvent;
 exports.handleColumnResizingEvent = handleColumnResizingEvent;
+exports.handleDynamicRowCheck = handleDynamicRowCheck;
 exports.handleSelectAllRowData = handleSelectAllRowData;
 exports.handleToggleRowSelected = handleToggleRowSelected;
 exports.stateReducer = stateReducer;

package/lib/components/Datagrid/common-column-ids.d.ts

@@ -1 +1,7 @@
+/**
+ * Copyright IBM Corp. 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.
+ */
 export const selectionColumnId: "datagridSelection";

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

@@ -1,3 +1,9 @@
+/**
+ * Copyright IBM Corp. 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.
+ */
 /// <reference path="../../../../src/custom-typings/index.d.ts" />
 import { MultiSelectProps } from '@carbon/react/lib/components/MultiSelect/MultiSelect';
 import { FormGroupProps } from '@carbon/react/lib/components/FormGroup/FormGroup';
@@ -6,7 +12,7 @@ import { RadioButtonGroupProps } from '@carbon/react/lib/components/RadioButtonG
 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 { 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 { IconButton, type ButtonProps } from '@carbon/react';
 import { TableBatchActionsProps } from '@carbon/react/lib/components/DataTable/TableBatchActions';
@@ -59,6 +65,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,7 +103,7 @@ 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>, UseSortByOptions<T>, Partial<UseResizeColumnsColumnProps<T>>, UseResizeColumnsOptions<T> {
     sticky?: 'left' | 'right';
     className?: string;
     rightAlignedColumn?: boolean;
@@ -102,6 +120,7 @@ export interface DatagridRow<T extends object = any> extends Omit<Row<T>, 'cells
     cells: Array<DataGridCell>;
     isSkeleton?: boolean;
     hasExpanded?: boolean;
+    skeletonKey?: string;
 }
 export interface DataGridHeader<T extends object = any> extends ColumnInstance, UseResizeColumnsColumnProps<T>, UseSortByColumnProps<T> {
     className(className: any, arg1: {
@@ -112,15 +131,21 @@ 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;
@@ -210,10 +235,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>;
+    getAsyncSubRows?: (row: DatagridRow) => void;
+}
+export interface DataGridData {
+    instance?: DataGridTableInstance;
+    column?: DatagridColumn;
+    cell?: DataGridCell;
 }
 export interface ResizeHeaderProps {
     resizerProps?: ResizerProps;
@@ -231,4 +269,8 @@ export interface ResizeHeaderProps {
 }
 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.js

@@ -52,10 +52,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
             }, isFetching && /*#__PURE__*/React__default["default"].createElement(react.IconSkeleton, {
               className: "".concat(blockClass, "__actions-column-loading")
             }), !isFetching && rowActions.length <= 2 && !isColumnSticky && /*#__PURE__*/React__default["default"].createElement("div", {
-              className: "".concat(blockClass, "_actions-column"),
-              style: {
-                display: 'flex'
-              }
+              className: "".concat(blockClass, "_actions-column")
             }, rowActions.map(function (action, index) {
               var preparedActionProps = propsHelper.prepareProps(action, ['isDelete']);
               var align = preparedActionProps.align,

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

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

package/lib/components/Datagrid/useCustomizeColumns.js

@@ -40,9 +40,10 @@ var useCustomizeColumns = function useCustomizeColumns(hooks) {
     isTearsheetOpen = _React$useState2[0],
     setIsTearsheetOpen = _React$useState2[1];
   hooks.useInstance.push(function (instance) {
-    var customizeColumnsProps = instance.customizeColumnsProps;
-    var _ref = customizeColumnsProps || {},
-      labels = _ref.labels;
+    var _ref = instance,
+      customizeColumnsProps = _ref.customizeColumnsProps;
+    var _ref2 = customizeColumnsProps || {},
+      labels = _ref2.labels;
     Object.assign(instance, {
       customizeColumnsProps: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, customizeColumnsProps), {}, {
         isTearsheetOpen: isTearsheetOpen,

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

@@ -1,3 +1,9 @@
+/**
+ * Copyright IBM Corp. 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 { TableInstance } from 'react-table';
 declare const useDatagrid: (params: any, ...plugins: any[]) => TableInstance;
 export default useDatagrid;

package/lib/components/Datagrid/useDefaultStringRenderer.js

@@ -30,7 +30,6 @@ var useDefaultStringRenderer = function useDefaultStringRenderer(hooks) {
   var HeaderRenderer = function HeaderRenderer(header, slug) {
     return /*#__PURE__*/React__default["default"].createElement("div", {
       className: cx__default["default"]("".concat(blockClass, "__defaultStringRenderer"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__defaultStringRenderer--slug"), slug && /*#__PURE__*/React__default["default"].isValidElement(slug))),
-      title: typeof header === 'string' ? header : '',
       key: typeof header === 'string' ? header : ''
     }, header);
   };

package/lib/components/Datagrid/useDisableSelectRows.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 useDisableSelectRows: (hooks: Hooks) => void;
 export default useDisableSelectRows;
-declare function useDisableSelectRows(hooks: any): void;