@carbon/ibm-products 1.59.0 → 1.59.1

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /**
- * Copyright IBM Corp. 2022, 2022
+ * Copyright IBM Corp. 2022, 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.
@@ -62,8 +62,10 @@ export var DatagridContent = function DatagridContent(_ref) {
     DatagridActions = datagridState.DatagridActions,
     totalColumnsWidth = datagridState.totalColumnsWidth,
     gridRef = datagridState.gridRef,
-    state = datagridState.state;
-  var rows = DatagridPagination && datagridState.page || datagridState.rows;
+    state = datagridState.state,
+    page = datagridState.page,
+    rows = datagridState.rows;
+  var contentRows = DatagridPagination && page || rows;
   var gridAreaRef = useRef();
   var multiKeyTrackingRef = useRef();
   useClickOutside(gridAreaRef, function (target) {
@@ -101,8 +103,8 @@ export var DatagridContent = function DatagridContent(_ref) {
         return handleGridFocus(inlineEditState, dispatch);
       } : null,
       title: title
-    }), !withVirtualScroll ? /*#__PURE__*/React.createElement(DatagridHead, datagridState) : null, /*#__PURE__*/React.createElement(DatagridBody, _extends({}, datagridState, {
-      rows: rows
+    }), !withVirtualScroll && /*#__PURE__*/React.createElement(DatagridHead, datagridState), /*#__PURE__*/React.createElement(DatagridBody, _extends({}, datagridState, {
+      rows: contentRows
     })));
   };
   var _useMultipleKeyTracki = useMultipleKeyTracking({
@@ -153,7 +155,7 @@ export var DatagridContent = function DatagridContent(_ref) {
   }, renderTable()) : withVirtualScroll ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__virtualScrollContainer"),
     ref: gridRef
-  }, renderTable()) : renderTable()))), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/React.createElement(DatagridPagination, datagridState), CustomizeColumnsTearsheet && /*#__PURE__*/React.createElement(CustomizeColumnsTearsheet, {
+  }, renderTable()) : renderTable()))), (contentRows === null || contentRows === void 0 ? void 0 : contentRows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/React.createElement(DatagridPagination, datagridState), CustomizeColumnsTearsheet && /*#__PURE__*/React.createElement(CustomizeColumnsTearsheet, {
     instance: datagridState
   }));
 };

package/es/components/Datagrid/Datagrid/DatagridEmptyBody.js

@@ -38,7 +38,8 @@ var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
   }), {
     className: "".concat(blockClass, "__empty-state-body")
   }), /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableCell, {
-    colSpan: headers.length
+    colSpan: headers.length,
+    className: "".concat(blockClass, "__empty-state-cell")
   }, emptyStateType === 'error' && /*#__PURE__*/React.createElement(ErrorEmptyState, emptyStateProps), emptyStateType === 'noData' && /*#__PURE__*/React.createElement(NoDataEmptyState, emptyStateProps), emptyStateType === 'notFound' && /*#__PURE__*/React.createElement(NotFoundEmptyState, emptyStateProps))));
 };
 export default DatagridEmptyBody;

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

@@ -1,9 +1,8 @@
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * Copyright IBM Corp. 2020, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 import React from 'react';
@@ -11,17 +10,31 @@ import { pkg } from '../../../settings';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 
 // eslint-disable-next-line react/prop-types
-var DatagridExpandedRow = function DatagridExpandedRow(PreviousRowRenderer, ExpandedRowContentComponent) {
+var DatagridExpandedRow = function DatagridExpandedRow(ExpandedRowContentComponent) {
   return function (datagridState) {
     var row = datagridState.row;
     var _ref = row || {},
       expandedContentHeight = _ref.expandedContentHeight;
-    if (!row.isExpanded) {
-      return PreviousRowRenderer(datagridState);
-    }
-    return /*#__PURE__*/React.createElement("div", {
-      className: "".concat(blockClass, "__expanded-row")
-    }, PreviousRowRenderer(datagridState), /*#__PURE__*/React.createElement("div", {
+    var toggleParentHoverClass = function toggleParentHoverClass(event, eventType) {
+      var _event$target, _event$target$parentN;
+      if (event !== null && event !== void 0 && (_event$target = event.target) !== null && _event$target !== void 0 && (_event$target$parentN = _event$target.parentNode) !== null && _event$target$parentN !== void 0 && _event$target$parentN.previousElementSibling) {
+        var parentNode = event.target.parentNode.previousElementSibling;
+        if (eventType === 'enter') {
+          parentNode.classList.add("".concat(blockClass, "__expandable-row--hover"));
+        } else {
+          parentNode.classList.remove("".concat(blockClass, "__expandable-row--hover"));
+        }
+      }
+    };
+    return /*#__PURE__*/React.createElement("tr", {
+      className: "".concat(blockClass, "__expanded-row"),
+      onMouseEnter: function onMouseEnter(event) {
+        return toggleParentHoverClass(event, 'enter');
+      },
+      onMouseLeave: function onMouseLeave(event) {
+        return toggleParentHoverClass(event);
+      }
+    }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "__expanded-row-content"),
       style: {
         height: expandedContentHeight ? expandedContentHeight : null

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

@@ -2,6 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["children"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /*
  * Licensed Materials - Property of IBM
  * 5724-Q36
@@ -32,7 +34,8 @@ var DatagridRow = function DatagridRow(datagridState) {
   var _cx;
   var row = datagridState.row,
     rowSize = datagridState.rowSize,
-    withNestedRows = datagridState.withNestedRows;
+    withNestedRows = datagridState.withNestedRows,
+    prepareRow = datagridState.prepareRow;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -47,6 +50,9 @@ var DatagridRow = function DatagridRow(datagridState) {
   };
   var hoverHandler = function hoverHandler(event) {
     var _hoverRow$style, _hoverRow$style2, _hoverRow$style3;
+    if (!withNestedRows) {
+      return;
+    }
     var subRowCount = getVisibleNestedRowCount(row);
     var totalNestedRowIndicatorHeight = px(subRowCount * rowHeights[rowSize]);
     var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
@@ -63,48 +69,50 @@ var DatagridRow = function DatagridRow(datagridState) {
       el.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
     });
   };
-  return /*#__PURE__*/React.createElement(TableRow, _extends({
-    className: cx("".concat(blockClass, "__carbon-row"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), _defineProperty(_cx, "".concat(carbon.prefix, "--data-table--selected"), row.isSelected), _cx))
+  var renderExpandedRow = function renderExpandedRow() {
+    if (row.isExpanded) {
+      var _row$RowExpansionRend;
+      prepareRow(row);
+      return row === null || row === void 0 ? void 0 : (_row$RowExpansionRend = row.RowExpansionRenderer) === null || _row$RowExpansionRend === void 0 ? void 0 : _row$RowExpansionRend.call(row, _objectSpread(_objectSpread({}, datagridState), {}, {
+        row: row
+      }));
+    }
+    return null;
+  };
+  var handleMouseLeave = function handleMouseLeave(event) {
+    var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
+    hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
+  };
+  var handleOnKeyUp = function handleOnKeyUp(event) {
+    if (!withNestedRows) {
+      return;
+    }
+    if (event.key === 'Enter' || event.key === 'Space') {
+      focusRemover();
+      hoverHandler(event);
+    }
+  };
+  var rowClassNames = cx("".concat(blockClass, "__carbon-row"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _defineProperty(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), _defineProperty(_cx, "".concat(carbon.prefix, "--data-table--selected"), row.isSelected), _cx));
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableRow, _extends({
+    className: rowClassNames
   }, row.getRowProps({
     role: false
   }), {
     key: row.id,
-    onMouseEnter: function onMouseEnter(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      hoverHandler(event);
-    },
-    onMouseLeave: function onMouseLeave(event) {
-      var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
-      hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
-    },
-    onFocus: function onFocus(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      hoverHandler(event);
-    },
-    onBlur: function onBlur() {
-      focusRemover();
-    },
-    onKeyUp: function onKeyUp(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      if (event.key === 'Enter' || event.key === 'Space') {
-        focusRemover();
-        hoverHandler(event);
-      }
-    }
+    onMouseEnter: hoverHandler,
+    onMouseLeave: handleMouseLeave,
+    onFocus: hoverHandler,
+    onBlur: focusRemover,
+    onKeyUp: handleOnKeyUp
   }), row.cells.map(function (cell, index) {
+    var _cell$column;
     var cellProps = cell.getCellProps({
       role: false
     });
     var children = cellProps.children,
       restProps = _objectWithoutProperties(cellProps, _excluded);
     var content = children || /*#__PURE__*/React.createElement(React.Fragment, null, !row.isSkeleton && cell.render('Cell'), row.isSkeleton && /*#__PURE__*/React.createElement(SkeletonText, null));
-    if (cell && cell.column && cell.column.id === selectionColumnId) {
+    if ((cell === null || cell === void 0 ? void 0 : (_cell$column = cell.column) === null || _cell$column === void 0 ? void 0 : _cell$column.id) === selectionColumnId) {
       // directly render component without the wrapping TableCell
       return cell.render('Cell', {
         key: cell.column.id
@@ -115,6 +123,6 @@ var DatagridRow = function DatagridRow(datagridState) {
     }, restProps, {
       key: cell.column.id
     }), content);
-  }));
+  })), renderExpandedRow());
 };
 export default DatagridRow;

package/es/components/Datagrid/useExpandedRow.js

@@ -33,7 +33,7 @@ var useExpandedRow = function useExpandedRow(hooks) {
       return _objectSpread(_objectSpread({}, row), {}, {
         canExpand: row.original && !row.original.notExpandable,
         expandedContentHeight: expandedRowsHeight[row.index] || expandedContentHeight,
-        RowRenderer: DatagridExpandedRow(row.RowRenderer, ExpandedRowContentComponent)
+        RowExpansionRenderer: DatagridExpandedRow(ExpandedRowContentComponent)
       });
     });
     Object.assign(instance, {

package/es/components/Datagrid/utils/DatagridPagination.js

@@ -1,6 +1,6 @@
 /* eslint-disable react/prop-types */
 /**
- * Copyright IBM Corp. 2022, 2022
+ * Copyright IBM Corp. 2022, 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.

package/lib/components/Checklist/ChecklistChart.js

@@ -47,8 +47,8 @@ var ChecklistChart = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
     theme = _ref$theme === void 0 ? defaults.theme : _ref$theme,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var numDegrees = (0, _clamp.default)(value * 360, 0, 360);
-  var circleColor = theme === 'light' ? '#c6c6c6' : '#525252'; // $gray-30, $gray-70
-  var progressColor = theme === 'light' ? '#6929c4' : '#A56EFF'; // $purple-70, $purple-50
+  var circleColor = theme === 'light' ? '#e0e0e0' : '#525252'; // $ui-03 (-ish)
+  var progressColor = theme === 'light' ? '#a56eff' : '#a56eff'; // $purple-50
 
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass, className),

package/lib/components/Datagrid/Datagrid/DatagridContent.js

@@ -29,7 +29,7 @@ var _constants = require("./addons/Filtering/constants");
 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; }
 /**
- * Copyright IBM Corp. 2022, 2022
+ * Copyright IBM Corp. 2022, 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.
@@ -72,8 +72,10 @@ var DatagridContent = function DatagridContent(_ref) {
     DatagridActions = datagridState.DatagridActions,
     totalColumnsWidth = datagridState.totalColumnsWidth,
     gridRef = datagridState.gridRef,
-    state = datagridState.state;
-  var rows = DatagridPagination && datagridState.page || datagridState.rows;
+    state = datagridState.state,
+    page = datagridState.page,
+    rows = datagridState.rows;
+  var contentRows = DatagridPagination && page || rows;
   var gridAreaRef = (0, _react.useRef)();
   var multiKeyTrackingRef = (0, _react.useRef)();
   (0, _hooks.useClickOutside)(gridAreaRef, function (target) {
@@ -111,8 +113,8 @@ var DatagridContent = function DatagridContent(_ref) {
         return (0, _handleGridFocus.handleGridFocus)(inlineEditState, dispatch);
       } : null,
       title: title
-    }), !withVirtualScroll ? /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState) : null, /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
-      rows: rows
+    }), !withVirtualScroll && /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState), /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
+      rows: contentRows
     })));
   };
   var _useMultipleKeyTracki = (0, _hooks2.useMultipleKeyTracking)({
@@ -163,7 +165,7 @@ var DatagridContent = function DatagridContent(_ref) {
   }, renderTable()) : withVirtualScroll ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__virtualScrollContainer"),
     ref: gridRef
-  }, renderTable()) : renderTable()))), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/_react.default.createElement(DatagridPagination, datagridState), CustomizeColumnsTearsheet && /*#__PURE__*/_react.default.createElement(CustomizeColumnsTearsheet, {
+  }, renderTable()) : renderTable()))), (contentRows === null || contentRows === void 0 ? void 0 : contentRows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/_react.default.createElement(DatagridPagination, datagridState), CustomizeColumnsTearsheet && /*#__PURE__*/_react.default.createElement(CustomizeColumnsTearsheet, {
     instance: datagridState
   }));
 };

package/lib/components/Datagrid/Datagrid/DatagridEmptyBody.js

@@ -45,7 +45,8 @@ var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
   }), {
     className: "".concat(blockClass, "__empty-state-body")
   }), /*#__PURE__*/_react.default.createElement(TableRow, null, /*#__PURE__*/_react.default.createElement(TableCell, {
-    colSpan: headers.length
+    colSpan: headers.length,
+    className: "".concat(blockClass, "__empty-state-cell")
   }, emptyStateType === 'error' && /*#__PURE__*/_react.default.createElement(_EmptyStates.ErrorEmptyState, emptyStateProps), emptyStateType === 'noData' && /*#__PURE__*/_react.default.createElement(_EmptyStates.NoDataEmptyState, emptyStateProps), emptyStateType === 'notFound' && /*#__PURE__*/_react.default.createElement(_EmptyStates.NotFoundEmptyState, emptyStateProps))));
 };
 var _default = DatagridEmptyBody;

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

@@ -7,28 +7,41 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _settings = require("../../../settings");
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2020
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * Copyright IBM Corp. 2020, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 // eslint-disable-next-line react/prop-types
-var DatagridExpandedRow = function DatagridExpandedRow(PreviousRowRenderer, ExpandedRowContentComponent) {
+var DatagridExpandedRow = function DatagridExpandedRow(ExpandedRowContentComponent) {
   return function (datagridState) {
     var row = datagridState.row;
     var _ref = row || {},
       expandedContentHeight = _ref.expandedContentHeight;
-    if (!row.isExpanded) {
-      return PreviousRowRenderer(datagridState);
-    }
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: "".concat(blockClass, "__expanded-row")
-    }, PreviousRowRenderer(datagridState), /*#__PURE__*/_react.default.createElement("div", {
+    var toggleParentHoverClass = function toggleParentHoverClass(event, eventType) {
+      var _event$target, _event$target$parentN;
+      if (event !== null && event !== void 0 && (_event$target = event.target) !== null && _event$target !== void 0 && (_event$target$parentN = _event$target.parentNode) !== null && _event$target$parentN !== void 0 && _event$target$parentN.previousElementSibling) {
+        var parentNode = event.target.parentNode.previousElementSibling;
+        if (eventType === 'enter') {
+          parentNode.classList.add("".concat(blockClass, "__expandable-row--hover"));
+        } else {
+          parentNode.classList.remove("".concat(blockClass, "__expandable-row--hover"));
+        }
+      }
+    };
+    return /*#__PURE__*/_react.default.createElement("tr", {
+      className: "".concat(blockClass, "__expanded-row"),
+      onMouseEnter: function onMouseEnter(event) {
+        return toggleParentHoverClass(event, 'enter');
+      },
+      onMouseLeave: function onMouseLeave(event) {
+        return toggleParentHoverClass(event);
+      }
+    }, /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "__expanded-row-content"),
       style: {
         height: expandedContentHeight ? expandedContentHeight : null

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

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _commonColumnIds = require("../common-column-ids");
 var _settings = require("../../../settings");
 var _excluded = ["children"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var TableRow = _carbonComponentsReact.DataTable.TableRow,
   TableCell = _carbonComponentsReact.DataTable.TableCell;
@@ -31,7 +33,8 @@ var DatagridRow = function DatagridRow(datagridState) {
   var _cx;
   var row = datagridState.row,
     rowSize = datagridState.rowSize,
-    withNestedRows = datagridState.withNestedRows;
+    withNestedRows = datagridState.withNestedRows,
+    prepareRow = datagridState.prepareRow;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -46,6 +49,9 @@ var DatagridRow = function DatagridRow(datagridState) {
   };
   var hoverHandler = function hoverHandler(event) {
     var _hoverRow$style, _hoverRow$style2, _hoverRow$style3;
+    if (!withNestedRows) {
+      return;
+    }
     var subRowCount = getVisibleNestedRowCount(row);
     var totalNestedRowIndicatorHeight = (0, _layout.px)(subRowCount * rowHeights[rowSize]);
     var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
@@ -62,48 +68,50 @@ var DatagridRow = function DatagridRow(datagridState) {
       el.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
     });
   };
-  return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
-    className: (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 renderExpandedRow = function renderExpandedRow() {
+    if (row.isExpanded) {
+      var _row$RowExpansionRend;
+      prepareRow(row);
+      return row === null || row === void 0 ? void 0 : (_row$RowExpansionRend = row.RowExpansionRenderer) === null || _row$RowExpansionRend === void 0 ? void 0 : _row$RowExpansionRend.call(row, _objectSpread(_objectSpread({}, datagridState), {}, {
+        row: row
+      }));
+    }
+    return null;
+  };
+  var handleMouseLeave = function handleMouseLeave(event) {
+    var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
+    hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
+  };
+  var handleOnKeyUp = function handleOnKeyUp(event) {
+    if (!withNestedRows) {
+      return;
+    }
+    if (event.key === 'Enter' || event.key === 'Space') {
+      focusRemover();
+      hoverHandler(event);
+    }
+  };
+  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));
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
+    className: rowClassNames
   }, row.getRowProps({
     role: false
   }), {
     key: row.id,
-    onMouseEnter: function onMouseEnter(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      hoverHandler(event);
-    },
-    onMouseLeave: function onMouseLeave(event) {
-      var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
-      hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
-    },
-    onFocus: function onFocus(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      hoverHandler(event);
-    },
-    onBlur: function onBlur() {
-      focusRemover();
-    },
-    onKeyUp: function onKeyUp(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      if (event.key === 'Enter' || event.key === 'Space') {
-        focusRemover();
-        hoverHandler(event);
-      }
-    }
+    onMouseEnter: hoverHandler,
+    onMouseLeave: handleMouseLeave,
+    onFocus: hoverHandler,
+    onBlur: focusRemover,
+    onKeyUp: handleOnKeyUp
   }), row.cells.map(function (cell, index) {
+    var _cell$column;
     var cellProps = cell.getCellProps({
       role: false
     });
     var children = cellProps.children,
       restProps = (0, _objectWithoutProperties2.default)(cellProps, _excluded);
     var content = children || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !row.isSkeleton && cell.render('Cell'), row.isSkeleton && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.SkeletonText, null));
-    if (cell && cell.column && cell.column.id === _commonColumnIds.selectionColumnId) {
+    if ((cell === null || cell === void 0 ? void 0 : (_cell$column = cell.column) === null || _cell$column === void 0 ? void 0 : _cell$column.id) === _commonColumnIds.selectionColumnId) {
       // directly render component without the wrapping TableCell
       return cell.render('Cell', {
         key: cell.column.id
@@ -114,7 +122,7 @@ var DatagridRow = function DatagridRow(datagridState) {
     }, restProps, {
       key: cell.column.id
     }), content);
-  }));
+  })), renderExpandedRow());
 };
 var _default = DatagridRow;
 exports.default = _default;

package/lib/components/Datagrid/useExpandedRow.js

@@ -33,7 +33,7 @@ var useExpandedRow = function useExpandedRow(hooks) {
       return _objectSpread(_objectSpread({}, row), {}, {
         canExpand: row.original && !row.original.notExpandable,
         expandedContentHeight: expandedRowsHeight[row.index] || expandedContentHeight,
-        RowRenderer: (0, _DatagridExpandedRow.default)(row.RowRenderer, ExpandedRowContentComponent)
+        RowExpansionRenderer: (0, _DatagridExpandedRow.default)(ExpandedRowContentComponent)
       });
     });
     Object.assign(instance, {

package/lib/components/Datagrid/utils/DatagridPagination.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _carbonComponentsReact = require("carbon-components-react");
 /* eslint-disable react/prop-types */
 /**
- * Copyright IBM Corp. 2022, 2022
+ * Copyright IBM Corp. 2022, 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.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.59.0",
+  "version": "1.59.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -90,11 +90,11 @@
     "@carbon/motion": "^10.29.2",
     "@carbon/themes": "^10.55.3",
     "@carbon/type": "^10.45.3",
-    "carbon-components": "^10.58.9",
-    "carbon-components-react": "^7.59.11",
+    "carbon-components": "^10.58.10",
+    "carbon-components-react": "^7.59.14",
     "carbon-icons": "^7.0.7",
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "873c5ae8e573e99c87aadd1d300c967d7da635e6"
+  "gitHead": "042f216cbff8ac90a8b56c85e273baa3fcfb3c74"
 }

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

@@ -288,6 +288,7 @@
 }
 
 .#{$block-class}__empty-state .#{$block-class}__table-simple tr:hover td {
+  border-bottom: none;
   background: transparent;
 }
 
@@ -299,6 +300,10 @@
   flex: 1 1 auto;
 }
 
+.#{$block-class}__empty-state .#{$block-class}__empty-state-cell {
+  border-bottom: none;
+}
+
 .#{$block-class}__resizer {
   position: absolute;
   z-index: 1;

package/scss/components/Datagrid/styles/_useExpandedRow.scss

@@ -53,3 +53,13 @@
     fill: $ui-05;
   }
 }
+
+.#{$block-class}
+  .#{$carbon-prefix}--data-table
+  tbody
+  tr:hover
+  + .#{$block-class}__expanded-row,
+.#{$block-class} .#{$block-class}__expanded-row:hover,
+.#{$block-class} .#{$block-class}__expandable-row--hover td {
+  background: $layer-hover;
+}