@carbon/ibm-products 1.61.1 → 1.62.1

package/es/components/Datagrid/Datagrid.stories/StickyActionsColumnStory.js

@@ -45,7 +45,7 @@
 
 //     ## Sample usage:
 //     1. include \`useActionsColumn\` hook
-//     2. add \`isAction = true\` to the column object in which you which to add the overflow menu actions
+//     2. add \`isAction = true\` to the column object in which you wish to add the overflow menu actions
 //     3. add \`rowActions = []\` array to the props
 //       - \`rowActions[].id\` for callback to identify the action is called
 //       - \`rowActions[].onClick(actionId: string, row: Row, event: ClickEvent)\` callback on menuitem clicked. [Row properties](https://react-table.tanstack.com/docs/api/useTable#row-properties)

package/es/components/Datagrid/useActionsColumn.js

@@ -12,15 +12,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, { useEffect } from 'react';
+import React from 'react';
 import cx from 'classnames';
 import { IconSkeleton, OverflowMenu, OverflowMenuItem } from 'carbon-components-react';
 import { pkg } from '../../settings';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useActionsColumn = function useActionsColumn(hooks) {
-  useEffect(function () {
-    pkg.checkReportFeatureEnabled('Datagrid.useActionsColumn');
-  }, []);
   var useAttachActionsOnInstance = function useAttachActionsOnInstance(instance) {
     var rowActions = instance.rowActions,
       isFetching = instance.isFetching,
@@ -41,12 +38,13 @@ var useActionsColumn = function useActionsColumn(hooks) {
           column = cell.column;
         if (column.isAction) {
           var _cx3;
+          var isColumnSticky = !!column.sticky;
           return [props, {
             children: /*#__PURE__*/React.createElement("div", {
               className: "".concat(blockClass, "__actions-column-contents")
             }, isFetching && /*#__PURE__*/React.createElement(IconSkeleton, {
               className: "".concat(blockClass, "__actions-column-loading")
-            }), !isFetching && rowActions.length <= 2 && /*#__PURE__*/React.createElement("div", {
+            }), !isFetching && rowActions.length <= 2 && !isColumnSticky && /*#__PURE__*/React.createElement("div", {
               className: "".concat(blockClass, "_actions-column"),
               style: {
                 display: 'flex'
@@ -70,6 +68,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
                 hasIconOnly: true,
                 light: true,
                 iconDescription: itemText,
+                ariaLabel: itemText,
                 kind: "ghost",
                 className: cx(_defineProperty({}, "".concat(blockClass, "__disabled-row-action"), getDisabledState(row.index))),
                 onClick: function onClick(e) {
@@ -81,7 +80,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
                   _onClick(id, row, e);
                 }
               })));
-            })), !isFetching && rowActions.length > 2 && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(OverflowMenu, {
+            })), !isFetching && (rowActions.length > 2 || isColumnSticky) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(OverflowMenu, {
               size: "sm",
               light: true,
               flipped: true,
@@ -111,9 +110,9 @@ var useActionsColumn = function useActionsColumn(hooks) {
                 key: id
               }));
             })))),
-            className: cx((_cx3 = {}, _defineProperty(_cx3, "".concat(blockClass, "__actions-column-cell"), true), _defineProperty(_cx3, "".concat(blockClass, "__cell"), true), _cx3)),
+            className: cx((_cx3 = {}, _defineProperty(_cx3, "".concat(blockClass, "__actions-column-cell"), true), _defineProperty(_cx3, "".concat(blockClass, "__cell"), true), _defineProperty(_cx3, "".concat(blockClass, "__actions-column-cell-non-sticky"), !isColumnSticky), _cx3)),
             style: {
-              width: rowActions.length > 2 ? 48 : 96
+              width: rowActions.length > 2 || isColumnSticky ? 48 : 96
             }
           }];
         }
@@ -128,9 +127,10 @@ var useActionsColumn = function useActionsColumn(hooks) {
       var addHeaderWidth = function addHeaderWidth(props, cellData) {
         var column = cellData.column;
         if (column.isAction) {
+          var isColumnSticky = !!column.sticky;
           return [props, {
             style: _objectSpread(_objectSpread({}, props.style), {}, {
-              width: rowActions.length > 2 ? 48 : 96 // set header width based on action length
+              width: rowActions.length > 2 || isColumnSticky ? 48 : 96 // set header width based on action length
             })
           }];
         }

package/es/components/Datagrid/useDatagrid.js

@@ -22,8 +22,19 @@ import useFloatingScroll from './useFloatingScroll';
 import { stateReducer } from './Datagrid/addons/stateReducer';
 var useDatagrid = function useDatagrid(params) {
   var defaultPlugins = [useFlexLayout, useHeaderRow, useSkeletonRows, useResizeColumns, useRowRenderer, useDefaultStringRenderer, useRowSize, useFilters, useGlobalFilter, useSortBy, useExpanded];
+
+  // Disable resizing
+  if (params.disableResizing) {
+    var resizeIndex = defaultPlugins.findIndex(function (p) {
+      return p.pluginName === 'useResizeColumns';
+    });
+    defaultPlugins.splice(resizeIndex, 1);
+  }
   var defaultEndPlugins = [usePagination, useRowSelect, useFlexResize, useFloatingScroll];
   var clientEndPlugins = params.endPlugins || [];
+  var defaultColumn = {
+    minWidth: 50
+  };
   var tableId = useMemo(function () {
     return uniqueId('datagrid-table-id');
   }, []);
@@ -33,7 +44,8 @@ var useDatagrid = function useDatagrid(params) {
   var tableState = useTable.apply(void 0, [_objectSpread(_objectSpread({
     tableId: tableId
   }, params), {}, {
-    stateReducer: stateReducer
+    stateReducer: stateReducer,
+    defaultColumn: defaultColumn
   })].concat(defaultPlugins, plugins, defaultEndPlugins, _toConsumableArray(clientEndPlugins)));
   return tableState;
 };

package/es/components/Datagrid/useExpandedRow.js

@@ -9,14 +9,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * LICENSE file in the root directory of this source tree.
  */
 
-import { useEffect, useState } from 'react';
-import { pkg } from '../../settings';
+import { useState } from 'react';
 import DatagridExpandedRow from './Datagrid/DatagridExpandedRow';
 import useRowExpander from './useRowExpander';
 var useExpandedRow = function useExpandedRow(hooks) {
-  useEffect(function () {
-    pkg.checkReportFeatureEnabled('Datagrid.useExpandedRow');
-  }, []);
   useRowExpander(hooks);
   var useInstance = function useInstance(instance) {
     var rows = instance.rows,
@@ -38,7 +34,8 @@ var useExpandedRow = function useExpandedRow(hooks) {
     });
     Object.assign(instance, {
       rows: rowsWithExpand,
-      setExpandedRowHeight: setExpandedRowHeight
+      setExpandedRowHeight: setExpandedRowHeight,
+      withExpandedRows: true
     });
   };
   hooks.useInstance.push(useInstance);

package/es/components/Datagrid/useFlexResize.js

@@ -1,27 +1,37 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * 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.
  */
+
 var useFlexResize = function useFlexResize(hooks) {
-  var spacerColumn = {
+  var spacer = {
     id: 'spacer',
     width: 0,
     disableSortBy: true,
     disableResizing: true
   };
   hooks.visibleColumns.push(function (columns) {
-    return [].concat(_toConsumableArray(columns), [spacerColumn]);
+    // always move actions and spacer to the end
+    var actionsIdx = columns.findIndex(function (col) {
+      return col.isAction;
+    });
+    if (actionsIdx === -1) {
+      return [].concat(_toConsumableArray(columns), [spacer]);
+    }
+    var cols = _toConsumableArray(columns);
+    var actions = cols.splice(actionsIdx, 1)[0];
+    cols.splice(columns.length, 0, spacer, actions);
+    return cols;
   });
   var changeProps = function changeProps(props, data) {
     var column = data.column;
     if (!column && data.cell) {
       column = data.cell.column;
     }
-    if (column.id === spacerColumn.id) {
+    if (column.id === spacer.id) {
       return [props, {
         style: {
           flex: '1 1 0'

package/es/components/Datagrid/useFocusRowExpander.js

@@ -0,0 +1,40 @@
+/**
+ * Copyright IBM Corp. 2023, 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 { useEffect } from 'react';
+
+// Focuses the row expander after a nested/expandable row state change.
+// We have to add this workaround because react-table is re-rendering the entire row
+// which removes the focus from the expander and interrupts the keyboard navigation
+// flow.
+export var useFocusRowExpander = function useFocusRowExpander(_ref) {
+  var instance = _ref.instance,
+    _ref$lastExpandedRowI = _ref.lastExpandedRowIndex,
+    lastExpandedRowIndex = _ref$lastExpandedRowI === void 0 ? 0 : _ref$lastExpandedRowI,
+    blockClass = _ref.blockClass,
+    activeElement = _ref.activeElement;
+  useEffect(function () {
+    // We need to return at this point so that the focus is not stolen from
+    // other interactive elements in the Datagrid
+    if (!activeElement.classList.contains("".concat(blockClass, "__row-expander"))) {
+      return;
+    }
+    var tableId = instance === null || instance === void 0 ? void 0 : instance.tableId;
+    var rowElements = document.querySelectorAll("#".concat(tableId, " tbody tr"));
+    var rowElementsArray = Array.from(rowElements);
+    var activeRow = rowElementsArray.filter(function (r) {
+      if (r.getAttribute('data-nested-row-id') === lastExpandedRowIndex) {
+        return r;
+      }
+      return null;
+    });
+    if (activeRow.length) {
+      var rowExpander = activeRow[0].querySelector(".".concat(blockClass, "__row-expander"));
+      rowExpander.focus();
+    }
+  }, [instance === null || instance === void 0 ? void 0 : instance.tableId, instance === null || instance === void 0 ? void 0 : instance.expandedRows, lastExpandedRowIndex, blockClass, activeElement]);
+};

package/es/components/Datagrid/useInfiniteScroll.js

@@ -1,10 +1,10 @@
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * 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 { useCallback } from 'react';
 import debounce from 'lodash/debounce';
 import useParentDimensions from './useParentDimensions';
@@ -17,10 +17,11 @@ var useInfiniteScroll = function useInfiniteScroll(hooks) {
       tableHeight = instance.tableHeight,
       innerListRef = instance.innerListRef,
       fetchMoreData = instance.fetchMoreData,
-      tableId = instance.tableId;
+      tableId = instance.tableId,
+      loadMoreThreshold = instance.loadMoreThreshold;
     var tableElement = document.querySelector("#".concat(tableId));
     var totalTableHeight = tableHeight || (tableElement === null || tableElement === void 0 ? void 0 : tableElement.clientHeight);
-    var loadMoreThreshold = 200;
+    var loadMoreThresholdValue = typeof loadMoreThreshold === 'number' ? loadMoreThreshold : 200;
     var emptyFetchData = function emptyFetchData() {};
     // eslint-disable-next-line react-hooks/exhaustive-deps
     var fetchMore = useCallback(debounce(fetchMoreData || emptyFetchData, 3000, {
@@ -31,7 +32,7 @@ var useInfiniteScroll = function useInfiniteScroll(hooks) {
       var scrollDirection = _ref.scrollDirection,
         scrollOffset = _ref.scrollOffset;
       if (innerListRef && innerListRef.current) {
-        if (!isFetching && scrollDirection === 'forward' && scrollOffset + totalTableHeight >= innerListRef.current.clientHeight - loadMoreThreshold) {
+        if (!isFetching && scrollDirection === 'forward' && scrollOffset + totalTableHeight >= innerListRef.current.clientHeight - loadMoreThresholdValue) {
           if (fetchMoreData) {
             fetchMore();
           }

package/es/components/Datagrid/useNestedRowExpander.js

@@ -15,12 +15,20 @@ import React, { useRef } from 'react';
 import { ChevronRight16 } from '@carbon/icons-react';
 import cx from 'classnames';
 import { pkg, carbon } from '../../settings';
+import { useFocusRowExpander } from './useFocusRowExpander';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRowExpander = function useNestedRowExpander(hooks) {
   var tempState = useRef();
+  var lastExpandedRowIndex = useRef();
   var useInstance = function useInstance(instance) {
     tempState.current = instance;
   };
+  useFocusRowExpander({
+    instance: tempState === null || tempState === void 0 ? void 0 : tempState.current,
+    lastExpandedRowIndex: lastExpandedRowIndex === null || lastExpandedRowIndex === void 0 ? void 0 : lastExpandedRowIndex.current,
+    blockClass: blockClass,
+    activeElement: document.activeElement
+  });
   var visibleColumns = function visibleColumns(columns) {
     var expanderColumn = {
       id: 'expander',
@@ -32,6 +40,7 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
             // Prevents `onRowClick` from being called if `useOnRowClick` is included
             event.stopPropagation();
             row.toggleRowExpanded();
+            lastExpandedRowIndex.current = row.id;
           }
         });
         var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},

package/es/components/Datagrid/useNestedRows.js

@@ -6,15 +6,11 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
  * LICENSE file in the root directory of this source tree.
  */
 
-import { useEffect } from 'react';
 import { pkg } from '../../settings';
 import cx from 'classnames';
 import useNestedRowExpander from './useNestedRowExpander';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
-  useEffect(function () {
-    pkg.checkReportFeatureEnabled('Datagrid.useNestedRows');
-  }, []);
   useNestedRowExpander(hooks);
   var marginLeft = 24;
   var getRowProps = function getRowProps(props, _ref) {

package/es/components/Datagrid/useOnRowClick.js

@@ -1,9 +1,8 @@
-/*
- * 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 { pkg, carbon } from '../../settings';
@@ -43,7 +42,7 @@ var useOnRowClick = function useOnRowClick(hooks) {
       var onKeyDown = function onKeyDown(event) {
         var key = event.key;
         if (key === 'Enter') {
-          onClick();
+          onClick(event);
         }
       };
       return [props, {

package/es/components/Datagrid/useParentDimensions.js

@@ -1,11 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * 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 { useRef, useState } from 'react';
 var useParentDimensions = function useParentDimensions(hooks) {
   var rootRef = useRef();

package/es/components/Datagrid/useResizeTable.js

@@ -1,10 +1,10 @@
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * 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 { useLayoutEffect } from 'react';
 var useResizeTable = function useResizeTable(hooks) {
   var useInstanceBeforeDimensions = function useInstanceBeforeDimensions(instance) {
@@ -26,7 +26,7 @@ var useResizeTable = function useResizeTable(hooks) {
           resizeObserver = null;
         };
       }
-      return console.error(' Could not resize table, no support for ResizeObserver');
+      return console.error('Could not resize table, no support for ResizeObserver');
     }, [handleResize, parent]);
   };
   hooks.useInstanceBeforeDimensions.push(useInstanceBeforeDimensions);

package/es/components/Datagrid/useRowExpander.js

@@ -15,12 +15,20 @@ import React, { useRef } from 'react';
 import { ChevronDown16, ChevronUp16 } from '@carbon/icons-react';
 import cx from 'classnames';
 import { pkg, carbon } from '../../settings';
+import { useFocusRowExpander } from './useFocusRowExpander';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useRowExpander = function useRowExpander(hooks) {
   var tempState = useRef();
+  var lastExpandedRowIndex = useRef();
   var useInstance = function useInstance(instance) {
     tempState.current = instance;
   };
+  useFocusRowExpander({
+    instance: tempState === null || tempState === void 0 ? void 0 : tempState.current,
+    lastExpandedRowIndex: lastExpandedRowIndex === null || lastExpandedRowIndex === void 0 ? void 0 : lastExpandedRowIndex.current,
+    blockClass: blockClass,
+    activeElement: document.activeElement
+  });
   var visibleColumns = function visibleColumns(columns) {
     var expanderColumn = {
       id: 'expander',
@@ -31,6 +39,7 @@ var useRowExpander = function useRowExpander(hooks) {
             // Prevents `onRowClick` from being called if `useOnRowClick` is included
             event.stopPropagation();
             row.toggleRowExpanded();
+            lastExpandedRowIndex.current = row.id;
           }
         });
         var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},

package/es/components/Datagrid/useSelectAllToggle.js

@@ -13,7 +13,7 @@ import cx from 'classnames';
 import { selectionColumnId } from './common-column-ids';
 import SelectAllWithToggle from './Datagrid/DatagridSelectAllWithToggle';
 import { pkg } from '../../settings';
-var blockClass = "".concat(pkg.prefix, "--datagrid");
+var blockClass = "".concat(pkg.prefix, "--datagrid__select-all");
 var useSelectAllToggle = function useSelectAllToggle(hooks) {
   useSelectAllWithToggleComponent(hooks);
   useAddClassNameToSelectRow(hooks);
@@ -60,7 +60,7 @@ var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
     var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
     if (column.id === selectionColumnId && DatagridPagination) {
       return [props, {
-        className: cx("".concat(blockClass, "__select-all-toggle-on"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
+        className: cx(["".concat(blockClass, "-toggle-on"), _defineProperty({}, "".concat(blockClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)])
       }];
     }
     return [props];

package/es/components/Datagrid/useSelectRows.js

@@ -3,24 +3,25 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["onChange"];
+var _excluded = ["onChange", "title"];
 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. 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 cx from 'classnames';
 import { TableSelectRow } from 'carbon-components-react';
 import { SelectAll } from './Datagrid/DatagridSelectAll';
 import { selectionColumnId } from './common-column-ids';
 import { pkg, carbon } from '../../settings';
+import { handleToggleRowSelected } from './Datagrid/addons/stateReducer';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
+var checkboxClass = "".concat(blockClass, "__checkbox-cell");
 var useSelectRows = function useSelectRows(hooks) {
   useHighlightSelection(hooks);
   var useInstance = function useInstance(instance) {
@@ -41,7 +42,14 @@ var useSelectRows = function useSelectRows(hooks) {
     });
   });
   hooks.visibleColumns.push(function (columns) {
-    return [{
+    // Ensures that the first column is the row expander in the
+    // case of selected rows and expandable rows being used together
+    var newColOrder = _toConsumableArray(columns);
+    var expanderColumnIndex = newColOrder.findIndex(function (col) {
+      return col.id === 'expander';
+    });
+    var expanderCol = expanderColumnIndex > -1 ? newColOrder.splice(expanderColumnIndex, 1) : [];
+    return [].concat(_toConsumableArray(expanderColumnIndex > -1 && expanderCol && expanderCol.length ? expanderCol : []), [{
       id: selectionColumnId,
       Header: function Header(gridState) {
         return /*#__PURE__*/React.createElement(SelectAll, gridState);
@@ -49,14 +57,17 @@ var useSelectRows = function useSelectRows(hooks) {
       Cell: function Cell(gridState) {
         return /*#__PURE__*/React.createElement(SelectRow, gridState);
       }
-    }].concat(_toConsumableArray(columns));
+    }], _toConsumableArray(newColOrder));
   });
 };
 var useHighlightSelection = function useHighlightSelection(hooks) {
   var getRowProps = function getRowProps(props, _ref) {
+    var _ref2;
     var row = _ref.row;
+    var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
+      checked = _row$getToggleRowSele.checked;
     return [props, {
-      className: cx("".concat(blockClass, "__carbon-row"), row.getToggleRowSelectedProps().checked ? "".concat(carbon.prefix, "--data-table--selected ").concat(blockClass, "__active-row") : '')
+      className: cx(["".concat(blockClass, "__carbon-row"), (_ref2 = {}, _defineProperty(_ref2, "".concat(carbon.prefix, "--data-table--selected"), checked), _defineProperty(_ref2, "".concat(blockClass, "__active-row"), checked), _ref2)])
     }];
   };
   hooks.getRowProps.push(getRowProps);
@@ -73,7 +84,9 @@ var SelectRow = function SelectRow(datagridState) {
     onRadioSelect = datagridState.onRadioSelect,
     onRowSelect = datagridState.onRowSelect,
     columns = datagridState.columns,
-    withStickyColumn = datagridState.withStickyColumn;
+    withStickyColumn = datagridState.withStickyColumn,
+    dispatch = datagridState.dispatch,
+    getRowId = datagridState.getRowId;
   var _useState = useState(window.innerWidth),
     _useState2 = _slicedToArray(_useState, 2),
     windowSize = _useState2[0],
@@ -88,28 +101,37 @@ var SelectRow = function SelectRow(datagridState) {
     };
   }, []);
   var selectDisabled = isFetching || row.getRowProps().selectDisabled;
-  var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
-    onChange = _row$getToggleRowSele.onChange,
-    selectProps = _objectWithoutProperties(_row$getToggleRowSele, _excluded);
+  var _row$getToggleRowSele2 = row.getToggleRowSelectedProps(),
+    onChange = _row$getToggleRowSele2.onChange,
+    title = _row$getToggleRowSele2.title,
+    selectProps = _objectWithoutProperties(_row$getToggleRowSele2, _excluded);
   var cellProps = cell.getCellProps();
   var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
+  var onSelectHandler = function onSelectHandler(event) {
+    event.stopPropagation(); // avoid triggering onRowClick
+    if (radio) {
+      toggleAllRowsSelected(false);
+      if (onRadioSelect) {
+        onRadioSelect(row);
+      }
+    }
+    onChange(event);
+    onRowSelect === null || onRowSelect === void 0 ? void 0 : onRowSelect(row, event);
+    handleToggleRowSelected({
+      dispatch: dispatch,
+      rowData: row,
+      isChecked: event.target.checked,
+      getRowId: getRowId
+    });
+  };
+  var rowId = "".concat(tableId, "-").concat(row.index);
   return /*#__PURE__*/React.createElement(TableSelectRow, _extends({}, cellProps, selectProps, {
     radio: radio,
-    onSelect: function onSelect(e) {
-      e.stopPropagation(); // avoid triggering onRowClick
-      if (radio) {
-        toggleAllRowsSelected(false);
-        if (onRadioSelect) {
-          onRadioSelect(row);
-        }
-      }
-      onChange(e);
-      onRowSelect === null || onRowSelect === void 0 ? void 0 : onRowSelect(row, e);
-    },
-    id: "".concat(tableId, "-").concat(row.index),
-    name: "".concat(tableId, "-").concat(row.index, "-name"),
-    className: cx("".concat(blockClass, "__checkbox-cell"), cellProps.className, _defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)),
-    ariaLabel: "".concat(tableId, "-row-").concat(row.index) // TODO: aria label should be i18n'ed
+    onSelect: onSelectHandler,
+    id: rowId,
+    name: "".concat(rowId, "-name"),
+    className: cx(["".concat(checkboxClass, "__checkbox-cell"), cellProps.className, _defineProperty({}, "".concat(checkboxClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)]),
+    ariaLabel: title // TODO: aria label should be i18n'ed
     ,
     disabled: selectDisabled
   }));

package/es/components/Datagrid/useSkeletonRows.js

@@ -1,11 +1,11 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * 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.
  */
+
 var useSkeletons = function useSkeletons(hooks) {
   var useInstance = function useInstance(instance) {
     var isFetching = instance.isFetching,

package/es/components/Datagrid/useSortableColumns.js

@@ -28,9 +28,8 @@ var getAriaSortValue = function getAriaSortValue(col, _ref) {
   if (!col) {
     return;
   }
-  var _ref2 = col || {},
-    isSorted = _ref2.isSorted,
-    isSortedDesc = _ref2.isSortedDesc;
+  var isSorted = col.isSorted,
+    isSortedDesc = col.isSortedDesc;
   if (!isSorted) {
     return defaultSortableLabelText;
   }
@@ -42,9 +41,9 @@ var getAriaSortValue = function getAriaSortValue(col, _ref) {
   }
 };
 var useSortableColumns = function useSortableColumns(hooks) {
-  var sortableVisibleColumns = function sortableVisibleColumns(visibleColumns, _ref3) {
+  var sortableVisibleColumns = function sortableVisibleColumns(visibleColumns, _ref2) {
     var _instance$customizeCo;
-    var instance = _ref3.instance;
+    var instance = _ref2.instance;
     var onSort = instance.onSort,
       ascendingSortableLabelText = instance.ascendingSortableLabelText,
       descendingSortableLabelText = instance.descendingSortableLabelText,