@carbon/ibm-products 2.43.2-canary.33 → 2.43.2-canary.331

package/lib/components/Datagrid/Datagrid/DatagridRow.js

@@ -16,12 +16,7 @@ var layout = require('@carbon/layout');
 var commonColumnIds = require('../common-column-ids.js');
 var cx = require('classnames');
 var settings = require('../../../settings.js');
-var DatagridSlug = require('./addons/Slug/DatagridSlug.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+var DatagridAiLabel = require('./addons/AiLabel/DatagridAiLabel.js');
 
 var _SkeletonText;
 var _excluded = ["className"],
@@ -37,7 +32,7 @@ var rowHeights = {
 
 // eslint-disable-next-line react/prop-types
 var DatagridRow = function DatagridRow(datagridState) {
-  var _row$original, _row$original2, _row$original3;
+  var _row$original, _row$original2, _row$original3, _row$original4, _row$original5, _row$original6;
   var row = datagridState.row,
     rows = datagridState.rows,
     rowSize = datagridState.rowSize,
@@ -49,7 +44,8 @@ var DatagridRow = function DatagridRow(datagridState) {
     withMouseHover = datagridState.withMouseHover,
     setMouseOverRowIndex = datagridState.setMouseOverRowIndex,
     headers = datagridState.headers,
-    visibleColumns = datagridState.visibleColumns;
+    visibleColumns = datagridState.visibleColumns,
+    getAsyncSubRows = datagridState.getAsyncSubRows;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -117,66 +113,73 @@ var DatagridRow = function DatagridRow(datagridState) {
     }
     return {};
   };
-  var _row$getRowProps = row.getRowProps(),
+  var _row$getRowProps = row.getRowProps({
+      role: undefined
+    }),
     className = _row$getRowProps.className,
     rowProps = _rollupPluginBabelHelpers.objectWithoutProperties(_row$getRowProps, _excluded);
   var foundAIRow = rows.some(function (r) {
-    var _r$original;
-    return /*#__PURE__*/React.isValidElement(r === null || r === void 0 || (_r$original = r.original) === null || _r$original === void 0 ? void 0 : _r$original.slug);
+    var _r$original, _r$original2;
+    return /*#__PURE__*/React.isValidElement(r === null || r === void 0 || (_r$original = r.original) === null || _r$original === void 0 ? void 0 : _r$original.aiLabel) || /*#__PURE__*/React.isValidElement(r === null || r === void 0 || (_r$original2 = r.original) === null || _r$original2 === void 0 ? void 0 : _r$original2.slug);
   });
-  var rowClassNames = cx__default["default"]("".concat(blockClass, "__carbon-row"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), "".concat(settings.carbon.prefix, "--data-table--selected"), row.isSelected), "".concat(blockClass, "__slug--row"), /*#__PURE__*/React.isValidElement(row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.slug)));
+  var rowClassNames = cx("".concat(blockClass, "__carbon-row"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), "".concat(blockClass, "__carbon-row-expandable--async"), getAsyncSubRows && row.depth > 0), "".concat(settings.carbon.prefix, "--data-table--selected"), row.isSelected), "".concat(blockClass, "__slug--row"), /*#__PURE__*/React.isValidElement(row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.slug)), "".concat(blockClass, "__ai-label--row"), /*#__PURE__*/React.isValidElement(row === null || row === void 0 || (_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.aiLabel)));
   var withActionsColumn = headers ? !!headers.filter(function (header) {
     return header.isAction;
   }).length : false;
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, {
-    key: key
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableRow, _rollupPluginBabelHelpers["extends"]({}, rowProps, {
-    className: cx__default["default"](rowClassNames, className),
-    key: row.id,
+  var rowKey = !row.isSkeleton ? key : row.skeletonKey;
+  return /*#__PURE__*/React.createElement(React.Fragment, {
+    key: "".concat(rowKey, "__").concat(key, "__row--fragment")
+  }, /*#__PURE__*/React.createElement(react.TableRow, _rollupPluginBabelHelpers.extends({}, rowProps, {
+    className: cx(rowClassNames, className),
+    key: rowKey,
     onMouseEnter: hoverHandler,
     onMouseLeave: handleMouseLeave,
     onFocus: hoverHandler,
     onBlur: focusRemover,
     onKeyUp: handleOnKeyUp
-  }, setAdditionalRowProps()), foundAIRow ? row !== null && row !== void 0 && (_row$original2 = row.original) !== null && _row$original2 !== void 0 && _row$original2.slug ? /*#__PURE__*/React__default["default"].createElement("td", {
-    className: cx__default["default"]("".concat(blockClass, "__table-row-ai-enabled"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__slug--expanded"), row.isExpanded))
-  }, /*#__PURE__*/React__default["default"].createElement(DatagridSlug.DatagridSlug, {
-    slug: row === null || row === void 0 || (_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.slug
-  })) : /*#__PURE__*/React__default["default"].createElement("td", {
+  }, setAdditionalRowProps()), foundAIRow ? row !== null && row !== void 0 && (_row$original3 = row.original) !== null && _row$original3 !== void 0 && _row$original3.aiLabel ? /*#__PURE__*/React.createElement("td", {
+    className: cx("".concat(blockClass, "__table-row-ai-enabled"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__ai-label--expanded"), row.isExpanded))
+  }, /*#__PURE__*/React.createElement(DatagridAiLabel.DatagridAILabel, {
+    aiLabel: row === null || row === void 0 || (_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.aiLabel
+  })) : row !== null && row !== void 0 && (_row$original5 = row.original) !== null && _row$original5 !== void 0 && _row$original5.slug ? /*#__PURE__*/React.createElement("td", {
+    className: cx("".concat(blockClass, "__table-row-ai-enabled"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__slug--expanded"), row.isExpanded))
+  }, /*#__PURE__*/React.createElement(DatagridAiLabel.DatagridAILabel, {
+    aiLabel: row === null || row === void 0 || (_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.slug
+  })) : /*#__PURE__*/React.createElement("td", {
     className: "".concat(blockClass, "__table-row-ai-spacer")
   }) : null, row.cells.map(function (cell, index) {
-    var _cell$column, _cell$column2, _content$props, _associatedHeader$;
-    var cellProps = cell.getCellProps();
+    var _cell$column, _cell$column2, _associatedHeader$, _associatedHeader$2;
+    var cellProps = cell.getCellProps({
+      role: undefined
+    });
     // eslint-disable-next-line no-unused-vars
     var _ref2 = cellProps,
       style = _ref2.style,
       children = _ref2.children,
       restProps = _rollupPluginBabelHelpers.objectWithoutProperties(_ref2, _excluded2);
     var columnClassname = cell === null || cell === void 0 || (_cell$column = cell.column) === null || _cell$column === void 0 ? void 0 : _cell$column.className;
-    var content = children || /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, !row.isSkeleton && cell.render('Cell'), row.isSkeleton && (_SkeletonText || (_SkeletonText = /*#__PURE__*/React__default["default"].createElement(react.SkeletonText, null))));
+    var content = children || /*#__PURE__*/React.createElement(React.Fragment, null, !row.isSkeleton && cell.render('Cell'), row.isSkeleton && (_SkeletonText || (_SkeletonText = /*#__PURE__*/React.createElement(react.SkeletonText, null))));
     if ((cell === null || cell === void 0 || (_cell$column2 = cell.column) === null || _cell$column2 === void 0 ? void 0 : _cell$column2.id) === commonColumnIds.selectionColumnId) {
       // directly render component without the wrapping TableCell
       return cell.render('Cell', {
         key: cell.column.id
       });
     }
-    var title = content === null || content === void 0 || (_content$props = content.props) === null || _content$props === void 0 || (_content$props = _content$props.children[0]) === null || _content$props === void 0 || (_content$props = _content$props.props) === null || _content$props === void 0 ? void 0 : _content$props.value;
     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';
+    var lastVisibleFlexStyle = index === visibleColumns.length - lastVisibleIndex ? '1 0 auto' : '0 0 auto';
     if (style) {
       style.flex = lastVisibleFlexStyle;
     }
-    return /*#__PURE__*/React__default["default"].createElement(react.TableCell, _rollupPluginBabelHelpers["extends"]({
-      className: cx__default["default"]("".concat(blockClass, "__cell"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.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__*/React.isValidElement((_associatedHeader$ = associatedHeader[0]) === null || _associatedHeader$ === void 0 ? void 0 : _associatedHeader$.slug)), columnClassname)
+    return /*#__PURE__*/React.createElement(react.TableCell, _rollupPluginBabelHelpers.extends({
+      className: cx("".concat(blockClass, "__cell"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__expandable-row-cell"), (row.canExpand || getAsyncSubRows) && index === 0), "".concat(blockClass, "__expandable-row-cell--is-expanded"), row.isExpanded && index === 0), "".concat(blockClass, "__slug--cell"), associatedHeader && associatedHeader.length && /*#__PURE__*/React.isValidElement((_associatedHeader$ = associatedHeader[0]) === null || _associatedHeader$ === void 0 ? void 0 : _associatedHeader$.slug)), "".concat(blockClass, "__ai-label--cell"), associatedHeader && associatedHeader.length && /*#__PURE__*/React.isValidElement((_associatedHeader$2 = associatedHeader[0]) === null || _associatedHeader$2 === void 0 ? void 0 : _associatedHeader$2.aiLabel)), columnClassname)
     }, restProps, {
       style: style,
-      key: cell.column.id,
-      title: title
+      key: cell.column.id
     }), content);
   })), (renderExpandedRow === null || renderExpandedRow === void 0 ? void 0 : renderExpandedRow()) || undefined);
 };
 
-exports["default"] = DatagridRow;
+exports.default = DatagridRow;

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

@@ -4,6 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import React from 'react';
 import { DataGridState } from '../types';
-declare const SelectAll: (datagridState: DataGridState) => import("react/jsx-runtime").JSX.Element;
+declare const SelectAll: (datagridState: DataGridState) => React.JSX.Element;
 export { SelectAll };

package/lib/components/Datagrid/Datagrid/DatagridSelectAll.js

@@ -7,8 +7,6 @@
 
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var react = require('@carbon/react');
@@ -16,20 +14,16 @@ var cx = require('classnames');
 var settings = require('../../../settings.js');
 var stateReducer = require('./addons/stateReducer.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var _excluded = ["onChange"];
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var SelectAll = function SelectAll(datagridState) {
   var _columns$;
-  var _useState = React.useState(typeof window !== 'undefined' ? window.innerWidth : ''),
+  var _useState = React.useState(),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
   React.useLayoutEffect(function () {
+    setWindowSize(window.innerWidth);
     /* istanbul ignore next */
     function updateSize() {
       setWindowSize(window.innerWidth);
@@ -53,12 +47,11 @@ var SelectAll = function SelectAll(datagridState) {
     dispatch = datagridState.dispatch,
     rows = datagridState.rows,
     getRowId = datagridState.getRowId,
-    toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     onAllRowSelect = datagridState.onAllRowSelect;
   var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
   if (hideSelectAll || radio) {
-    return /*#__PURE__*/React__default["default"].createElement("div", {
-      className: cx__default["default"]("".concat(blockClass, "__head-hidden-select-all"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), /* istanbul ignore next */
+    return /*#__PURE__*/React.createElement("th", {
+      className: cx("".concat(blockClass, "__head-hidden-select-all"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), /* istanbul ignore next */
       isFirstColumnStickyLeft && Number(windowSize) > 671))
     });
   }
@@ -67,24 +60,8 @@ var SelectAll = function SelectAll(datagridState) {
     onChange = _ref.onChange,
     selectProps = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var indeterminate = selectProps.indeterminate;
-  var handleSelectAllChange = function handleSelectAllChange(event) {
-    if (indeterminate) {
-      stateReducer.handleSelectAllRowData({
-        dispatch: dispatch,
-        rows: rows,
-        getRowId: getRowId,
-        indeterminate: true,
-        isChecked: undefined
-      });
-      toggleAllRowsSelected(false);
-      onAllRowSelect === null || onAllRowSelect === void 0 || onAllRowSelect(rows, event);
-      return onChange === null || onChange === void 0 ? void 0 : onChange({
-        target: {
-          checked: false
-        }
-      });
-    }
-    stateReducer.handleSelectAllRowData({
+  var handleOnPageSelectAllChange = function handleOnPageSelectAllChange(event) {
+    stateReducer.handleOnPageSelectAllRowData({
       dispatch: dispatch,
       rows: rows,
       getRowId: getRowId,
@@ -94,15 +71,15 @@ var SelectAll = function SelectAll(datagridState) {
     onAllRowSelect === null || onAllRowSelect === void 0 || onAllRowSelect(rows, event);
     return onChange === null || onChange === void 0 ? void 0 : onChange(event);
   };
-  return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: cx__default["default"]("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), /* istanbul ignore next */
-    isFirstColumnStickyLeft && Number(windowSize) > 671))
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableSelectAll, _rollupPluginBabelHelpers["extends"]({}, selectProps, {
+  return /*#__PURE__*/React.createElement(react.TableSelectAll, _rollupPluginBabelHelpers.extends({}, selectProps, {
+    checked: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.checked) || false,
+    className: cx("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), /* istanbul ignore next */
+    isFirstColumnStickyLeft && Number(windowSize) > 671)),
     name: "".concat(tableId, "-select-all-checkbox-name"),
-    onSelect: handleSelectAllChange,
+    onSelect: handleOnPageSelectAllChange,
     disabled: isFetching || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled),
     id: "".concat(tableId, "-select-all-checkbox-id")
-  })));
+  }));
 };
 
 exports.SelectAll = SelectAll;

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

@@ -4,10 +4,11 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import React from 'react';
 import PropTypes from 'prop-types';
 import { DataGridState } from '../types';
 declare const SelectAllWithToggle: {
-    ({ tableId, isFetching, isAllRowsSelected, selectAllToggle, getToggleAllPageRowsSelectedProps, getToggleAllRowsSelectedProps, allPageRowsLabel, allRowsLabel, columns, withStickyColumn, }: DataGridState): import("react/jsx-runtime").JSX.Element;
+    ({ tableId, isFetching, isAllRowsSelected, selectAllToggle, getToggleAllPageRowsSelectedProps, getToggleAllRowsSelectedProps, allPageRowsLabel, allRowsLabel, columns, withStickyColumn, }: DataGridState): React.JSX.Element;
     propTypes: {
         allPageRowsLabel: PropTypes.Requireable<string>;
         allRowsLabel: PropTypes.Requireable<string>;

package/lib/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js

@@ -11,17 +11,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
-var index = require('../../../node_modules/prop-types/index.js');
+var index = require('../../../_virtual/index.js');
 var cx = require('classnames');
 var react = require('@carbon/react');
 var icons = require('@carbon/react/icons');
 var settings = require('../../../settings.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var _excluded = ["onChange"];
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var SELECT_ALL_PAGE_ROWS = 'pageRows';
@@ -52,11 +47,12 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
       onSelectAllRows(isAllRowsSelected && selectAllMode === SELECT_ALL_ROWS);
     }
   }, [isAllRowsSelected, selectAllMode, onSelectAllRows]);
-  var _useState3 = React.useState(window.innerWidth),
+  var _useState3 = React.useState(),
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
     windowSize = _useState4[0],
     setWindowSize = _useState4[1];
   React.useLayoutEffect(function () {
+    setWindowSize(window.innerWidth);
     function updateSize() {
       setWindowSize(window.innerWidth);
     }
@@ -75,10 +71,10 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
     selectProps = _rollupPluginBabelHelpers.objectWithoutProperties(_ref3, _excluded);
   var disabled = isFetching || selectProps.disabled;
   var isFirstColumnStickyLeft = (columns === null || columns === void 0 || (_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
-  return /*#__PURE__*/React__default["default"].createElement("th", {
+  return /*#__PURE__*/React.createElement("th", {
     scope: "col",
-    className: cx__default["default"]("".concat(blockClass, "__select-all-toggle-on"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
-  }, /*#__PURE__*/React__default["default"].createElement("span", null, /*#__PURE__*/React__default["default"].createElement(react.Checkbox, _rollupPluginBabelHelpers["extends"]({}, selectProps, {
+    className: cx("".concat(blockClass, "__select-all-toggle-on"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && (windowSize !== null && windowSize !== void 0 ? windowSize : 0) > 671))
+  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(react.Checkbox, _rollupPluginBabelHelpers.extends({}, selectProps, {
     name: "".concat(tableId, "-select-all-checkbox-name"),
     onClick: function onClick(e) {
       onChange === null || onChange === void 0 || onChange(e);
@@ -87,16 +83,16 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
     id: "".concat(tableId, "-select-all-checkbox-id"),
     labelText: allRowsLabel,
     hideLabel: true
-  }))), /*#__PURE__*/React__default["default"].createElement(react.OverflowMenu, {
+  }))), /*#__PURE__*/React.createElement(react.OverflowMenu, {
     renderIcon: function renderIcon(props) {
-      return /*#__PURE__*/React__default["default"].createElement(icons.CaretDown, _rollupPluginBabelHelpers["extends"]({
+      return /*#__PURE__*/React.createElement(icons.CaretDown, _rollupPluginBabelHelpers.extends({
         size: 16
       }, props));
     },
     size: "sm",
     "aria-label": allRowsLabel,
     menuOptionsClass: "".concat(blockClass, "__select-all-toggle-overflow")
-  }, /*#__PURE__*/React__default["default"].createElement(react.OverflowMenuItem, {
+  }, /*#__PURE__*/React.createElement(react.OverflowMenuItem, {
     itemText: allPageRowsLabel,
     requireTitle: true,
     disabled: disabled,
@@ -116,7 +112,7 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
         }
       });
     }
-  }), /*#__PURE__*/React__default["default"].createElement(react.OverflowMenuItem, {
+  }), /*#__PURE__*/React.createElement(react.OverflowMenuItem, {
     itemText: allRowsLabel,
     requireTitle: true,
     disabled: disabled,
@@ -131,16 +127,16 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
   })));
 };
 SelectAllWithToggle.propTypes = {
-  allPageRowsLabel: index["default"].string,
-  allRowsLabel: index["default"].string,
-  columns: index["default"].arrayOf(index["default"].object),
-  getToggleAllPageRowsSelectedProps: index["default"].func.isRequired,
-  getToggleAllRowsSelectedProps: index["default"].func.isRequired,
-  isAllRowsSelected: index["default"].bool.isRequired,
-  isFetching: index["default"].bool,
-  selectAllToggle: index["default"].object,
-  tableId: index["default"].string.isRequired,
-  withStickyColumn: index["default"].bool
+  allPageRowsLabel: index.default.string,
+  allRowsLabel: index.default.string,
+  columns: index.default.arrayOf(index.default.object),
+  getToggleAllPageRowsSelectedProps: index.default.func.isRequired,
+  getToggleAllRowsSelectedProps: index.default.func.isRequired,
+  isAllRowsSelected: index.default.bool.isRequired,
+  isFetching: index.default.bool,
+  selectAllToggle: index.default.object,
+  tableId: index.default.string.isRequired,
+  withStickyColumn: index.default.bool
 };
 
-exports["default"] = SelectAllWithToggle;
+exports.default = SelectAllWithToggle;

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

@@ -1,3 +1,10 @@
+/**
+ * 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 React from 'react';
 import { DataGridState } from '../types';
-declare const DatagridSimpleBody: (datagridState: DataGridState) => import("react/jsx-runtime").JSX.Element;
+declare const DatagridSimpleBody: (datagridState: DataGridState) => React.JSX.Element;
 export default DatagridSimpleBody;

package/lib/components/Datagrid/Datagrid/DatagridSimpleBody.js

@@ -15,21 +15,16 @@ var react = require('@carbon/react');
 var cx = require('classnames');
 var settings = require('../../../settings.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var DatagridSimpleBody = function DatagridSimpleBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow;
-  return /*#__PURE__*/React__default["default"].createElement(react.TableBody, _rollupPluginBabelHelpers["extends"]({}, getTableBodyProps({
+  return /*#__PURE__*/React.createElement(react.TableBody, _rollupPluginBabelHelpers.extends({}, getTableBodyProps({
     role: undefined
   }), {
     "aria-live": undefined,
-    className: cx__default["default"]("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
+    className: cx("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     var _row$RowRenderer;
     prepareRow(row);
@@ -42,4 +37,4 @@ var DatagridSimpleBody = function DatagridSimpleBody(datagridState) {
   }));
 };
 
-exports["default"] = DatagridSimpleBody;
+exports.default = DatagridSimpleBody;

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

@@ -4,13 +4,14 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import React from 'react';
 import PropTypes from 'prop-types';
 import { DataGridState } from '../types';
 interface DatagridToolbarProps {
     ariaToolbarLabel?: string;
 }
 declare const DatagridToolbar: {
-    ({ ariaToolbarLabel, ...datagridState }: DatagridToolbarProps & DataGridState): import("react/jsx-runtime").JSX.Element | null;
+    ({ ariaToolbarLabel, ...datagridState }: DatagridToolbarProps & DataGridState): React.JSX.Element | null;
     propTypes: {
         ariaToolbarLabel: PropTypes.Requireable<string>;
     };

package/lib/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -11,18 +11,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
-var index = require('../../../node_modules/prop-types/index.js');
+var index = require('../../../_virtual/index.js');
 var react = require('@carbon/react');
 var useResizeObserver = require('../../../global/js/hooks/useResizeObserver.js');
 var settings = require('../../../settings.js');
 var cx = require('classnames');
 var stateReducer = require('./addons/stateReducer.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var _excluded = ["ariaToolbarLabel"];
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid__table-toolbar");
 var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridState, width, ref) {
@@ -42,15 +37,27 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     selectedRowIds = datagridState.state.selectedRowIds,
     toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     toolbarBatchActions = datagridState.toolbarBatchActions,
+    toolbarBatchActionsDisplayMin = datagridState.toolbarBatchActionsDisplayMin,
     setGlobalFilter = datagridState.setGlobalFilter,
     rows = datagridState.rows,
     dispatch = datagridState.dispatch,
     getRowId = datagridState.getRowId,
     batchActionMenuButtonLabel = datagridState.batchActionMenuButtonLabel,
     translateWithIdBatchActions = datagridState.translateWithIdBatchActions;
+  var _useState7 = React.useState(rows.length),
+    _useState8 = _rollupPluginBabelHelpers.slicedToArray(_useState7, 2),
+    availableRowsCount = _useState8[0],
+    setAvailableRowsCount = _useState8[1];
   var batchActionMenuButtonLabelText = batchActionMenuButtonLabel !== null && batchActionMenuButtonLabel !== void 0 ? batchActionMenuButtonLabel : 'More';
   var selectedKeys = Object.keys(selectedRowIds || {});
   var totalSelected = selectedKeys.length;
+  React.useEffect(function () {
+    var _rows$find, _rows$find$getRowProp;
+    var countDisabledRows = ((_rows$find = rows.find(function (row) {
+      return row.getRowProps;
+    })) === null || _rows$find === void 0 || (_rows$find$getRowProp = _rows$find.getRowProps) === null || _rows$find$getRowProp === void 0 || (_rows$find$getRowProp = _rows$find$getRowProp.call(_rows$find)) === null || _rows$find$getRowProp === void 0 || (_rows$find$getRowProp = _rows$find$getRowProp.nonselectablerows) === null || _rows$find$getRowProp === void 0 ? void 0 : _rows$find$getRowProp.length) || 0;
+    rows && setAvailableRowsCount(rows.length - countDisabledRows);
+  }, [rows]);
 
   // Get initial width of batch actions container,
   // used to measure when all items are put inside
@@ -89,11 +96,11 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     var minWidthBeforeOverflowIcon = 380;
     // Do not render ButtonMenu when there are 3 or less items
     // and if there is enough available space to render all the items
-    if (toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= 3 && !displayAllInMenu) {
+    if (toolbarBatchActions && !displayAllInMenu && (!toolbarBatchActionsDisplayMin && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= 3 || toolbarBatchActionsDisplayMin !== undefined && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= toolbarBatchActionsDisplayMin)) {
       return;
     }
     var renderItem = function renderItem(batchAction, index) {
-      return /*#__PURE__*/React__default["default"].createElement(react.MenuItem, {
+      return /*#__PURE__*/React.createElement(react.MenuItem, {
         key: "".concat(batchAction.label, "-").concat(index),
         label: batchAction.label,
         onClick: function onClick(event) {
@@ -101,13 +108,16 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
         }
       });
     };
-    return /*#__PURE__*/React__default["default"].createElement(react.MenuButton, {
+    return /*#__PURE__*/React.createElement(react.MenuButton, {
       label: batchActionMenuButtonLabelText,
-      className: cx__default["default"]([menuClass, _rollupPluginBabelHelpers.defineProperty({}, "".concat(menuClass, "-icon-only"), width <= minWidthBeforeOverflowIcon)]),
+      className: cx([menuClass, _rollupPluginBabelHelpers.defineProperty({}, "".concat(menuClass, "-icon-only"), width <= minWidthBeforeOverflowIcon)]),
       tabIndex: totalSelected > 0 ? 0 : -1,
       menuAlignment: "bottom"
     }, toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
-      var hidden = index < 2 && !displayAllInMenu;
+      var hidden = toolbarBatchActionsDisplayMin === undefined && index < 2 && !displayAllInMenu;
+      if (toolbarBatchActionsDisplayMin !== undefined && index < toolbarBatchActionsDisplayMin && !displayAllInMenu) {
+        hidden = true;
+      }
       if (!hidden) {
         return renderItem(batchAction, index);
       }
@@ -145,21 +155,22 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
   // Only display the first two batch actions, the rest are
   // displayed inside of the ButtonMenu if there are more than
   // 3 batch actions
-  return /*#__PURE__*/React__default["default"].createElement(react.TableBatchActions, {
+  return /*#__PURE__*/React.createElement(react.TableBatchActions, {
     shouldShowBatchActions: totalSelected > 0,
     totalSelected: totalSelected,
     onCancel: onCancelHandler,
     onSelectAll: onSelectAllHandler,
-    totalCount: rows && rows.length,
+    totalCount: availableRowsCount,
     translateWithId: translateWithIdBatchActions
   }, !displayAllInMenu && toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
-    if (index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3) {
-      return /*#__PURE__*/React__default["default"].createElement(react.TableBatchAction, {
+    if (!toolbarBatchActionsDisplayMin && index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3 || toolbarBatchActionsDisplayMin !== undefined && index < toolbarBatchActionsDisplayMin) {
+      return /*#__PURE__*/React.createElement(react.TableBatchAction, {
         key: "".concat(batchAction.label, "-").concat(index),
         renderIcon: batchAction.renderIcon,
         onClick: function onClick(event) {
           return onClickHandler(event, batchAction);
         },
+        className: cx(_rollupPluginBabelHelpers.defineProperty({}, "".concat(settings.carbon.prefix, "--noLabel"), !batchAction.label || batchAction.label === '')),
         iconDescription: batchAction.label,
         tabIndex: totalSelected > 0 ? 0 : -1
       }, batchAction.label);
@@ -177,19 +188,19 @@ var DatagridToolbar = function DatagridToolbar(_ref2) {
     batchActions = datagridState.batchActions,
     rowSize = datagridState.rowSize;
   var getRowHeight = rowSize || 'lg';
-  return batchActions && DatagridActions ? /*#__PURE__*/React__default["default"].createElement("div", {
+  return batchActions && DatagridActions ? /*#__PURE__*/React.createElement("div", {
     ref: ref,
-    className: cx__default["default"]([blockClass, "".concat(blockClass, "--").concat(getRowHeight)])
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableToolbar, {
+    className: cx([blockClass, "".concat(blockClass, "--").concat(getRowHeight)])
+  }, /*#__PURE__*/React.createElement(react.TableToolbar, {
     "aria-label": ariaToolbarLabel
-  }, DatagridActions && /*#__PURE__*/React__default["default"].createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar === null || DatagridBatchActionsToolbar === void 0 ? void 0 : DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React__default["default"].createElement("div", {
+  }, DatagridActions && /*#__PURE__*/React.createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar === null || DatagridBatchActionsToolbar === void 0 ? void 0 : DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React.createElement("div", {
     className: blockClass
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableToolbar, {
+  }, /*#__PURE__*/React.createElement(react.TableToolbar, {
     "aria-label": ariaToolbarLabel
-  }, DatagridActions && /*#__PURE__*/React__default["default"].createElement(DatagridActions, datagridState), DatagridBatchActions === null || DatagridBatchActions === void 0 ? void 0 : DatagridBatchActions(datagridState))) : null;
+  }, DatagridActions && /*#__PURE__*/React.createElement(DatagridActions, datagridState), DatagridBatchActions === null || DatagridBatchActions === void 0 ? void 0 : DatagridBatchActions(datagridState))) : null;
 };
 DatagridToolbar.propTypes = {
-  ariaToolbarLabel: index["default"].string
+  ariaToolbarLabel: index.default.string
 };
 
-exports["default"] = DatagridToolbar;
+exports.default = DatagridToolbar;

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

@@ -4,6 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import React from 'react';
 import { DataGridState } from '../types';
-declare const DatagridVirtualBody: (datagridState: DataGridState) => import("react/jsx-runtime").JSX.Element;
+declare const DatagridVirtualBody: (datagridState: DataGridState) => React.JSX.Element;
 export default DatagridVirtualBody;