@carbon/ibm-products 1.66.0 → 1.68.0

package/es/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js

@@ -1,19 +1,19 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-// @flow
 /**
- * Copyright IBM Corp. 2022, 2023
+ * Copyright IBM Corp. 2022, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-import { Filter16 } from '@carbon/icons-react';
+import React, { useRef, useState, useEffect } from 'react';
 import { Button } from 'carbon-components-react';
+import { Filter16 } from '@carbon/icons-react';
+import { px, breakpoints } from '@carbon/layout';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React, { useRef, useState, useEffect } from 'react';
-import { useClickOutside } from '../../../../../global/js/hooks';
+import { useClickOutside, useWindowResize } from '../../../../../global/js/hooks';
 import { pkg } from '../../../../../settings';
 import { ActionSet } from '../../../../ActionSet';
 import { BATCH, CLEAR_FILTERS, FLYOUT, INSTANT } from './constants';
@@ -53,6 +53,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    stackedLayout = _useState4[0],
+    setStackedLayout = _useState4[1];
   var _useFilters = useFilters({
       updateMethod: updateMethod,
       filters: filters,
@@ -69,9 +73,13 @@ var FilterFlyout = function FilterFlyout(_ref) {
     renderFilter = _useFilters.renderFilter,
     filtersObjectArray = _useFilters.filtersObjectArray,
     lastAppliedFilters = _useFilters.lastAppliedFilters;
+  var width = breakpoints.md.width;
+  var mdPxWidth = parseInt(width) * 16;
 
   /** Refs */
   var filterFlyoutRef = useRef(null);
+  var flyoutInnerRef = useRef(null);
+  var flyoutFiltersContainerRef = useRef(null);
   var _useShouldDisableButt = useShouldDisableButtons({
       initialValue: true,
       filtersState: filtersState,
@@ -80,6 +88,33 @@ var FilterFlyout = function FilterFlyout(_ref) {
     _useShouldDisableButt2 = _slicedToArray(_useShouldDisableButt, 2),
     shouldDisableButtons = _useShouldDisableButt2[0],
     setShouldDisableButtons = _useShouldDisableButt2[1];
+  var handleResize = function handleResize(current) {
+    var filterFlyoutRefPosition = flyoutInnerRef === null || flyoutInnerRef === void 0 ? void 0 : flyoutInnerRef.current.getBoundingClientRect();
+    var originalFlyoutWidth = parseInt(window.getComputedStyle(flyoutInnerRef === null || flyoutInnerRef === void 0 ? void 0 : flyoutInnerRef.current).getPropertyValue('width'));
+    // Check to see if left value from flyout getBoundingClientRect is a negative number
+    // If it is, that is the amount we need to subtract from the flyout width
+    if (Math.sign(filterFlyoutRefPosition.left) === -1) {
+      var newFlyoutWidth = originalFlyoutWidth - Math.abs(filterFlyoutRefPosition.left);
+      flyoutInnerRef.current.style.width = px(newFlyoutWidth);
+    }
+    // Check to see if left value from flyout getBoundingClientRect is a positive number or 0
+    // If it is, that is the amount we need to add to the flyout width until we reach the
+    // max-width of the flyout (642)
+    if (originalFlyoutWidth < 642 && Math.sign(filterFlyoutRefPosition.left) === 1 || Math.sign(filterFlyoutRefPosition.left).toString() === '0') {
+      var _newFlyoutWidth = originalFlyoutWidth + Math.abs(filterFlyoutRefPosition.left);
+      flyoutInnerRef.current.style.width = px(_newFlyoutWidth);
+    }
+    // Begin stacking filters at this specific point
+    if ((current === null || current === void 0 ? void 0 : current.innerWidth) <= mdPxWidth + 254) {
+      setStackedLayout(true);
+    } else {
+      setStackedLayout(false);
+    }
+  };
+  useWindowResize(function (_ref2) {
+    var current = _ref2.current;
+    handleResize(current);
+  });
 
   /** Memos */
   var showActionSet = updateMethod === BATCH;
@@ -92,7 +127,12 @@ var FilterFlyout = function FilterFlyout(_ref) {
   var closeFlyout = function closeFlyout() {
     setOpen(false);
     onFlyoutClose();
+    flyoutInnerRef.current.style.width = px(642);
   };
+  useEffect(function () {
+    // Initialize flyout width
+    flyoutInnerRef.current.style.width = px(642);
+  }, []);
   var apply = function apply() {
     setAllFilters(filtersObjectArray);
     closeFlyout();
@@ -151,7 +191,8 @@ var FilterFlyout = function FilterFlyout(_ref) {
     lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
   }, [reactTableFiltersState, lastAppliedFilters]);
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(componentClass, "__container")
+    className: "".concat(componentClass, "__container"),
+    ref: filterFlyoutRef
   }, /*#__PURE__*/React.createElement(Button, {
     kind: "ghost",
     hasIconOnly: true,
@@ -162,14 +203,15 @@ var FilterFlyout = function FilterFlyout(_ref) {
     className: cx("".concat(componentClass, "__trigger"), _defineProperty({}, "".concat(componentClass, "__trigger--open"), open)),
     disabled: data.length === 0
   }), /*#__PURE__*/React.createElement("div", {
-    ref: filterFlyoutRef,
+    ref: flyoutInnerRef,
     className: cx(componentClass, (_cx2 = {}, _defineProperty(_cx2, "".concat(componentClass, "--open"), open), _defineProperty(_cx2, "".concat(componentClass, "--batch"), showActionSet), _defineProperty(_cx2, "".concat(componentClass, "--instant"), !showActionSet), _cx2))
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(componentClass, "__inner-container")
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(componentClass, "__title")
   }, title), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(componentClass, "__filters")
+    className: cx("".concat(componentClass, "__filters"), _defineProperty({}, "".concat(componentClass, "__stacked"), stackedLayout)),
+    ref: flyoutFiltersContainerRef
   }, renderFilters())), renderActionSet()));
 };
 FilterFlyout.propTypes = {

package/es/components/Datagrid/Datagrid/addons/Filtering/motion/variants.js

@@ -36,7 +36,7 @@ export var innerContainerVariants = {
     return {
       opacity: 0,
       transition: {
-        duration: shouldReduceMotion ? 0 : DURATIONS.fast01,
+        duration: shouldReduceMotion ? DURATIONS.moderate01 : DURATIONS.fast01,
         ease: shouldReduceMotion ? 0 : EASINGS.productive.exit
       }
     };
@@ -45,9 +45,9 @@ export var innerContainerVariants = {
     return {
       opacity: 1,
       transition: {
-        duration: shouldReduceMotion ? 0 : DURATIONS.fast02,
+        duration: shouldReduceMotion ? DURATIONS.moderate01 : DURATIONS.fast02,
         ease: shouldReduceMotion ? 0 : EASINGS.productive.entrance,
-        when: 'beforeChildren'
+        when: shouldReduceMotion ? null : 'beforeChildren'
       }
     };
   }
@@ -55,9 +55,10 @@ export var innerContainerVariants = {
 export var actionSetVariants = {
   hidden: function hidden(shouldReduceMotion) {
     return {
-      y: ACTION_SET_HEIGHT,
+      y: shouldReduceMotion ? 0 : ACTION_SET_HEIGHT,
+      opacity: shouldReduceMotion ? 0 : 1,
       transition: {
-        duration: shouldReduceMotion ? 0 : DURATIONS.fast01,
+        duration: shouldReduceMotion ? DURATIONS.moderate01 : DURATIONS.fast01,
         ease: shouldReduceMotion ? 0 : EASINGS.productive.exit
       }
     };
@@ -65,9 +66,11 @@ export var actionSetVariants = {
   visible: function visible(shouldReduceMotion) {
     return {
       y: 0,
+      opacity: 1,
       transition: {
-        duration: shouldReduceMotion ? 0 : DURATIONS.fast02,
-        ease: shouldReduceMotion ? 0 : EASINGS.productive.entrance
+        duration: shouldReduceMotion ? DURATIONS.moderate01 : DURATIONS.fast02,
+        ease: shouldReduceMotion ? 0 : EASINGS.productive.entrance,
+        delay: shouldReduceMotion ? 0.075 : 0
       }
     };
   }

package/es/components/Datagrid/useNestedRows.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,46 +9,63 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { pkg } from '../../settings';
 import cx from 'classnames';
 import useNestedRowExpander from './useNestedRowExpander';
+import { useEffect } from 'react';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   useNestedRowExpander(hooks);
-  var marginLeft = 24;
-  var getRowProps = function getRowProps(props, _ref) {
-    var _cx;
-    var row = _ref.row;
-    return [props, {
-      className: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _cx))
-    }];
-  };
-  var getRowStyles = function getRowStyles(props, _ref2) {
-    var row = _ref2.row;
-    return [props, {
-      style: {
-        paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
-      }
-    }];
-  };
-  var getCellProps = function getCellProps(props, _ref3) {
-    var cell = _ref3.cell,
-      instance = _ref3.instance;
-    // reduce the "first cell"s width to compensate added (left) margin
-    var isFirstCell = instance.columns.findIndex(function (c) {
-      return c.id === cell.column.id;
-    }) === 0;
-    return [props, {
-      style: {
-        marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
-      }
-    }];
-  };
   var useInstance = function useInstance(instance) {
+    // This useEffect will expand rows if they exist in the initialState obj
+    useEffect(function () {
+      var rows = instance.rows,
+        initialState = instance.initialState;
+      var expandedRowIds = initialState.expandedRowIds;
+      if (expandedRowIds) {
+        Object.keys(expandedRowIds).forEach(function (key) {
+          var row = rows.filter(function (r) {
+            return r.id.toString() === key.toString();
+          });
+          if (row.length && key.toString() === row[0].id.toString()) {
+            row[0].toggleRowExpanded();
+          }
+        });
+      }
+    }, [instance]);
+    var marginLeft = 24;
+    var getRowProps = function getRowProps(props, _ref) {
+      var _cx;
+      var row = _ref.row;
+      return [props, {
+        className: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _cx))
+      }];
+    };
+    var getRowStyles = function getRowStyles(props, _ref2) {
+      var row = _ref2.row;
+      return [props, {
+        style: {
+          paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
+        }
+      }];
+    };
+    var getCellProps = function getCellProps(props, _ref3) {
+      var cell = _ref3.cell,
+        instance = _ref3.instance;
+      // reduce the "first cell"s width to compensate added (left) margin
+      var isFirstCell = instance.columns.findIndex(function (c) {
+        return c.id === cell.column.id;
+      }) === 0;
+      return [props, {
+        style: {
+          marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
+        }
+      }];
+    };
     Object.assign(instance, {
       withNestedRows: true
     });
+    hooks.getRowProps.push(getRowProps);
+    hooks.getRowProps.push(getRowStyles);
+    hooks.getCellProps.push(getCellProps);
   };
-  hooks.getRowProps.push(getRowProps);
-  hooks.getRowProps.push(getRowStyles);
-  hooks.getCellProps.push(getCellProps);
   hooks.useInstance.push(useInstance);
 };
 export default useNestedRows;

package/es/components/Datagrid/useOnRowClick.js

@@ -29,7 +29,7 @@ var useOnRowClick = function useOnRowClick(hooks) {
               row.classList.remove("".concat(carbon.prefix, "--data-table--selected"));
             });
           }
-          var closestRow = event.target.closest(".".concat(pkg.prefix, "--datagrid__carbon-row"));
+          var closestRow = event.target.closest('tr');
           closestRow.classList.add("".concat(carbon.prefix, "--data-table--selected"));
           if (!withSelectRows) {
             instance.selectedFlatRows && instance.selectedFlatRows.map(function (toggleRow) {

package/es/components/index.js

@@ -7,6 +7,7 @@
 
 export { AboutModal } from './AboutModal';
 export { APIKeyModal } from './APIKeyModal';
+export { ButtonMenu } from './ButtonMenu';
 export { Cascade } from './Cascade';
 export { ComboButton, ComboButtonItem } from './ComboButton';
 export { CreateFullPage, CreateFullPageStep } from './CreateFullPage';

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js

@@ -8,11 +8,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _iconsReact = require("@carbon/icons-react");
+var _react = _interopRequireWildcard(require("react"));
 var _carbonComponentsReact = require("carbon-components-react");
+var _iconsReact = require("@carbon/icons-react");
+var _layout = require("@carbon/layout");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _react = _interopRequireWildcard(require("react"));
 var _hooks = require("../../../../../global/js/hooks");
 var _settings = require("../../../../../settings");
 var _ActionSet = require("../../../../ActionSet");
@@ -20,9 +21,8 @@ var _constants = require("./constants");
 var _hooks2 = require("./hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-// @flow
 /**
- * Copyright IBM Corp. 2022, 2023
+ * Copyright IBM Corp. 2022, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -62,6 +62,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    stackedLayout = _useState4[0],
+    setStackedLayout = _useState4[1];
   var _useFilters = (0, _hooks2.useFilters)({
       updateMethod: updateMethod,
       filters: filters,
@@ -78,9 +82,13 @@ var FilterFlyout = function FilterFlyout(_ref) {
     renderFilter = _useFilters.renderFilter,
     filtersObjectArray = _useFilters.filtersObjectArray,
     lastAppliedFilters = _useFilters.lastAppliedFilters;
+  var width = _layout.breakpoints.md.width;
+  var mdPxWidth = parseInt(width) * 16;
 
   /** Refs */
   var filterFlyoutRef = (0, _react.useRef)(null);
+  var flyoutInnerRef = (0, _react.useRef)(null);
+  var flyoutFiltersContainerRef = (0, _react.useRef)(null);
   var _useShouldDisableButt = (0, _hooks2.useShouldDisableButtons)({
       initialValue: true,
       filtersState: filtersState,
@@ -89,6 +97,33 @@ var FilterFlyout = function FilterFlyout(_ref) {
     _useShouldDisableButt2 = (0, _slicedToArray2.default)(_useShouldDisableButt, 2),
     shouldDisableButtons = _useShouldDisableButt2[0],
     setShouldDisableButtons = _useShouldDisableButt2[1];
+  var handleResize = function handleResize(current) {
+    var filterFlyoutRefPosition = flyoutInnerRef === null || flyoutInnerRef === void 0 ? void 0 : flyoutInnerRef.current.getBoundingClientRect();
+    var originalFlyoutWidth = parseInt(window.getComputedStyle(flyoutInnerRef === null || flyoutInnerRef === void 0 ? void 0 : flyoutInnerRef.current).getPropertyValue('width'));
+    // Check to see if left value from flyout getBoundingClientRect is a negative number
+    // If it is, that is the amount we need to subtract from the flyout width
+    if (Math.sign(filterFlyoutRefPosition.left) === -1) {
+      var newFlyoutWidth = originalFlyoutWidth - Math.abs(filterFlyoutRefPosition.left);
+      flyoutInnerRef.current.style.width = (0, _layout.px)(newFlyoutWidth);
+    }
+    // Check to see if left value from flyout getBoundingClientRect is a positive number or 0
+    // If it is, that is the amount we need to add to the flyout width until we reach the
+    // max-width of the flyout (642)
+    if (originalFlyoutWidth < 642 && Math.sign(filterFlyoutRefPosition.left) === 1 || Math.sign(filterFlyoutRefPosition.left).toString() === '0') {
+      var _newFlyoutWidth = originalFlyoutWidth + Math.abs(filterFlyoutRefPosition.left);
+      flyoutInnerRef.current.style.width = (0, _layout.px)(_newFlyoutWidth);
+    }
+    // Begin stacking filters at this specific point
+    if ((current === null || current === void 0 ? void 0 : current.innerWidth) <= mdPxWidth + 254) {
+      setStackedLayout(true);
+    } else {
+      setStackedLayout(false);
+    }
+  };
+  (0, _hooks.useWindowResize)(function (_ref2) {
+    var current = _ref2.current;
+    handleResize(current);
+  });
 
   /** Memos */
   var showActionSet = updateMethod === _constants.BATCH;
@@ -101,7 +136,12 @@ var FilterFlyout = function FilterFlyout(_ref) {
   var closeFlyout = function closeFlyout() {
     setOpen(false);
     onFlyoutClose();
+    flyoutInnerRef.current.style.width = (0, _layout.px)(642);
   };
+  (0, _react.useEffect)(function () {
+    // Initialize flyout width
+    flyoutInnerRef.current.style.width = (0, _layout.px)(642);
+  }, []);
   var apply = function apply() {
     setAllFilters(filtersObjectArray);
     closeFlyout();
@@ -160,7 +200,8 @@ var FilterFlyout = function FilterFlyout(_ref) {
     lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
   }, [reactTableFiltersState, lastAppliedFilters]);
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(componentClass, "__container")
+    className: "".concat(componentClass, "__container"),
+    ref: filterFlyoutRef
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
     kind: "ghost",
     hasIconOnly: true,
@@ -171,14 +212,15 @@ var FilterFlyout = function FilterFlyout(_ref) {
     className: (0, _classnames.default)("".concat(componentClass, "__trigger"), (0, _defineProperty2.default)({}, "".concat(componentClass, "__trigger--open"), open)),
     disabled: data.length === 0
   }), /*#__PURE__*/_react.default.createElement("div", {
-    ref: filterFlyoutRef,
+    ref: flyoutInnerRef,
     className: (0, _classnames.default)(componentClass, (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--open"), open), (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--batch"), showActionSet), (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--instant"), !showActionSet), _cx2))
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(componentClass, "__inner-container")
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(componentClass, "__title")
   }, title), /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(componentClass, "__filters")
+    className: (0, _classnames.default)("".concat(componentClass, "__filters"), (0, _defineProperty2.default)({}, "".concat(componentClass, "__stacked"), stackedLayout)),
+    ref: flyoutFiltersContainerRef
   }, renderFilters())), renderActionSet()));
 };
 FilterFlyout.propTypes = {

package/lib/components/Datagrid/Datagrid/addons/Filtering/motion/variants.js

@@ -43,7 +43,7 @@ var innerContainerVariants = {
     return {
       opacity: 0,
       transition: {
-        duration: shouldReduceMotion ? 0 : _motionConstants.DURATIONS.fast01,
+        duration: shouldReduceMotion ? _motionConstants.DURATIONS.moderate01 : _motionConstants.DURATIONS.fast01,
         ease: shouldReduceMotion ? 0 : _motionConstants.EASINGS.productive.exit
       }
     };
@@ -52,9 +52,9 @@ var innerContainerVariants = {
     return {
       opacity: 1,
       transition: {
-        duration: shouldReduceMotion ? 0 : _motionConstants.DURATIONS.fast02,
+        duration: shouldReduceMotion ? _motionConstants.DURATIONS.moderate01 : _motionConstants.DURATIONS.fast02,
         ease: shouldReduceMotion ? 0 : _motionConstants.EASINGS.productive.entrance,
-        when: 'beforeChildren'
+        when: shouldReduceMotion ? null : 'beforeChildren'
       }
     };
   }
@@ -63,9 +63,10 @@ exports.innerContainerVariants = innerContainerVariants;
 var actionSetVariants = {
   hidden: function hidden(shouldReduceMotion) {
     return {
-      y: _constants.ACTION_SET_HEIGHT,
+      y: shouldReduceMotion ? 0 : _constants.ACTION_SET_HEIGHT,
+      opacity: shouldReduceMotion ? 0 : 1,
       transition: {
-        duration: shouldReduceMotion ? 0 : _motionConstants.DURATIONS.fast01,
+        duration: shouldReduceMotion ? _motionConstants.DURATIONS.moderate01 : _motionConstants.DURATIONS.fast01,
         ease: shouldReduceMotion ? 0 : _motionConstants.EASINGS.productive.exit
       }
     };
@@ -73,9 +74,11 @@ var actionSetVariants = {
   visible: function visible(shouldReduceMotion) {
     return {
       y: 0,
+      opacity: 1,
       transition: {
-        duration: shouldReduceMotion ? 0 : _motionConstants.DURATIONS.fast02,
-        ease: shouldReduceMotion ? 0 : _motionConstants.EASINGS.productive.entrance
+        duration: shouldReduceMotion ? _motionConstants.DURATIONS.moderate01 : _motionConstants.DURATIONS.fast02,
+        ease: shouldReduceMotion ? 0 : _motionConstants.EASINGS.productive.entrance,
+        delay: shouldReduceMotion ? 0.075 : 0
       }
     };
   }

package/lib/components/Datagrid/useNestedRows.js

@@ -9,8 +9,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _settings = require("../../settings");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _useNestedRowExpander = _interopRequireDefault(require("./useNestedRowExpander"));
+var _react = require("react");
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,43 +20,59 @@ var _useNestedRowExpander = _interopRequireDefault(require("./useNestedRowExpand
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   (0, _useNestedRowExpander.default)(hooks);
-  var marginLeft = 24;
-  var getRowProps = function getRowProps(props, _ref) {
-    var _cx;
-    var row = _ref.row;
-    return [props, {
-      className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _cx))
-    }];
-  };
-  var getRowStyles = function getRowStyles(props, _ref2) {
-    var row = _ref2.row;
-    return [props, {
-      style: {
-        paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
-      }
-    }];
-  };
-  var getCellProps = function getCellProps(props, _ref3) {
-    var cell = _ref3.cell,
-      instance = _ref3.instance;
-    // reduce the "first cell"s width to compensate added (left) margin
-    var isFirstCell = instance.columns.findIndex(function (c) {
-      return c.id === cell.column.id;
-    }) === 0;
-    return [props, {
-      style: {
-        marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
-      }
-    }];
-  };
   var useInstance = function useInstance(instance) {
+    // This useEffect will expand rows if they exist in the initialState obj
+    (0, _react.useEffect)(function () {
+      var rows = instance.rows,
+        initialState = instance.initialState;
+      var expandedRowIds = initialState.expandedRowIds;
+      if (expandedRowIds) {
+        Object.keys(expandedRowIds).forEach(function (key) {
+          var row = rows.filter(function (r) {
+            return r.id.toString() === key.toString();
+          });
+          if (row.length && key.toString() === row[0].id.toString()) {
+            row[0].toggleRowExpanded();
+          }
+        });
+      }
+    }, [instance]);
+    var marginLeft = 24;
+    var getRowProps = function getRowProps(props, _ref) {
+      var _cx;
+      var row = _ref.row;
+      return [props, {
+        className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _cx))
+      }];
+    };
+    var getRowStyles = function getRowStyles(props, _ref2) {
+      var row = _ref2.row;
+      return [props, {
+        style: {
+          paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
+        }
+      }];
+    };
+    var getCellProps = function getCellProps(props, _ref3) {
+      var cell = _ref3.cell,
+        instance = _ref3.instance;
+      // reduce the "first cell"s width to compensate added (left) margin
+      var isFirstCell = instance.columns.findIndex(function (c) {
+        return c.id === cell.column.id;
+      }) === 0;
+      return [props, {
+        style: {
+          marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
+        }
+      }];
+    };
     Object.assign(instance, {
       withNestedRows: true
     });
+    hooks.getRowProps.push(getRowProps);
+    hooks.getRowProps.push(getRowStyles);
+    hooks.getCellProps.push(getCellProps);
   };
-  hooks.getRowProps.push(getRowProps);
-  hooks.getRowProps.push(getRowStyles);
-  hooks.getCellProps.push(getCellProps);
   hooks.useInstance.push(useInstance);
 };
 var _default = useNestedRows;

package/lib/components/Datagrid/useOnRowClick.js

@@ -35,7 +35,7 @@ var useOnRowClick = function useOnRowClick(hooks) {
               row.classList.remove("".concat(_settings.carbon.prefix, "--data-table--selected"));
             });
           }
-          var closestRow = event.target.closest(".".concat(_settings.pkg.prefix, "--datagrid__carbon-row"));
+          var closestRow = event.target.closest('tr');
           closestRow.classList.add("".concat(_settings.carbon.prefix, "--data-table--selected"));
           if (!withSelectRows) {
             instance.selectedFlatRows && instance.selectedFlatRows.map(function (toggleRow) {

package/lib/components/index.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "AboutModal", {
     return _AboutModal.AboutModal;
   }
 });
+Object.defineProperty(exports, "ButtonMenu", {
+  enumerable: true,
+  get: function get() {
+    return _ButtonMenu.ButtonMenu;
+  }
+});
 Object.defineProperty(exports, "Cascade", {
   enumerable: true,
   get: function get() {
@@ -587,6 +593,7 @@ Object.defineProperty(exports, "useWebTerminal", {
 });
 var _AboutModal = require("./AboutModal");
 var _APIKeyModal = require("./APIKeyModal");
+var _ButtonMenu = require("./ButtonMenu");
 var _Cascade = require("./Cascade");
 var _ComboButton = require("./ComboButton");
 var _CreateFullPage = require("./CreateFullPage");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.66.0",
+  "version": "1.68.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -97,5 +97,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "7af504361db8089815fc8527da02eaad1871362e"
+  "gitHead": "d1c99ff4199bf3da40a4088dae72668f302d4268"
 }

package/scss/components/Datagrid/styles/_datagrid.scss

@@ -542,13 +542,14 @@
 }
 
 .#{$block-class}
-  .#{$carbon-prefix}--data-table--selected:not(.#{$block-class}__active-row) {
+  .#{$carbon-prefix}--data-table--selected:not(.#{$block-class}__active-row)
+  td:first-child {
   position: relative;
 }
 
 .#{$block-class}
   .#{$carbon-prefix}--data-table--selected:not(.#{$block-class}__active-row)
-  :first-child:not(.#{$carbon-prefix}--checkbox--inline)::before {
+  td:first-child:not(.#{$carbon-prefix}--checkbox--inline)::before {
   position: absolute;
   top: 0;
   left: 0;