@carbon/ibm-products 2.17.0 → 2.17.2

package/es/global/js/package-settings.js

@@ -80,8 +80,6 @@ var defaults = {
     'default-portal-target-body': true,
     'Datagrid.useInlineEdit': false,
     'Datagrid.useEditableCell': false,
-    'Datagrid.useExpandedRow': false,
-    'Datagrid.useNestedRows': false,
     'Datagrid.useFiltering': false,
     'Datagrid.useCustomizeColumns': false,
     'ExampleComponent.secondaryIcon': false,

package/lib/components/CreateSidePanel/CreateSidePanel.js

@@ -16,7 +16,7 @@ var _devtools = require("../../global/js/utils/devtools");
 var _react2 = require("@carbon/react");
 var _SidePanel = require("../SidePanel");
 var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
-var _excluded = ["className", "children", "disableSubmit", "formTitle", "formDescription", "onRequestClose", "onRequestSubmit", "open", "primaryButtonText", "secondaryButtonText", "selectorPageContent", "selectorPrimaryFocus", "subtitle", "title"];
+var _excluded = ["className", "children", "disableSubmit", "formTitle", "formDescription", "id", "onRequestClose", "onRequestSubmit", "open", "primaryButtonText", "secondaryButtonText", "selectorPageContent", "selectorPrimaryFocus", "subtitle", "title"];
 /**
  * Copyright IBM Corp. 2021, 2021
  *
@@ -43,6 +43,7 @@ var CreateSidePanel = exports.CreateSidePanel = /*#__PURE__*/_react.default.forw
     disableSubmit = _ref.disableSubmit,
     formTitle = _ref.formTitle,
     formDescription = _ref.formDescription,
+    id = _ref.id,
     onRequestClose = _ref.onRequestClose,
     onRequestSubmit = _ref.onRequestSubmit,
     open = _ref.open,
@@ -69,6 +70,7 @@ var CreateSidePanel = exports.CreateSidePanel = /*#__PURE__*/_react.default.forw
   }];
   var formTitleId = (0, _uuidv.default)();
   return selectorPageContent && /*#__PURE__*/_react.default.createElement(_SidePanel.SidePanel, (0, _extends2.default)({}, rest, _objectSpread({
+    id: id,
     open: open,
     ref: ref,
     selectorPageContent: selectorPageContent,
@@ -121,6 +123,10 @@ CreateSidePanel.propTypes = {
    * Specifies a required field that provides a title for a form
    */
   formTitle: _propTypes.default.node.isRequired,
+  /**
+   * Unique identifier
+   */
+  id: _propTypes.default.string,
   /**
    * Specifies an optional handler which is called when the CreateSidePanel
    * is closed.

package/lib/components/CreateTearsheet/preview-components/MultiStepTearsheet.js

@@ -15,7 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../../settings");
 var _CreateTearsheet = require("../CreateTearsheet");
 var _CreateTearsheetStep = require("../CreateTearsheetStep");
-var _excluded = ["value1", "setValue1"];
+var _excluded = ["value1", "setValue1"],
+  _excluded2 = ["backButtonText", "cancelButtonText", "className", "description", "firstFocusElement", "influencerWidth", "label", "nextButtonText", "submitButtonText", "title"];
 /* eslint-disable react/prop-types */
 /**
  * Copyright IBM Corp. 2021, 2023
@@ -57,7 +58,8 @@ var MultiStepTearsheet = exports.MultiStepTearsheet = function MultiStepTearshee
     label = _ref2.label,
     nextButtonText = _ref2.nextButtonText,
     submitButtonText = _ref2.submitButtonText,
-    title = _ref2.title;
+    title = _ref2.title,
+    rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   var _useState = (0, _react.useState)(750),
     _useState2 = (0, _slicedToArray2.default)(_useState, 1),
     simulatedDelay = _useState2[0];
@@ -121,7 +123,7 @@ var MultiStepTearsheet = exports.MultiStepTearsheet = function MultiStepTearshee
     onClick: function onClick() {
       return setOpen(!open);
     }
-  }, open ? 'Close CreateTearsheet' : 'Open CreateTearsheet'), /*#__PURE__*/_react.default.createElement(_CreateTearsheet.CreateTearsheet, {
+  }, open ? 'Close CreateTearsheet' : 'Open CreateTearsheet'), /*#__PURE__*/_react.default.createElement(_CreateTearsheet.CreateTearsheet, (0, _extends2.default)({
     influencerWidth: influencerWidth,
     label: label,
     className: (0, _classnames.default)(blockClass, className),
@@ -142,7 +144,7 @@ var MultiStepTearsheet = exports.MultiStepTearsheet = function MultiStepTearshee
       });
     },
     firstFocusElement: firstFocusElement
-  }, /*#__PURE__*/_react.default.createElement(_CreateTearsheetStep.CreateTearsheetStep, {
+  }, rest), /*#__PURE__*/_react.default.createElement(_CreateTearsheetStep.CreateTearsheetStep, {
     onNext: function onNext() {
       return new Promise(function (resolve, reject) {
         setTimeout(function () {

package/lib/components/Datagrid/Datagrid/DatagridExpandedRow.js

@@ -41,12 +41,14 @@ var DatagridExpandedRow = function DatagridExpandedRow(ExpandedRowContentCompone
       onMouseLeave: function onMouseLeave(event) {
         return toggleParentHoverClass(event);
       }
+    }, /*#__PURE__*/_react.default.createElement("td", {
+      className: "".concat(blockClass, "__expanded-row-cell-wrapper")
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "__expanded-row-content"),
       style: {
         height: expandedContentHeight && expandedContentHeight
       }
-    }, /*#__PURE__*/_react.default.createElement(ExpandedRowContentComponent, datagridState)));
+    }, /*#__PURE__*/_react.default.createElement(ExpandedRowContentComponent, datagridState))));
   };
 };
 var _default = exports.default = DatagridExpandedRow;

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

@@ -38,7 +38,9 @@ var DatagridRow = function DatagridRow(datagridState) {
     rowSize = datagridState.rowSize,
     withNestedRows = datagridState.withNestedRows,
     prepareRow = datagridState.prepareRow,
-    key = datagridState.key;
+    key = datagridState.key,
+    tableId = datagridState.tableId,
+    withExpandedRows = datagridState.withExpandedRows;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -67,7 +69,7 @@ var DatagridRow = function DatagridRow(datagridState) {
     hoverRow === null || hoverRow === void 0 || (_hoverRow$style3 = hoverRow.style) === null || _hoverRow$style3 === void 0 || _hoverRow$style3.setProperty("--".concat(blockClass, "--indicator-offset-amount"), (0, _layout.px)((rowExpanderButton === null || rowExpanderButton === void 0 ? void 0 : rowExpanderButton.offsetLeft) || 0));
   };
   var focusRemover = function focusRemover() {
-    var elements = document.querySelectorAll(".".concat(blockClass, "__carbon-row-expanded"));
+    var elements = document.querySelectorAll("#".concat(tableId, " .").concat(blockClass, "__carbon-row-expanded"));
     elements.forEach(function (el) {
       el.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
     });
@@ -96,6 +98,14 @@ var DatagridRow = function DatagridRow(datagridState) {
     }
   };
   var rowClassNames = (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx));
+  var setAdditionalRowProps = function setAdditionalRowProps() {
+    if (withNestedRows || withExpandedRows) {
+      return {
+        'data-nested-row-id': row.id
+      };
+    }
+    return {};
+  };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
     key: key
   }, /*#__PURE__*/_react.default.createElement(_react2.TableRow, (0, _extends2.default)({
@@ -107,7 +117,7 @@ var DatagridRow = function DatagridRow(datagridState) {
     onFocus: hoverHandler,
     onBlur: focusRemover,
     onKeyUp: handleOnKeyUp
-  }), row.cells.map(function (cell, index) {
+  }, setAdditionalRowProps()), row.cells.map(function (cell, index) {
     var _cell$column;
     var cellProps = cell.getCellProps();
     var children = cellProps.children,

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

@@ -14,6 +14,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@carbon/react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../../settings");
+var _stateReducer = require("./addons/stateReducer");
 var _excluded = ["onChange"];
 /**
  * Copyright IBM Corp. 2020, 2023
@@ -48,7 +49,11 @@ var SelectAll = exports.SelectAll = function SelectAll(datagridState) {
     DatagridPagination = datagridState.DatagridPagination,
     radio = datagridState.radio,
     columns = datagridState.columns,
-    withStickyColumn = datagridState.withStickyColumn;
+    withStickyColumn = datagridState.withStickyColumn,
+    dispatch = datagridState.dispatch,
+    rows = datagridState.rows,
+    getRowId = datagridState.getRowId,
+    toggleAllRowsSelected = datagridState.toggleAllRowsSelected;
   var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
   if (hideSelectAll || radio) {
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -63,12 +68,25 @@ var SelectAll = exports.SelectAll = function SelectAll(datagridState) {
   var indeterminate = selectProps.indeterminate;
   var handleSelectAllChange = function handleSelectAllChange(event) {
     if (indeterminate) {
+      (0, _stateReducer.handleSelectAllRowData)({
+        dispatch: dispatch,
+        rows: rows,
+        getRowId: getRowId,
+        indeterminate: true
+      });
+      toggleAllRowsSelected(false);
       return onChange === null || onChange === void 0 ? void 0 : onChange({
         target: {
           checked: false
         }
       });
     }
+    (0, _stateReducer.handleSelectAllRowData)({
+      dispatch: dispatch,
+      rows: rows,
+      getRowId: getRowId,
+      isChecked: event.target.checked
+    });
     return onChange === null || onChange === void 0 ? void 0 : onChange(event);
   };
   return /*#__PURE__*/_react.default.createElement("div", {

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

@@ -13,6 +13,7 @@ var _react2 = require("@carbon/react");
 var _useResizeObserver2 = require("../../../global/js/hooks/useResizeObserver");
 var _settings = require("../../../settings");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _stateReducer = require("./addons/stateReducer");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
@@ -42,6 +43,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     toolbarBatchActions = datagridState.toolbarBatchActions,
     setGlobalFilter = datagridState.setGlobalFilter,
     rows = datagridState.rows,
+    dispatch = datagridState.dispatch,
+    getRowId = datagridState.getRowId,
     batchActionMenuButtonLabel = datagridState.batchActionMenuButtonLabel,
     translateWithIdBatchActions = datagridState.translateWithIdBatchActions;
   var batchActionMenuButtonLabelText = batchActionMenuButtonLabel !== null && batchActionMenuButtonLabel !== void 0 ? batchActionMenuButtonLabel : 'More';
@@ -119,6 +122,11 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
   var onSelectAllHandler = function onSelectAllHandler() {
     toggleAllRowsSelected(true);
     onSelectAllRows === null || onSelectAllRows === void 0 || onSelectAllRows(true);
+    (0, _stateReducer.handleSelectAllRowData)({
+      dispatch: dispatch,
+      rows: rows,
+      getRowId: getRowId
+    });
   };
 
   // Only display the first two batch actions, the rest are

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stateReducer = exports.handleToggleRowSelected = exports.handleColumnResizingEvent = exports.handleColumnResizeEndEvent = void 0;
+exports.stateReducer = exports.handleToggleRowSelected = exports.handleSelectAllRowData = exports.handleColumnResizingEvent = exports.handleColumnResizeEndEvent = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -21,6 +21,7 @@ var COLUMN_RESIZING = 'columnResizing';
 var COLUMN_RESIZE_END = 'columnDoneResizing';
 var INIT = 'init';
 var TOGGLE_ROW_SELECTED = 'toggleRowSelected';
+var TOGGLE_ALL_ROWS_SELECTED = 'toggleAllRowsSelected';
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var handleColumnResizeEndEvent = exports.handleColumnResizeEndEvent = function handleColumnResizeEndEvent(dispatch, onColResizeEnd, headerId, isKeyEvent) {
   dispatch({
@@ -52,35 +53,77 @@ var handleColumnResizingEvent = exports.handleColumnResizingEvent = function han
     }
   });
 };
-var handleToggleRowSelected = exports.handleToggleRowSelected = function handleToggleRowSelected(dispatch, rowData, isChecked) {
+var handleToggleRowSelected = exports.handleToggleRowSelected = function handleToggleRowSelected(_ref) {
+  var dispatch = _ref.dispatch,
+    rowData = _ref.rowData,
+    isChecked = _ref.isChecked,
+    getRowId = _ref.getRowId,
+    selectAll = _ref.selectAll;
   return dispatch({
     type: TOGGLE_ROW_SELECTED,
     payload: {
       rowData: rowData,
+      isChecked: isChecked,
+      getRowId: getRowId,
+      selectAll: selectAll
+    }
+  });
+};
+var handleSelectAllRowData = exports.handleSelectAllRowData = function handleSelectAllRowData(_ref2) {
+  var dispatch = _ref2.dispatch,
+    rows = _ref2.rows,
+    getRowId = _ref2.getRowId,
+    indeterminate = _ref2.indeterminate,
+    isChecked = _ref2.isChecked;
+  return dispatch({
+    type: TOGGLE_ALL_ROWS_SELECTED,
+    payload: {
+      rows: rows,
+      getRowId: getRowId,
+      indeterminate: indeterminate,
       isChecked: isChecked
     }
   });
 };
 var stateReducer = exports.stateReducer = function stateReducer(newState, action) {
   switch (action.type) {
+    case TOGGLE_ALL_ROWS_SELECTED:
+      {
+        var _ref3 = action.payload || {},
+          rows = _ref3.rows,
+          getRowId = _ref3.getRowId,
+          indeterminate = _ref3.indeterminate,
+          isChecked = _ref3.isChecked;
+        if (rows) {
+          var newSelectedRowData = {};
+          rows.forEach(function (row) {
+            newSelectedRowData[getRowId(row, row.index)] = row;
+          });
+          return _objectSpread(_objectSpread({}, newState), {}, {
+            selectedRowData: indeterminate || !isChecked ? {} : newSelectedRowData
+          });
+        }
+        return _objectSpread({}, newState);
+      }
     case TOGGLE_ROW_SELECTED:
       {
-        var _ref = action.payload || {},
-          rowData = _ref.rowData,
-          isChecked = _ref.isChecked;
+        var _ref4 = action.payload || {},
+          rowData = _ref4.rowData,
+          _isChecked = _ref4.isChecked,
+          _getRowId = _ref4.getRowId;
         if (!rowData) {
           return;
         }
-        if (isChecked) {
+        if (_isChecked) {
           return _objectSpread(_objectSpread({}, newState), {}, {
-            selectedRowData: _objectSpread(_objectSpread({}, newState.selectedRowData), {}, (0, _defineProperty2.default)({}, rowData.index, rowData))
+            selectedRowData: _objectSpread(_objectSpread({}, newState.selectedRowData), {}, (0, _defineProperty2.default)({}, _getRowId(rowData, rowData.index), rowData))
           });
         }
-        if (rowData && !isChecked) {
+        if (rowData && !_isChecked) {
           var newData = _objectSpread({}, newState.selectedRowData);
-          var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref2) {
-            var _ref3 = (0, _slicedToArray2.default)(_ref2, 1),
-              key = _ref3[0];
+          var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref5) {
+            var _ref6 = (0, _slicedToArray2.default)(_ref5, 1),
+              key = _ref6[0];
             return parseInt(key) !== parseInt(rowData.index);
           }));
           return _objectSpread(_objectSpread({}, newState), {}, {
@@ -97,27 +140,27 @@ var stateReducer = exports.stateReducer = function stateReducer(newState, action
       }
     case COLUMN_RESIZE_START:
       {
-        var _ref4 = action.payload || {},
-          headerId = _ref4.headerId;
+        var _ref7 = action.payload || {},
+          headerId = _ref7.headerId;
         return _objectSpread(_objectSpread({}, newState), {}, {
           isResizing: headerId
         });
       }
     case COLUMN_RESIZING:
       {
-        var _ref5 = action.payload || {},
-          _headerId = _ref5.headerId,
-          newWidth = _ref5.newWidth,
-          defaultWidth = _ref5.defaultWidth;
+        var _ref8 = action.payload || {},
+          _headerId = _ref8.headerId,
+          newWidth = _ref8.newWidth,
+          defaultWidth = _ref8.defaultWidth;
         var newColumnWidth = {};
         if (typeof _headerId === 'undefined') {
           return _objectSpread({}, newState);
         }
         newColumnWidth[_headerId] = newWidth;
-        var cleanedWidths = Object.fromEntries(Object.entries(newState.columnResizing.columnWidths).filter(function (_ref6) {
-          var _ref7 = (0, _slicedToArray2.default)(_ref6, 2),
-            _ = _ref7[0],
-            value = _ref7[1];
+        var cleanedWidths = Object.fromEntries(Object.entries(newState.columnResizing.columnWidths).filter(function (_ref9) {
+          var _ref10 = (0, _slicedToArray2.default)(_ref9, 2),
+            _ = _ref10[0],
+            value = _ref10[1];
           return !isNaN(value);
         }));
         var headerIdArray = newState.columnResizing.headerIdWidths || [];
@@ -132,10 +175,10 @@ var stateReducer = exports.stateReducer = function stateReducer(newState, action
       }
     case COLUMN_RESIZE_END:
       {
-        var _ref8 = action.payload || {},
-          onColResizeEnd = _ref8.onColResizeEnd,
-          _headerId2 = _ref8.headerId,
-          isKeyEvent = _ref8.isKeyEvent;
+        var _ref11 = action.payload || {},
+          onColResizeEnd = _ref11.onColResizeEnd,
+          _headerId2 = _ref11.headerId,
+          isKeyEvent = _ref11.isKeyEvent;
         var currentColumn = {};
         currentColumn[_headerId2] = newState.columnResizing.columnWidths[_headerId2];
         var allChangedColumns = newState.columnResizing.columnWidths;

package/lib/components/Datagrid/useExpandedRow.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _settings = require("../../settings");
 var _DatagridExpandedRow = _interopRequireDefault(require("./Datagrid/DatagridExpandedRow"));
 var _useRowExpander = _interopRequireDefault(require("./useRowExpander"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -19,9 +18,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        * LICENSE file in the root directory of this source tree.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        */
 var useExpandedRow = function useExpandedRow(hooks) {
-  (0, _react.useEffect)(function () {
-    _settings.pkg.checkReportFeatureEnabled('Datagrid.useExpandedRow');
-  }, []);
   (0, _useRowExpander.default)(hooks);
   var useInstance = function useInstance(instance) {
     var rows = instance.rows,
@@ -43,7 +39,8 @@ var useExpandedRow = function useExpandedRow(hooks) {
     });
     Object.assign(instance, {
       rows: rowsWithExpand,
-      setExpandedRowHeight: setExpandedRowHeight
+      setExpandedRowHeight: setExpandedRowHeight,
+      withExpandedRows: true
     });
   };
   hooks.useInstance.push(useInstance);

package/lib/components/Datagrid/useFocusRowExpander.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFocusRowExpander = void 0;
+var _react = require("react");
+/**
+ * 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.
+ */
+
+// 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.
+var useFocusRowExpander = exports.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;
+  (0, _react.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/lib/components/Datagrid/useNestedRowExpander.js

@@ -13,6 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _icons = require("@carbon/react/icons");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../settings");
+var _useFocusRowExpander = require("./useFocusRowExpander");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -25,9 +26,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useNestedRowExpander = function useNestedRowExpander(hooks) {
   var tempState = (0, _react.useRef)();
+  var lastExpandedRowIndex = (0, _react.useRef)();
   var useInstance = function useInstance(instance) {
     tempState.current = instance;
   };
+  (0, _useFocusRowExpander.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',
@@ -39,6 +47,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/lib/components/Datagrid/useNestedRows.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = require("react");
-var _settings = require("../../settings");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _settings = require("../../settings");
 var _useNestedRowExpander = _interopRequireDefault(require("./useNestedRowExpander"));
 /**
  * Copyright IBM Corp. 2020, 2023
@@ -19,9 +18,6 @@ var _useNestedRowExpander = _interopRequireDefault(require("./useNestedRowExpand
 
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
-  (0, _react.useEffect)(function () {
-    _settings.pkg.checkReportFeatureEnabled('Datagrid.useNestedRows');
-  }, []);
   (0, _useNestedRowExpander.default)(hooks);
   var marginLeft = 24;
   var getRowProps = function getRowProps(props, _ref) {

package/lib/components/Datagrid/useRowExpander.js

@@ -13,6 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _icons = require("@carbon/react/icons");
 var _settings = require("../../settings");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _useFocusRowExpander = require("./useFocusRowExpander");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -25,9 +26,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useRowExpander = function useRowExpander(hooks) {
   var tempState = (0, _react.useRef)();
+  var lastExpandedRowIndex = (0, _react.useRef)();
   var useInstance = function useInstance(instance) {
     tempState.current = instance;
   };
+  (0, _useFocusRowExpander.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',
@@ -38,6 +46,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/lib/components/Datagrid/useSelectRows.js

@@ -22,13 +22,12 @@ var _excluded = ["onChange", "title"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /*
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * 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.
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       */ // @flow
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * 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 blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var checkboxClass = "".concat(_settings.pkg.prefix, "--datagrid__checkbox-cell");
 var useSelectRows = function useSelectRows(hooks) {
@@ -51,7 +50,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 = (0, _toConsumableArray2.default)(columns);
+    var expanderColumnIndex = newColOrder.findIndex(function (col) {
+      return col.id === 'expander';
+    });
+    var expanderCol = expanderColumnIndex > -1 ? newColOrder.splice(expanderColumnIndex, 1) : [];
+    return [].concat((0, _toConsumableArray2.default)(expanderColumnIndex > -1 && expanderCol && expanderCol.length ? expanderCol : []), [{
       id: _commonColumnIds.selectionColumnId,
       Header: function Header(gridState) {
         return /*#__PURE__*/_react.default.createElement(_DatagridSelectAll.SelectAll, gridState);
@@ -59,7 +65,7 @@ var useSelectRows = function useSelectRows(hooks) {
       Cell: function Cell(gridState) {
         return /*#__PURE__*/_react.default.createElement(SelectRow, gridState);
       }
-    }].concat((0, _toConsumableArray2.default)(columns));
+    }], (0, _toConsumableArray2.default)(newColOrder));
   });
 };
 var useHighlightSelection = function useHighlightSelection(hooks) {
@@ -87,7 +93,8 @@ var SelectRow = function SelectRow(datagridState) {
     onRowSelect = datagridState.onRowSelect,
     columns = datagridState.columns,
     withStickyColumn = datagridState.withStickyColumn,
-    dispatch = datagridState.dispatch;
+    dispatch = datagridState.dispatch,
+    getRowId = datagridState.getRowId;
   var _useState = (0, _react.useState)(window.innerWidth),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     windowSize = _useState2[0],
@@ -111,7 +118,12 @@ var SelectRow = function SelectRow(datagridState) {
     }
     onChange(event);
     onRowSelect === null || onRowSelect === void 0 || onRowSelect(row, event);
-    (0, _stateReducer.handleToggleRowSelected)(dispatch, row, event.target.checked);
+    (0, _stateReducer.handleToggleRowSelected)({
+      dispatch: dispatch,
+      rowData: row,
+      isChecked: event.target.checked,
+      getRowId: getRowId
+    });
   };
   var selectDisabled = isFetching || row.getRowProps().disabled;
   var _row$getToggleRowSele2 = row.getToggleRowSelectedProps(),