@carbon/ibm-products 2.17.1 → 2.17.2

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 { pkg } from '../../settings';
 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/useRowExpander.js

@@ -15,12 +15,20 @@ import React, { useRef } from 'react';
 import { ChevronDown, ChevronUp } from '@carbon/react/icons';
 import { pkg, carbon } from '../../settings';
 import cx from 'classnames';
+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/useSelectRows.js

@@ -42,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);
@@ -50,7 +57,7 @@ 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) {

package/es/components/EditSidePanel/EditSidePanel.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "className", "disableSubmit", "formTitle", "formDescription", "onRequestClose", "onRequestSubmit", "open", "placement", "primaryButtonText", "secondaryButtonText", "selectorPrimaryFocus", "selectorPageContent", "size", "slideIn", "subtitle", "title"];
+var _excluded = ["children", "className", "disableSubmit", "id", "formTitle", "formDescription", "onRequestClose", "onRequestSubmit", "open", "placement", "primaryButtonText", "secondaryButtonText", "selectorPrimaryFocus", "selectorPageContent", "size", "slideIn", "subtitle", "title"];
 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) { _defineProperty(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; }
 /**
@@ -45,6 +45,7 @@ export var EditSidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var children = _ref.children,
     className = _ref.className,
     disableSubmit = _ref.disableSubmit,
+    id = _ref.id,
     formTitle = _ref.formTitle,
     formDescription = _ref.formDescription,
     onRequestClose = _ref.onRequestClose,
@@ -84,7 +85,8 @@ export var EditSidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     onRequestClose: onRequestClose,
     title: title,
     subtitle: subtitle,
-    selectorPrimaryFocus: selectorPrimaryFocus
+    selectorPrimaryFocus: selectorPrimaryFocus,
+    id: id
   }, getDevtoolsProps(componentName)), {
     placement: placement,
     slideIn: slideIn,
@@ -136,6 +138,10 @@ EditSidePanel.propTypes = {
    * Specifies a required field that provides a title for a form
    */
   formTitle: PropTypes.node.isRequired,
+  /**
+   * Unique identifier
+   */
+  id: PropTypes.string,
   /**
    * Specifies an optional handler which is called when the CreateSidePanel
    * is closed.

package/es/components/SidePanel/SidePanel.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["actionToolbarButtons", "actions", "animateTitle", "children", "className", "closeIconDescription", "condensedActions", "currentStep", "includeOverlay", "labelText", "navigationBackIconDescription", "onNavigationBack", "onRequestClose", "onUnmount", "open", "placement", "preventCloseOnClickOutside", "selectorPageContent", "selectorPrimaryFocus", "size", "slideIn", "subtitle", "title"],
+var _excluded = ["actionToolbarButtons", "actions", "animateTitle", "children", "className", "closeIconDescription", "condensedActions", "currentStep", "id", "includeOverlay", "labelText", "navigationBackIconDescription", "onNavigationBack", "onRequestClose", "onUnmount", "open", "placement", "preventCloseOnClickOutside", "selectorPageContent", "selectorPrimaryFocus", "size", "slideIn", "slug", "subtitle", "title"],
   _excluded2 = ["label", "kind", "icon", "tooltipPosition", "tooltipAlignment", "leading", "disabled", "className", "onClick"];
 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) { _defineProperty(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; }
@@ -14,7 +14,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  */
 
 // Import portions of React that are needed.
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { motion, AnimatePresence } from 'framer-motion';
 
 // Other standard imports.
@@ -65,6 +65,8 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     condensedActions = _ref.condensedActions,
     _ref$currentStep = _ref.currentStep,
     currentStep = _ref$currentStep === void 0 ? defaults.currentStep : _ref$currentStep,
+    _ref$id = _ref.id,
+    id = _ref$id === void 0 ? blockClass : _ref$id,
     includeOverlay = _ref.includeOverlay,
     labelText = _ref.labelText,
     _ref$navigationBackIc = _ref.navigationBackIconDescription,
@@ -81,6 +83,7 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? defaults.size : _ref$size,
     slideIn = _ref.slideIn,
+    slug = _ref.slug,
     subtitle = _ref.subtitle,
     title = _ref.title,
     rest = _objectWithoutProperties(_ref, _excluded);
@@ -105,6 +108,10 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var reducedMotion = typeof window !== 'undefined' && (_window = window) !== null && _window !== void 0 && _window.matchMedia ? window.matchMedia('(prefers-reduced-motion: reduce)') : {
     matches: true
   };
+  var getActionsContainerElement = useCallback(function () {
+    var sidePanelOuter = document.querySelector("#".concat(id));
+    return sidePanelOuter && sidePanelOuter.querySelector(".".concat(blockClass, "__actions-container"));
+  }, [id]);
 
   // scroll panel to top going between steps
   useEffect(function () {
@@ -112,7 +119,7 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     if (panelRef && panelRef.current) {
       var _document$querySelect;
       var scrollableSection = panelRef.current.querySelector(".".concat(blockClass, "__inner-content"));
-      var sidePanelOuter = document.querySelector("#".concat(blockClass, "-outer"));
+      var sidePanelOuter = document.querySelector("#".concat(id));
       var initialTitleHeight = (_document$querySelect = document.querySelector(".".concat(blockClass, "__title-container"))) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.offsetHeight;
       scrollableSection.scrollTop = 0;
       // The size of the panel has changed while it is still opened
@@ -124,7 +131,7 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         sidePanelOuter === null || sidePanelOuter === void 0 || (_sidePanelOuter$style = sidePanelOuter.style) === null || _sidePanelOuter$style === void 0 || _sidePanelOuter$style.setProperty("--".concat(blockClass, "--title-container-height"), "".concat(Number(initialTitleHeight), "px"));
       }
     }
-  }, [currentStep, ref, size, previousState === null || previousState === void 0 ? void 0 : previousState.size]);
+  }, [currentStep, ref, size, previousState === null || previousState === void 0 ? void 0 : previousState.size, id]);
 
   // set initial focus when side panel opens
   useEffect(function () {
@@ -148,13 +155,13 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   useEffect(function () {
     if (open && actions && actions.length && animationComplete) {
       var _sidePanelOuter$style2;
-      var sidePanelOuter = document.querySelector("#".concat(blockClass, "-outer"));
+      var sidePanelOuter = document.querySelector("#".concat(id));
       var actionsContainer = getActionsContainerElement();
       var actionsHeight = (actionsContainer === null || actionsContainer === void 0 ? void 0 : actionsContainer.offsetHeight) + 16; // add additional 1rem spacing to bottom padding
       actionsHeight = "".concat(Math.round(actionsHeight / 16), "rem");
       sidePanelOuter === null || sidePanelOuter === void 0 || (_sidePanelOuter$style2 = sidePanelOuter.style) === null || _sidePanelOuter$style2 === void 0 || _sidePanelOuter$style2.setProperty("--".concat(blockClass, "--content-bottom-padding"), actionsHeight);
     }
-  }, [actions, condensedActions, open, animationComplete]);
+  }, [actions, condensedActions, open, animationComplete, id, getActionsContainerElement]);
 
   // Add console warning if labelText is provided without a title.
   // This combination is not allowed.
@@ -169,23 +176,19 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var _sidePanelOuter$style3;
     var height = _ref2.height;
     setPanelHeight(height);
-    var sidePanelOuter = document.querySelector("#".concat(blockClass, "-outer"));
+    var sidePanelOuter = document.querySelector("#".concat(id));
     var actionsContainer = getActionsContainerElement();
     var actionsHeight = (actionsContainer === null || actionsContainer === void 0 ? void 0 : actionsContainer.offsetHeight) + 16; // add additional 1rem spacing to bottom padding
     actionsHeight = "".concat(Math.round(actionsHeight / 16), "rem");
     sidePanelOuter === null || sidePanelOuter === void 0 || (_sidePanelOuter$style3 = sidePanelOuter.style) === null || _sidePanelOuter$style3 === void 0 || _sidePanelOuter$style3.setProperty("--".concat(blockClass, "--content-bottom-padding"), actionsHeight);
   };
-  var getActionsContainerElement = function getActionsContainerElement() {
-    var sidePanelOuter = document.querySelector("#".concat(blockClass, "-outer"));
-    return sidePanelOuter && sidePanelOuter.querySelector(".".concat(blockClass, "__actions-container"));
-  };
 
   // Title and subtitle scroll animation
   useEffect(function () {
     if (open && animateTitle && animationComplete && title && title.length && !reducedMotion.matches) {
       var _document$querySelect2, _document$querySelect3, _document$querySelect4;
-      var sidePanelOuter = document.querySelector("#".concat(blockClass, "-outer"));
-      var sidePanelScrollArea = document.querySelector("#".concat(blockClass, "-outer .").concat(blockClass, "__inner-content"));
+      var sidePanelOuter = document.querySelector("#".concat(id));
+      var sidePanelScrollArea = document.querySelector("#".concat(id, " .").concat(blockClass, "__inner-content"));
       var sidePanelTitleElement = document.querySelector(".".concat(blockClass, "__title-text"));
       var sidePanelCollapsedTitleElement = document.querySelector(".".concat(blockClass, "__collapsed-title-text"));
       var sidePanelSubtitleElement = document.querySelector(".".concat("".concat(blockClass, "__subtitle-text")));
@@ -260,7 +263,7 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       });
     }
     if (open && !animateTitle) {
-      var _sidePanelOuter = document.querySelector("#".concat(blockClass, "-outer"));
+      var _sidePanelOuter = document.querySelector("#".concat(id));
       var _sidePanelTitleElement = document.querySelector(".".concat(blockClass, "__title-container .").concat(blockClass, "__title-text"));
       var _sidePanelSubtitleElement = document.querySelector(".".concat(blockClass, "__subtitle-text"));
       var actionToolbarElement = document.querySelector(".".concat(blockClass, "__action-toolbar"));
@@ -274,7 +277,7 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       _sidePanelOuter === null || _sidePanelOuter === void 0 || _sidePanelOuter.style.setProperty("--".concat(blockClass, "--action-bar-container-height"), "".concat(sidePanelActionBarElementHeight, "px"));
       _sidePanelOuter === null || _sidePanelOuter === void 0 || _sidePanelOuter.style.setProperty("--".concat(blockClass, "--label-text-height"), "".concat(labelHeight, "px"));
     }
-  }, [open, animateTitle, animationComplete, panelHeight, title, size, reducedMotion.matches]);
+  }, [open, animateTitle, animationComplete, panelHeight, title, size, reducedMotion.matches, id]);
 
   // click outside functionality if `includeOverlay` prop is set
   useEffect(function () {
@@ -371,9 +374,16 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }
   };
   var primaryActionContainerClassNames = cx(["".concat(blockClass, "__actions-container"), _defineProperty({}, "".concat(blockClass, "__actions-container-condensed"), condensedActions)]);
-  var mainPanelClassNames = cx([blockClass, className, "".concat(blockClass, "__container"), "".concat(blockClass, "__container--").concat(size), (_ref5 = {}, _defineProperty(_ref5, "".concat(blockClass, "__container-right-placement"), placement === 'right'), _defineProperty(_ref5, "".concat(blockClass, "__container-left-placement"), placement === 'left'), _defineProperty(_ref5, "".concat(blockClass, "__container-with-action-toolbar"), actionToolbarButtons && actionToolbarButtons.length), _defineProperty(_ref5, "".concat(blockClass, "__container-without-overlay"), !includeOverlay && !slideIn), _defineProperty(_ref5, "".concat(blockClass, "__container-is-animating"), !animationComplete || !open), _ref5)]);
+  var mainPanelClassNames = cx([blockClass, className, "".concat(blockClass, "__container"), "".concat(blockClass, "__container--").concat(size), (_ref5 = {}, _defineProperty(_ref5, "".concat(blockClass, "__container-right-placement"), placement === 'right'), _defineProperty(_ref5, "".concat(blockClass, "__container-left-placement"), placement === 'left'), _defineProperty(_ref5, "".concat(blockClass, "__container-with-action-toolbar"), actionToolbarButtons && actionToolbarButtons.length), _defineProperty(_ref5, "".concat(blockClass, "__container-without-overlay"), !includeOverlay && !slideIn), _defineProperty(_ref5, "".concat(blockClass, "__container-is-animating"), !animationComplete || !open), _defineProperty(_ref5, "".concat(blockClass, "__container--has-slug"), slug), _ref5)]);
   var renderHeader = function renderHeader() {
     var _cx, _cx2;
+    var normalizedSlug;
+    if (slug) {
+      normalizedSlug = /*#__PURE__*/React.cloneElement(slug, {
+        // slug size is sm unless actions and size > md
+        size: actions.length && /l/.test(size) ? 'md' : 'sm'
+      });
+    }
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: cx("".concat(blockClass, "__title-container"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__on-detail-step"), currentStep > 0), _defineProperty(_cx, "".concat(blockClass, "__on-detail-step-without-title"), currentStep > 0 && !title), _defineProperty(_cx, "".concat(blockClass, "__title-container--no-title-animation"), !animateTitle), _defineProperty(_cx, "".concat(blockClass, "__title-container-is-animating"), !animationComplete || !open), _defineProperty(_cx, "".concat(blockClass, "__title-container-without-title"), !title), _defineProperty(_cx, "".concat(blockClass, "__title-container--reduced-motion"), reducedMotion.matches), _cx))
     }, currentStep > 0 && /*#__PURE__*/React.createElement(Button, {
@@ -391,7 +401,9 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       onClick: onNavigationBack
     }), title && title.length && labelText && labelText.length && /*#__PURE__*/React.createElement("p", {
       className: "".concat(blockClass, "__label-text")
-    }, labelText), title && title.length && renderTitle()), /*#__PURE__*/React.createElement(Button, {
+    }, labelText), title && title.length && renderTitle()), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(blockClass, "__slug-and-close")
+    }, normalizedSlug, /*#__PURE__*/React.createElement(Button, {
       "aria-label": closeIconDescription,
       kind: "ghost",
       size: "sm",
@@ -404,7 +416,7 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       className: "".concat(blockClass, "__close-button"),
       onClick: onRequestClose,
       ref: sidePanelCloseRef
-    }), subtitle && /*#__PURE__*/React.createElement("p", {
+    })), subtitle && /*#__PURE__*/React.createElement("p", {
       className: cx("".concat(blockClass, "__subtitle-text"), (_cx2 = {}, _defineProperty(_cx2, "".concat(blockClass, "__subtitle-text-no-animation"), !animateTitle), _defineProperty(_cx2, "".concat(blockClass, "__subtitle-text-no-animation-no-action-toolbar"), !animateTitle && (!actionToolbarButtons || !actionToolbarButtons.length)), _defineProperty(_cx2, "".concat(blockClass, "__subtitle-text-is-animating"), !animationComplete && animateTitle), _defineProperty(_cx2, "".concat(blockClass, "__subtitle-without-title"), !title), _cx2))
     }, subtitle), actionToolbarButtons && actionToolbarButtons.length && /*#__PURE__*/React.createElement("div", {
       className: cx("".concat(blockClass, "__action-toolbar"), _defineProperty({}, "".concat(blockClass, "__action-toolbar-no-animation"), !animateTitle))
@@ -448,7 +460,7 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var contentRef = ref || sidePanelRef;
   useResizeObserver(contentRef, handleResize);
   return /*#__PURE__*/React.createElement(AnimatePresence, null, open && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(motion.div, _extends({}, getDevtoolsProps(componentName), rest, {
-    id: "".concat(blockClass, "-outer"),
+    id: id,
     className: mainPanelClassNames,
     onBlur: handleBlur,
     ref: contentRef,
@@ -556,6 +568,10 @@ SidePanel.propTypes = {
    * Sets the current step of the side panel
    */
   currentStep: PropTypes.number,
+  /**
+   * Unique identifier
+   */
+  id: PropTypes.string,
   /**
    * Determines whether the side panel should render with an overlay
    */
@@ -615,6 +631,10 @@ SidePanel.propTypes = {
    * Determines if this panel slides in
    */
   slideIn: PropTypes.bool,
+  /**
+   * Provide a `Slug` component to be rendered inside the `SidePanel` component
+   */
+  slug: PropTypes.node,
   /**
    * Sets the subtitle text
    */

package/es/global/js/hooks/useCreateComponentStepChange.js

@@ -66,7 +66,7 @@ export var useCreateComponentStepChange = function useCreateComponentStepChange(
   useEffect(function () {
     var onUnmount = function onUnmount() {
       if (componentName !== 'CreateFullPage') {
-        setCurrentStep(0);
+        setCurrentStep(1);
       }
       setIsSubmitting(false);
       onClose();

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/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/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

@@ -50,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);
@@ -58,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) {