@carbon/ibm-products 1.61.0 → 1.62.0

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

@@ -31,7 +31,7 @@ var TableContainer = DataTable.TableContainer,
   Table = DataTable.Table;
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 export var DatagridContent = function DatagridContent(_ref) {
-  var _cx4;
+  var _cx5;
   var datagridState = _ref.datagridState,
     title = _ref.title;
   var _useContext = useContext(InlineEditContext),
@@ -44,8 +44,7 @@ export var DatagridContent = function DatagridContent(_ref) {
   var activeCellId = inlineEditState.activeCellId,
     gridActive = inlineEditState.gridActive,
     editId = inlineEditState.editId;
-  var _datagridState$getTab = datagridState.getTableProps,
-    getTableProps = _datagridState$getTab === void 0 ? function () {} : _datagridState$getTab,
+  var getTableProps = datagridState.getTableProps,
     getFilterFlyoutProps = datagridState.getFilterFlyoutProps,
     withVirtualScroll = datagridState.withVirtualScroll,
     DatagridPagination = datagridState.DatagridPagination,
@@ -68,6 +67,7 @@ export var DatagridContent = function DatagridContent(_ref) {
     state = datagridState.state,
     page = datagridState.page,
     rows = datagridState.rows;
+  var columnResizing = state.columnResizing;
   var contentRows = DatagridPagination && page || rows;
   var gridAreaRef = useRef();
   var multiKeyTrackingRef = useRef();
@@ -89,10 +89,11 @@ export var DatagridContent = function DatagridContent(_ref) {
   var renderTable = function renderTable() {
     var _getTableProps;
     return /*#__PURE__*/React.createElement(Table, _extends({}, getTableProps(), {
-      className: cx(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), _defineProperty({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), _defineProperty({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), _defineProperty({}, "".concat(blockClass, "__table-grid-active"), gridActive), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
+      className: cx(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), _defineProperty({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), _defineProperty({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), _defineProperty({}, "".concat(blockClass, "__table-grid-active"), gridActive), _defineProperty({}, "".concat(blockClass, "__table-is-resizing"), typeof columnResizing.isResizingColumn === 'string'), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
       role: withInlineEdit && 'grid',
       tabIndex: withInlineEdit && 0,
-      onKeyDown: withInlineEdit ? function (event) {
+      onKeyDown: /* istanbul ignore next */
+      withInlineEdit && function (event) {
         return handleGridKeyPress({
           event: event,
           dispatch: dispatch,
@@ -101,10 +102,10 @@ export var DatagridContent = function DatagridContent(_ref) {
           state: inlineEditState,
           usingMac: usingMac
         });
-      } : null,
-      onFocus: withInlineEdit ? function () {
+      },
+      onFocus: withInlineEdit && function () {
         return handleGridFocus(inlineEditState, dispatch);
-      } : null,
+      },
       title: title
     }), !withVirtualScroll && /*#__PURE__*/React.createElement(DatagridHead, datagridState), /*#__PURE__*/React.createElement(DatagridBody, _extends({}, datagridState, {
       rows: contentRows
@@ -133,6 +134,8 @@ export var DatagridContent = function DatagridContent(_ref) {
   useSubscribeToEventEmitter(CLEAR_SINGLE_FILTER, function (id) {
     return clearSingleFilter(id, setAllFilters, state);
   });
+
+  /* istanbul ignore next */
   var renderFilterSummary = function renderFilterSummary() {
     return state.filters.length > 0 && /*#__PURE__*/React.createElement(FilterSummary, {
       className: "".concat(blockClass, "__filter-summary"),
@@ -145,7 +148,7 @@ export var DatagridContent = function DatagridContent(_ref) {
     });
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContainer, {
-    className: cx("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : '', (_cx4 = {}, _defineProperty(_cx4, "".concat(blockClass, "__grid-container-grid-active"), gridActive), _defineProperty(_cx4, "".concat(blockClass, "__grid-container-inline-edit"), withInlineEdit), _defineProperty(_cx4, "".concat(blockClass, "__grid-container-grid-active--without-toolbar"), withInlineEdit && !DatagridActions), _cx4)),
+    className: cx("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : '', (_cx5 = {}, _defineProperty(_cx5, "".concat(blockClass, "__grid-container-grid-active"), gridActive), _defineProperty(_cx5, "".concat(blockClass, "__grid-container-inline-edit"), withInlineEdit), _defineProperty(_cx5, "".concat(blockClass, "__grid-container-grid-active--without-toolbar"), withInlineEdit && !DatagridActions), _cx5)),
     title: gridTitle,
     description: gridDescription
   }, /*#__PURE__*/React.createElement(DatagridToolbar, datagridState), /*#__PURE__*/React.createElement("div", {

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

@@ -13,10 +13,10 @@ var blockClass = "".concat(pkg.prefix, "--datagrid");
 var DatagridExpandedRow = function DatagridExpandedRow(ExpandedRowContentComponent) {
   return function (datagridState) {
     var row = datagridState.row;
-    var _ref = row || {},
-      expandedContentHeight = _ref.expandedContentHeight;
+    var expandedContentHeight = row.expandedContentHeight;
     var toggleParentHoverClass = function toggleParentHoverClass(event, eventType) {
       var _event$target, _event$target$parentN;
+      /* istanbul ignore else */
       if (event !== null && event !== void 0 && (_event$target = event.target) !== null && _event$target !== void 0 && (_event$target$parentN = _event$target.parentNode) !== null && _event$target$parentN !== void 0 && _event$target$parentN.previousElementSibling) {
         var parentNode = event.target.parentNode.previousElementSibling;
         if (eventType === 'enter') {
@@ -37,9 +37,9 @@ var DatagridExpandedRow = function DatagridExpandedRow(ExpandedRowContentCompone
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "__expanded-row-content"),
       style: {
-        height: expandedContentHeight ? expandedContentHeight : null
+        height: expandedContentHeight && expandedContentHeight
       }
-    }, ExpandedRowContentComponent(datagridState)));
+    }, /*#__PURE__*/React.createElement(ExpandedRowContentComponent, datagridState)));
   };
 };
 export default DatagridExpandedRow;

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

@@ -1,6 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * Copyright IBM Corp. 2020, 2023
  *
@@ -8,14 +10,13 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * LICENSE file in the root directory of this source tree.
  */
 
-// @flow
 import React, { useState, useEffect } from 'react';
 import cx from 'classnames';
 import { DataTable } from 'carbon-components-react';
 import { px } from '@carbon/layout';
 import { selectionColumnId } from '../common-column-ids';
 import { pkg } from '../../../settings';
-import { handleColumnResizeEndEvent, handleColumnResizeStartEvent, handleColumnResizingEvent } from './addons/stateReducer';
+import { handleColumnResizeEndEvent, handleColumnResizingEvent } from './addons/stateReducer';
 import { getNodeTextContent } from '../../../global/js/utils/getNodeTextContent';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var getAccessibilityProps = function getAccessibilityProps(header) {
@@ -29,67 +30,45 @@ var getAccessibilityProps = function getAccessibilityProps(header) {
   return props;
 };
 var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
+  var resizerAriaLabel = datagridState.resizerAriaLabel;
   // Used to measure the height of the table and uses that value
   // to display a vertical line to indicate the column you are resizing
   useEffect(function () {
     var tableId = datagridState.tableId;
-    if (tableId) {
-      var gridElement = document.querySelector("#".concat(tableId));
-      var tableElement = gridElement.querySelector('table');
-      var headerRowElement = document.querySelector("#".concat(tableId, " .").concat(blockClass, "__head"));
-      var hasHorizontalScrollbar = tableElement.scrollWidth > tableElement.clientWidth;
-      var scrollBuffer = hasHorizontalScrollbar ? 18 : 2;
-      var tableToolbar = gridElement.querySelector(".".concat(blockClass, "__table-toolbar"));
-      var tableToolbarHeight = (tableToolbar === null || tableToolbar === void 0 ? void 0 : tableToolbar.offsetHeight) || 0;
-      var setCustomValues = function setCustomValues(_ref) {
-        var _ref$rowHeight = _ref.rowHeight,
-          rowHeight = _ref$rowHeight === void 0 ? 48 : _ref$rowHeight,
-          gridHeight = _ref.gridHeight;
-        headerRowElement.style.setProperty("--".concat(blockClass, "--row-height"), px(rowHeight));
-        headerRowElement.style.setProperty("--".concat(blockClass, "--grid-height"), px(gridHeight - scrollBuffer - tableToolbarHeight));
-        headerRowElement.style.setProperty("--".concat(blockClass, "--header-height"), px(headerRowElement.offsetHeight));
-      };
-      setCustomValues({
-        gridHeight: gridElement.offsetHeight,
-        rowHeight: headerRowElement.clientHeight
-      });
-    }
+    var gridElement = document.querySelector("#".concat(tableId));
+    var tableElement = gridElement.querySelector('table');
+    var headerRowElement = document.querySelector("#".concat(tableId, " .").concat(blockClass, "__head"));
+    var hasHorizontalScrollbar = tableElement.scrollWidth > tableElement.clientWidth;
+    var scrollBuffer = hasHorizontalScrollbar ? 18 : 2;
+    var tableToolbar = gridElement.querySelector(".".concat(blockClass, "__table-toolbar"));
+    var tableToolbarHeight = (tableToolbar === null || tableToolbar === void 0 ? void 0 : tableToolbar.offsetHeight) || 0;
+    var setCustomValues = function setCustomValues(_ref) {
+      var _ref$rowHeight = _ref.rowHeight,
+        rowHeight = _ref$rowHeight === void 0 ? 48 : _ref$rowHeight,
+        gridHeight = _ref.gridHeight;
+      headerRowElement.style.setProperty("--".concat(blockClass, "--row-height"), px(rowHeight));
+      headerRowElement.style.setProperty("--".concat(blockClass, "--grid-height"), px(gridHeight - scrollBuffer - tableToolbarHeight));
+      headerRowElement.style.setProperty("--".concat(blockClass, "--header-height"), px(headerRowElement.offsetHeight));
+    };
+    setCustomValues({
+      gridHeight: gridElement.offsetHeight,
+      rowHeight: headerRowElement.clientHeight
+    });
   }, [datagridState.rowSize, datagridState.tableId, datagridState]);
   var _useState = useState(2),
     _useState2 = _slicedToArray(_useState, 1),
     incrementAmount = _useState2[0];
-  var getClientXPosition = function getClientXPosition(event) {
-    var isTouchEvent = false;
-    if (event.type === 'touchstart') {
-      // Do not respond to multiple touches (e.g. 2 or 3 fingers)
-      if (event.touches && event.touches.length > 1) {
-        return;
-      }
-      isTouchEvent = true;
+  var handleOnMouseDownResize = function handleOnMouseDownResize(event, resizeProps) {
+    var _resizeProps = _objectSpread({}, resizeProps()),
+      onMouseDown = _resizeProps.onMouseDown;
+    // When event.button is 2, that is a right click
+    // and we do not want to resize
+    if (event.button === 2 || event.ctrlKey) {
+      event.target.blur();
+      return;
     }
-    var clientX = isTouchEvent ? Math.round(event.touches[0].clientX) : event.clientX;
-    var closestHeader = event.target.closest('th');
-    var closestHeaderCoords = closestHeader.getBoundingClientRect();
-    var headerOffset = closestHeaderCoords.left;
-    var offsetValue = clientX - headerOffset;
-    return offsetValue;
+    onMouseDown === null || onMouseDown === void 0 ? void 0 : onMouseDown(event);
   };
-  useEffect(function () {
-    var isResizing = datagridState.state.isResizing;
-    if (isResizing) {
-      var onColResizeEnd = datagridState.onColResizeEnd;
-      document.addEventListener('mouseup', function () {
-        handleColumnResizeEndEvent(datagridState.dispatch, onColResizeEnd, isResizing);
-        document.activeElement.blur();
-      });
-    }
-    return function () {
-      document.removeEventListener('mouseup', function () {
-        return handleColumnResizeEndEvent(datagridState.dispatch);
-      });
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [datagridState.state.isResizing]);
   return /*#__PURE__*/React.createElement(TableRow, _extends({}, headerGroup.getHeaderGroupProps({
     role: false
   }), {
@@ -112,32 +91,25 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       state = datagridState.state,
       dispatch = datagridState.dispatch,
       onColResizeEnd = datagridState.onColResizeEnd;
-    var columnResizing = state.columnResizing,
-      isResizing = state.isResizing;
-    var columnWidths = columnResizing.columnWidths;
+    var columnResizing = state.columnResizing;
+    var _ref4 = columnResizing || {},
+      columnWidths = _ref4.columnWidths;
     var originalCol = visibleColumns[index];
     return /*#__PURE__*/React.createElement(TableHeader, _extends({}, header.getHeaderProps({
       role: false
     }), {
-      className: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__resizableColumn"), header.getResizerProps), _defineProperty(_cx, "".concat(blockClass, "__isResizing"), header.isResizing), _defineProperty(_cx, "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable), _defineProperty(_cx, "".concat(blockClass, "__isSorted"), header.isSorted), _cx), header.getHeaderProps().className),
-      key: header.id
-    }, getAccessibilityProps(header)), header.render('Header'), header.getResizerProps && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("input", _extends({}, header.getResizerProps(), {
-      onMouseMove: function onMouseMove(event) {
-        if (isResizing) {
-          var newWidth = getClientXPosition(event);
-          // Sets a min width for resizing so at least one character from the column header is visible
-          if (newWidth >= 50) {
-            handleColumnResizingEvent(dispatch, header, newWidth);
-          }
-        }
-      },
-      onMouseDown: function onMouseDown() {
-        return handleColumnResizeStartEvent(dispatch, header.id);
+      className: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__resizableColumn"), header.getResizerProps), _defineProperty(_cx, "".concat(blockClass, "__isResizing"), header.isResizing), _defineProperty(_cx, "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable && header.id !== 'spacer'), _defineProperty(_cx, "".concat(blockClass, "__isSorted"), header.isSorted), _defineProperty(_cx, "".concat(blockClass, "__header-actions-column"), header.isAction), _cx), header.getHeaderProps().className),
+      key: header.id,
+      "aria-hidden": header.id === 'spacer' && 'true'
+    }, getAccessibilityProps(header)), header.render('Header'), header.getResizerProps && !header.isAction && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("input", _extends({}, header.getResizerProps(), {
+      onMouseDown: function onMouseDown(event) {
+        return handleOnMouseDownResize(event, header.getResizerProps);
       },
       onKeyDown: function onKeyDown(event) {
         var key = event.key;
         if (key === 'ArrowLeft' || key === 'ArrowRight') {
-          var currentColumnWidth = columnWidths[header.id] || (datagridState.isTableSortable && originalCol.width < 90 ? 90 : originalCol.width);
+          var originalColMinWidth = originalCol.minWidth || 90;
+          var currentColumnWidth = columnWidths[header.id] || (datagridState.isTableSortable && originalCol.width < originalColMinWidth ? originalColMinWidth : originalCol.width);
           if (key === 'ArrowLeft') {
             if (currentColumnWidth - incrementAmount > Math.max(minWidth, 50)) {
               var newWidth = currentColumnWidth - incrementAmount;
@@ -151,12 +123,12 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
         }
       },
       onKeyUp: function onKeyUp() {
-        return handleColumnResizeEndEvent(dispatch, onColResizeEnd, header.id);
+        return handleColumnResizeEndEvent(dispatch, onColResizeEnd, header.id, true);
       },
       className: cx("".concat(blockClass, "__col-resizer-range")),
       type: "range",
       defaultValue: originalCol.width,
-      "aria-label": "Resize column"
+      "aria-label": resizerAriaLabel || 'Resize column'
     })), /*#__PURE__*/React.createElement("span", {
       className: "".concat(blockClass, "__col-resize-indicator")
     })));

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

@@ -28,8 +28,11 @@ var DatagridRefBody = function DatagridRefBody(datagridState) {
     className: cx("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     prepareRow(row);
+    var _row$getRowProps = row.getRowProps(),
+      key = _row$getRowProps.key;
     return row.RowRenderer(_objectSpread(_objectSpread({}, datagridState), {}, {
-      row: row
+      row: row,
+      key: key
     }));
   }));
 };

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

@@ -35,7 +35,8 @@ var DatagridRow = function DatagridRow(datagridState) {
   var row = datagridState.row,
     rowSize = datagridState.rowSize,
     withNestedRows = datagridState.withNestedRows,
-    prepareRow = datagridState.prepareRow;
+    prepareRow = datagridState.prepareRow,
+    key = datagridState.key;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -93,7 +94,9 @@ var DatagridRow = function DatagridRow(datagridState) {
     }
   };
   var rowClassNames = cx("".concat(blockClass, "__carbon-row"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), _defineProperty(_cx, "".concat(carbon.prefix, "--data-table--selected"), row.isSelected), _cx));
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableRow, _extends({
+  return /*#__PURE__*/React.createElement(React.Fragment, {
+    key: key
+  }, /*#__PURE__*/React.createElement(TableRow, _extends({
     className: rowClassNames
   }, row.getRowProps({
     role: false

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

@@ -3,14 +3,13 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _excluded = ["onChange"];
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2023
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * 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.
  */
-// @flow
+
 import React, { useLayoutEffect, useState } from 'react';
 import { DataTable } from 'carbon-components-react';
 import cx from 'classnames';
@@ -23,6 +22,7 @@ var SelectAll = function SelectAll(datagridState) {
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
   useLayoutEffect(function () {
+    /* istanbul ignore next */
     function updateSize() {
       setWindowSize(window.innerWidth);
     }
@@ -43,15 +43,15 @@ var SelectAll = function SelectAll(datagridState) {
   var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
   if (hideSelectAll || radio) {
     return /*#__PURE__*/React.createElement("div", {
-      className: cx("".concat(blockClass, "__head-hidden-select-all"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
+      className: cx("".concat(blockClass, "__head-hidden-select-all"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), /* istanbul ignore next */
+      isFirstColumnStickyLeft && windowSize > 671))
     });
   }
   var getProps = DatagridPagination ? getToggleAllPageRowsSelectedProps : getToggleAllRowsSelectedProps;
   var _getProps = getProps(),
     onChange = _getProps.onChange,
     selectProps = _objectWithoutProperties(_getProps, _excluded);
-  var _ref = selectProps || {},
-    indeterminate = _ref.indeterminate;
+  var indeterminate = selectProps.indeterminate;
   var handleSelectAllChange = function handleSelectAllChange(event) {
     if (indeterminate) {
       return onChange === null || onChange === void 0 ? void 0 : onChange({
@@ -63,7 +63,8 @@ var SelectAll = function SelectAll(datagridState) {
     return onChange === null || onChange === void 0 ? void 0 : onChange(event);
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: cx("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), _defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
+    className: cx("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), _defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), /* istanbul ignore next */
+    isFirstColumnStickyLeft && windowSize > 671))
   }, /*#__PURE__*/React.createElement(TableSelectAll, _extends({}, selectProps, {
     name: "".concat(tableId, "-select-all-checkbox-name"),
     onSelect: handleSelectAllChange,

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

@@ -25,8 +25,11 @@ var DatagridSimpleBody = function DatagridSimpleBody(datagridState) {
     className: cx("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     prepareRow(row);
+    var _row$getRowProps = row.getRowProps(),
+      key = _row$getRowProps.key;
     return row.RowRenderer(_objectSpread(_objectSpread({}, datagridState), {}, {
-      row: row
+      row: row,
+      key: key
     }));
   }));
 };

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

@@ -15,9 +15,10 @@ import { ButtonMenu, ButtonMenuItem } from '../../ButtonMenu';
 import { pkg, carbon } from '../../../settings';
 import cx from 'classnames';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
+var toolbarClass = "".concat(blockClass, "__table-toolbar");
+var menuClass = "".concat(blockClass, "__button-menu");
 var TableToolbar = DataTable.TableToolbar;
 var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridState, width, ref) {
-  var _Object$keys;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     displayAllInMenu = _useState2[0],
@@ -33,8 +34,12 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
   var selectedRowIds = datagridState.state.selectedRowIds,
     toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     toolbarBatchActions = datagridState.toolbarBatchActions,
-    setGlobalFilter = datagridState.setGlobalFilter;
-  var totalSelected = (_Object$keys = Object.keys(selectedRowIds || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length;
+    setGlobalFilter = datagridState.setGlobalFilter,
+    batchActionMenuButtonLabel = datagridState.batchActionMenuButtonLabel,
+    translateWithIdBatchActions = datagridState.translateWithIdBatchActions;
+  var batchActionMenuButtonLabelText = batchActionMenuButtonLabel !== null && batchActionMenuButtonLabel !== void 0 ? batchActionMenuButtonLabel : 'More';
+  var selectedKeys = Object.keys(selectedRowIds || {});
+  var totalSelected = selectedKeys.length;
 
   // Get initial width of batch actions container,
   // used to measure when all items are put inside
@@ -64,25 +69,25 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       return null;
     }
     return /*#__PURE__*/React.createElement(ButtonMenu, {
-      label: width > minWidthBeforeOverflowIcon ? 'More' : null,
+      label: width > minWidthBeforeOverflowIcon ? batchActionMenuButtonLabelText : null,
       renderIcon: width > minWidthBeforeOverflowIcon ? Add16 : OverflowMenuVertical16,
-      className: cx("".concat(blockClass, "__button-menu"), _defineProperty({}, "".concat(blockClass, "__button-menu--icon-only"), width <= minWidthBeforeOverflowIcon)),
-      menuOptionsClass: "".concat(blockClass, "__button-menu-options"),
+      className: cx([menuClass, _defineProperty({}, "".concat(menuClass, "--icon-only"), width <= minWidthBeforeOverflowIcon)]),
+      menuOptionsClass: "".concat(menuClass, "-options"),
       flipped: true
-    }, toolbarBatchActions && toolbarBatchActions.map(function (batchAction, index) {
-      if (index < 2 && !displayAllInMenu) {
-        return;
-      }
-      return /*#__PURE__*/React.createElement(ButtonMenuItem, {
-        key: "".concat(batchAction.label, "-").concat(index),
-        itemText: batchAction.label,
-        onClick: function onClick() {
-          batchAction.onClick();
-          if (batchAction.type === 'select_all') {
-            toggleAllRowsSelected(true);
+    }, toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
+      var hidden = index < 2 && !displayAllInMenu;
+      if (!hidden) {
+        return /*#__PURE__*/React.createElement(ButtonMenuItem, {
+          key: "".concat(batchAction.label, "-").concat(index),
+          itemText: batchAction.label,
+          onClick: function onClick() {
+            batchAction.onClick();
+            if (batchAction.type === 'select_all') {
+              toggleAllRowsSelected(true);
+            }
           }
-        }
-      });
+        });
+      }
     }));
   };
 
@@ -95,7 +100,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     onCancel: function onCancel() {
       toggleAllRowsSelected(false);
       setGlobalFilter(null);
-    }
+    },
+    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.createElement(TableBatchAction, {
@@ -120,12 +126,12 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
     DatagridBatchActions = datagridState.DatagridBatchActions,
     batchActions = datagridState.batchActions,
     rowSize = datagridState.rowSize;
-  var getRowHeight = rowSize ? rowSize : 'lg';
+  var getRowHeight = rowSize || 'lg';
   return batchActions && DatagridActions ? /*#__PURE__*/React.createElement("div", {
     ref: ref,
-    className: cx("".concat(blockClass, "__table-toolbar"), "".concat(blockClass, "__table-toolbar--").concat(getRowHeight))
+    className: cx([toolbarClass, "".concat(toolbarClass, "--").concat(getRowHeight)])
   }, /*#__PURE__*/React.createElement(TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass, "__table-toolbar")
+    className: toolbarClass
   }, /*#__PURE__*/React.createElement(TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
 };
 export default DatagridToolbar;

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

@@ -2,13 +2,13 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020 - 2023
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * 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 React, { useEffect } from 'react';
 import { VariableSizeList } from 'react-window';
 import { DataTable } from 'carbon-components-react';
@@ -23,12 +23,7 @@ var rowSizeMap = {
   sm: 32,
   md: 40,
   lg: 48,
-  xl: 64,
-  // TODO: deprecate the below values in next major release (v8) on carbon-components-react
-  short: 32,
-  compact: 24,
-  normal: 48,
-  tall: 64
+  xl: 64
 };
 var defaultRowHeight = rowSizeMap.lg;
 var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
@@ -47,13 +42,17 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     page = datagridState.page,
     handleResize = datagridState.handleResize,
     gridRef = datagridState.gridRef;
+
+  /* istanbul ignore next */
   var handleVirtualGridResize = function handleVirtualGridResize() {
     var gridRefElement = gridRef === null || gridRef === void 0 ? void 0 : gridRef.current;
     gridRefElement.style.width = gridRefElement === null || gridRefElement === void 0 ? void 0 : gridRefElement.clientWidth;
   };
   useResizeObserver(gridRef, handleVirtualGridResize);
-  var syncScroll = function syncScroll(e) {
-    var virtualBody = e.target;
+
+  /* istanbul ignore next */
+  var syncScroll = function syncScroll(event) {
+    var virtualBody = event.target;
     document.querySelector(".".concat(blockClass, "__head-wrap")).scrollLeft = virtualBody.scrollLeft;
     var spacerColumn = document.querySelector(".".concat(blockClass, "__head-wrap thead th:last-child"));
     spacerColumn.style.width = px(32 + (virtualBody.offsetWidth - virtualBody.clientWidth)); // scrollbar width to header column to fix header alignment
@@ -76,9 +75,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
   }, /*#__PURE__*/React.createElement(DatagridHead, datagridState)), /*#__PURE__*/React.createElement(TableBody, _extends({}, getTableBodyProps({
     role: false
   }), {
-    onScroll: function onScroll(e) {
-      return syncScroll(e);
-    }
+    onScroll: syncScroll
   }), /*#__PURE__*/React.createElement(VariableSizeList, {
     height: virtualHeight || tableHeight,
     itemCount: visibleRows.length,
@@ -98,10 +95,13 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
       style = _ref.style;
     var row = visibleRows[index];
     prepareRow(row);
+    var _row$getRowProps = row.getRowProps(),
+      key = _row$getRowProps.key;
     return /*#__PURE__*/React.createElement("div", {
       style: _objectSpread({}, style)
     }, row.RowRenderer(_objectSpread(_objectSpread({}, datagridState), {}, {
-      row: row
+      row: row,
+      key: key
     })));
   })));
 };