@carbon/ibm-products 2.14.0 → 2.15.1

package/lib/components/Datagrid/Datagrid/DatagridHeaderRow.js

@@ -26,8 +26,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * LICENSE file in the root directory of this source tree.
  */
 
-// @flow
-
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var getAccessibilityProps = function getAccessibilityProps(header) {
   var props = {};
@@ -69,38 +67,6 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
   var _useState = (0, _react.useState)(2),
     _useState2 = (0, _slicedToArray2.default)(_useState, 1),
     incrementAmount = _useState2[0];
-  var getClientXPosition = function getClientXPosition(event) {
-    var isTouchEvent = false;
-    if (event.type === 'touchstart') {
-      // Do not respond to multiple touches (e.g. 2 or 3 fingers)
-      if (event.touches && event.touches.length > 1) {
-        return;
-      }
-      isTouchEvent = true;
-    }
-    var clientX = isTouchEvent ? Math.round(event.touches[0].clientX) : event.clientX;
-    var closestHeader = event.target.closest('th');
-    var closestHeaderCoords = closestHeader.getBoundingClientRect();
-    var headerOffset = closestHeaderCoords.left;
-    var offsetValue = clientX - headerOffset;
-    return offsetValue;
-  };
-  (0, _react.useEffect)(function () {
-    var isResizing = datagridState.state.isResizing;
-    if (isResizing) {
-      var onColResizeEnd = datagridState.onColResizeEnd;
-      document.addEventListener('mouseup', function () {
-        (0, _stateReducer.handleColumnResizeEndEvent)(datagridState.dispatch, onColResizeEnd, isResizing);
-        document.activeElement.blur();
-      });
-    }
-    return function () {
-      document.removeEventListener('mouseup', function () {
-        return (0, _stateReducer.handleColumnResizeEndEvent)(datagridState.dispatch);
-      });
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [datagridState.state.isResizing]);
   return /*#__PURE__*/_react.default.createElement(_react2.TableRow, (0, _extends2.default)({}, headerGroup.getHeaderGroupProps(), {
     className: (0, _classnames.default)("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
     ref: headRef
@@ -121,8 +87,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       state = datagridState.state,
       dispatch = datagridState.dispatch,
       onColResizeEnd = datagridState.onColResizeEnd;
-    var columnResizing = state.columnResizing,
-      isResizing = state.isResizing;
+    var columnResizing = state.columnResizing;
     var columnWidths = columnResizing.columnWidths;
     var originalCol = visibleColumns[index];
     return /*#__PURE__*/_react.default.createElement(_react2.TableHeader, (0, _extends2.default)({}, header.getHeaderProps(), {
@@ -130,22 +95,11 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       key: header.id,
       "aria-hidden": header.id === 'spacer' && 'true'
     }, getAccessibilityProps(header)), header.render('Header'), header.getResizerProps && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, header.getResizerProps(), {
-      onMouseMove: function onMouseMove(event) {
-        if (isResizing) {
-          var newWidth = getClientXPosition(event);
-          // Sets a min width for resizing so at least one character from the column header is visible
-          if (newWidth >= 50) {
-            (0, _stateReducer.handleColumnResizingEvent)(dispatch, header, newWidth);
-          }
-        }
-      },
-      onMouseDown: function onMouseDown() {
-        return (0, _stateReducer.handleColumnResizeStartEvent)(dispatch, header.id);
-      },
       onKeyDown: function onKeyDown(event) {
         var key = event.key;
         if (key === 'ArrowLeft' || key === 'ArrowRight') {
-          var currentColumnWidth = columnWidths[header.id] || (datagridState.isTableSortable && originalCol.width < 90 ? 90 : originalCol.width);
+          var originalColMinWidth = originalCol.minWidth || 90;
+          var currentColumnWidth = columnWidths[header.id] || (datagridState.isTableSortable && originalCol.width < originalColMinWidth ? originalColMinWidth : originalCol.width);
           if (key === 'ArrowLeft') {
             if (currentColumnWidth - incrementAmount > Math.max(minWidth, 50)) {
               var newWidth = currentColumnWidth - incrementAmount;
@@ -159,7 +113,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
         }
       },
       onKeyUp: function onKeyUp() {
-        return (0, _stateReducer.handleColumnResizeEndEvent)(dispatch, onColResizeEnd, header.id);
+        return (0, _stateReducer.handleColumnResizeEndEvent)(dispatch, onColResizeEnd, header.id, true);
       },
       className: (0, _classnames.default)("".concat(blockClass, "__col-resizer-range")),
       type: "range",

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

@@ -22,9 +22,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * LICENSE file in the root directory of this source tree.
  */
 
-var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
+var blockClass = "".concat(_settings.pkg.prefix, "--datagrid__table-toolbar");
 var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridState, width, ref) {
-  var _Object$keys;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     displayAllInMenu = _useState2[0],
@@ -43,7 +42,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     toolbarBatchActions = datagridState.toolbarBatchActions,
     setGlobalFilter = datagridState.setGlobalFilter,
     rows = datagridState.rows;
-  var totalSelected = (_Object$keys = Object.keys(selectedRowIds || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length;
+  var selectedKeys = Object.keys(selectedRowIds || {});
+  var totalSelected = selectedKeys.length;
 
   // Get initial width of batch actions container,
   // used to measure when all items are put inside
@@ -64,21 +64,20 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     }
   }, [width, ref, initialListWidth]);
   var getSelectedRowData = function getSelectedRowData() {
-    var selectedRowIndexes = Object.keys(selectedRowIds);
-    var selectedRowData = selectedRowIndexes && selectedRowIndexes.length ? selectedRowIndexes.map(function (rowIndex) {
+    if (selectedKeys.length === 0) {
+      return [];
+    }
+    return selectedKeys.map(function (rowIndex) {
       var filteredRow = rows.filter(function (row) {
         return row.index === parseInt(rowIndex);
       });
-      if (filteredRow.length) {
-        return filteredRow[0];
-      }
-      return [];
-    }) : [];
-    return selectedRowData;
+      return filteredRow.length ? filteredRow[0] : [];
+    });
   };
 
   // Render batch actions in ButtonMenu
   var renderBatchActionOverflow = function renderBatchActionOverflow() {
+    var menuClass = "".concat(blockClass, "__button-menu");
     var minWidthBeforeOverflowIcon = 380;
     // Do not render ButtonMenu when there are 3 or less items
     // and if there is enough available space to render all the items
@@ -96,12 +95,12 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     };
     return /*#__PURE__*/_react.default.createElement(_react2.MenuButton, {
       label: "More",
-      className: (0, _classnames.default)("".concat(blockClass, "__button-menu"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__button-menu--icon-only"), width <= minWidthBeforeOverflowIcon))
-    }, toolbarBatchActions && toolbarBatchActions.map(function (batchAction, index) {
-      if (index < 2 && !displayAllInMenu) {
-        return;
+      className: (0, _classnames.default)([menuClass, (0, _defineProperty2.default)({}, "".concat(menuClass, "-icon-only"), width <= minWidthBeforeOverflowIcon)])
+    }, toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
+      var hidden = index < 2 && !displayAllInMenu;
+      if (!hidden) {
+        return renderItem(batchAction, index);
       }
-      return renderItem(batchAction, index);
     }));
   };
   var onClickHandler = function onClickHandler(event, batchAction) {
@@ -149,12 +148,12 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
     DatagridBatchActions = datagridState.DatagridBatchActions,
     batchActions = datagridState.batchActions,
     rowSize = datagridState.rowSize;
-  var getRowHeight = rowSize ? rowSize : 'lg';
+  var getRowHeight = rowSize || 'lg';
   return batchActions && DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
-    className: (0, _classnames.default)("".concat(blockClass, "__table-toolbar"), "".concat(blockClass, "__table-toolbar--").concat(getRowHeight))
+    className: (0, _classnames.default)([blockClass, "".concat(blockClass, "--").concat(getRowHeight)])
   }, /*#__PURE__*/_react.default.createElement(_react2.TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "__table-toolbar")
+    className: blockClass
   }, /*#__PURE__*/_react.default.createElement(_react2.TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
 };
 var _default = exports.default = DatagridToolbar;

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

@@ -67,7 +67,9 @@ var FilterPanel = function FilterPanel(_ref) {
     _ref$searchPlaceholde = _ref.searchPlaceholder,
     searchPlaceholder = _ref$searchPlaceholde === void 0 ? 'Find filters' : _ref$searchPlaceholde,
     _ref$reactTableFilter = _ref.reactTableFiltersState,
-    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter,
+    _ref$autoHideFilters = _ref.autoHideFilters,
+    autoHideFilters = _ref$autoHideFilters === void 0 ? false : _ref$autoHideFilters;
   /** State */
   var _useState = (0, _react2.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -85,7 +87,8 @@ var FilterPanel = function FilterPanel(_ref) {
       variation: _constants.PANEL,
       reactTableFiltersState: reactTableFiltersState,
       onCancel: onCancel,
-      panelOpen: panelOpen
+      panelOpen: panelOpen,
+      autoHideFilters: autoHideFilters
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
@@ -248,6 +251,7 @@ var FilterPanel = function FilterPanel(_ref) {
   })), renderActionSet()));
 };
 FilterPanel.propTypes = {
+  autoHideFilters: _propTypes.default.bool,
   closeIconDescription: _propTypes.default.string,
   filterPanelMinHeight: _propTypes.default.number,
   filterSections: _propTypes.default.array,

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

@@ -31,7 +31,7 @@ var OverflowCheckboxes = function OverflowCheckboxes(_ref) {
     showAllItems = _useState2[0],
     setShowAllItems = _useState2[1];
   var firstFiveItems = filtersState[column].value.slice(0, 5);
-  var restOfTheItems = filtersState[column].value.slice(5, filtersState[column].value.length - 1);
+  var restOfTheItems = filtersState[column].value.slice(5, filtersState[column].value.length);
   var renderCheckbox = function renderCheckbox(option) {
     return /*#__PURE__*/_react2.default.createElement(_react.Checkbox, (0, _extends2.default)({
       key: option.labelText

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js

@@ -60,7 +60,8 @@ var useFilters = function useFilters(_ref2) {
     reactTableFiltersState = _ref2.reactTableFiltersState,
     _ref2$onCancel = _ref2.onCancel,
     onCancel = _ref2$onCancel === void 0 ? function () {} : _ref2$onCancel,
-    panelOpen = _ref2.panelOpen;
+    panelOpen = _ref2.panelOpen,
+    autoHideFilters = _ref2.autoHideFilters;
   /** State */
   var _useState = (0, _react2.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -212,7 +213,7 @@ var useFilters = function useFilters(_ref2) {
       return console.error("type: ".concat(type, "; does not exist as a type of filter."));
     }
     var renderCheckboxes = function renderCheckboxes() {
-      if (variation === _constants.PANEL && filtersState[column].value.length > 10) {
+      if (variation === _constants.PANEL && filtersState[column].value.length > 10 && !autoHideFilters) {
         return /*#__PURE__*/_react2.default.createElement(_OverflowCheckboxes.default, {
           components: components,
           type: type,

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

@@ -4,36 +4,30 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stateReducer = exports.handleColumnResizingEvent = exports.handleColumnResizeStartEvent = exports.handleColumnResizeEndEvent = void 0;
+exports.stateReducer = exports.handleColumnResizingEvent = exports.handleColumnResizeEndEvent = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _settings = require("../../../../settings");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-/**
- * 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.
- */
-
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * Copyright IBM Corp. 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.
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       */
 var COLUMN_RESIZE_START = 'columnStartResizing';
 var COLUMN_RESIZING = 'columnResizing';
 var COLUMN_RESIZE_END = 'columnDoneResizing';
 var INIT = 'init';
-var handleColumnResizeStartEvent = exports.handleColumnResizeStartEvent = function handleColumnResizeStartEvent(dispatch, headerId) {
-  dispatch({
-    type: COLUMN_RESIZE_START,
-    payload: {
-      headerId: headerId
-    }
-  });
-};
-var handleColumnResizeEndEvent = exports.handleColumnResizeEndEvent = function handleColumnResizeEndEvent(dispatch, onColResizeEnd, headerId) {
+var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
+var handleColumnResizeEndEvent = exports.handleColumnResizeEndEvent = function handleColumnResizeEndEvent(dispatch, onColResizeEnd, headerId, isKeyEvent) {
   dispatch({
     type: COLUMN_RESIZE_END,
     payload: {
       onColResizeEnd: onColResizeEnd,
-      headerId: headerId
+      headerId: headerId,
+      isKeyEvent: isKeyEvent
     }
   });
 };
@@ -67,42 +61,45 @@ var stateReducer = exports.stateReducer = function stateReducer(newState, action
       }
     case COLUMN_RESIZE_START:
       {
-        var headerId = action.payload.headerId;
+        var _ref = action.payload || {},
+          headerId = _ref.headerId;
         return _objectSpread(_objectSpread({}, newState), {}, {
           isResizing: headerId
         });
       }
     case COLUMN_RESIZING:
       {
-        var _ref = action.payload || {},
-          _headerId = _ref.headerId,
-          newWidth = _ref.newWidth,
-          defaultWidth = _ref.defaultWidth;
+        var _ref2 = action.payload || {},
+          _headerId = _ref2.headerId,
+          newWidth = _ref2.newWidth,
+          defaultWidth = _ref2.defaultWidth;
         var newColumnWidth = {};
         if (typeof _headerId === 'undefined') {
           return _objectSpread({}, newState);
         }
         newColumnWidth[_headerId] = newWidth;
-        var cleanedWidths = Object.fromEntries(Object.entries(newState.columnResizing.columnWidths).filter(function (_ref2) {
-          var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-            _ = _ref3[0],
-            value = _ref3[1];
+        var cleanedWidths = Object.fromEntries(Object.entries(newState.columnResizing.columnWidths).filter(function (_ref3) {
+          var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+            _ = _ref4[0],
+            value = _ref4[1];
           return !isNaN(value);
         }));
+        var headerIdArray = newState.columnResizing.headerIdWidths || [];
         return _objectSpread(_objectSpread({}, newState), {}, {
           isResizing: _headerId,
           columnResizing: _objectSpread(_objectSpread({}, newState.columnResizing), {}, {
             columnWidth: defaultWidth,
             columnWidths: _objectSpread(_objectSpread({}, cleanedWidths), newColumnWidth),
-            headerIdWidths: [_headerId, newWidth]
+            headerIdWidths: [].concat((0, _toConsumableArray2.default)(headerIdArray), [[_headerId, newWidth]])
           })
         });
       }
     case COLUMN_RESIZE_END:
       {
-        var _action$payload = action.payload,
-          onColResizeEnd = _action$payload.onColResizeEnd,
-          _headerId2 = _action$payload.headerId;
+        var _ref5 = action.payload || {},
+          onColResizeEnd = _ref5.onColResizeEnd,
+          _headerId2 = _ref5.headerId,
+          isKeyEvent = _ref5.isKeyEvent;
         var currentColumn = {};
         currentColumn[_headerId2] = newState.columnResizing.columnWidths[_headerId2];
         var allChangedColumns = newState.columnResizing.columnWidths;
@@ -110,8 +107,22 @@ var stateReducer = exports.stateReducer = function stateReducer(newState, action
         if (isResizing) {
           onColResizeEnd === null || onColResizeEnd === void 0 || onColResizeEnd(currentColumn, allChangedColumns);
         }
+        if (!isKeyEvent) {
+          if (typeof isKeyEvent === 'undefined') {
+            // Blur resizer input if it has focus and is not from a key event resize
+            if (document.activeElement.classList.contains("".concat(blockClass, "__col-resizer-range"))) {
+              var _document;
+              (_document = document) === null || _document === void 0 || (_document = _document.activeElement) === null || _document === void 0 || _document.blur();
+            }
+            return;
+          }
+        }
         return _objectSpread(_objectSpread({}, newState), {}, {
-          isResizing: false
+          isResizing: false,
+          columnResizing: _objectSpread(_objectSpread({}, newState.columnResizing), {}, {
+            isResizingColumn: false,
+            startX: null
+          })
         });
       }
   }

package/lib/components/Datagrid/useActionsColumn.js

@@ -91,7 +91,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
                 }
               })));
             })), !isFetching && rowActions.length > 2 && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_react2.OverflowMenu, {
-              align: "top-right",
+              align: "left",
               size: "sm",
               flipped: true,
               onClick: function onClick(e) {

package/lib/components/Datagrid/useColumnCenterAlign.js

@@ -11,12 +11,11 @@ var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../settings");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /*
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * Licensed Materials - Property of IBM
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * 5724-Q36
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * (c) Copyright IBM Corp. 2020
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * US Government Users Restricted Rights - Use, duplication or disclosure
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * restricted by GSA ADP Schedule Contract with IBM Corp.
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * Copyright IBM Corp. 2020, 2023
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       *
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * This source code is licensed under the Apache-2.0 license found in the
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * LICENSE file in the root directory of this source tree.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        */
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useColumnCenterAlign = function useColumnCenterAlign(hooks) {

package/lib/components/Datagrid/useColumnRightAlign.js

@@ -11,12 +11,11 @@ var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../settings");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /*
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * Licensed Materials - Property of IBM
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * 5724-Q36
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * (c) Copyright IBM Corp. 2020
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * US Government Users Restricted Rights - Use, duplication or disclosure
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * restricted by GSA ADP Schedule Contract with IBM Corp.
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * Copyright IBM Corp. 2020, 2023
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       *
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * This source code is licensed under the Apache-2.0 license found in the
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * LICENSE file in the root directory of this source tree.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        */
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useColumnRightAlign = function useColumnRightAlign(hooks) {

package/lib/components/Datagrid/useNestedRowExpander.js

@@ -15,14 +15,13 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../settings");
 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; }
-/* eslint-disable react/prop-types */
-/**
- * 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.
- */
-
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable react/prop-types */ /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             * Copyright IBM Corp. 2020, 2023
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             *
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             * This source code is licensed under the Apache-2.0 license found in the
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             * LICENSE file in the root directory of this source tree.
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             */
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useNestedRowExpander = function useNestedRowExpander(hooks) {
   var tempState = (0, _react.useRef)();
@@ -35,6 +34,13 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
       Cell: function Cell(_ref) {
         var _cx;
         var row = _ref.row;
+        var expanderButtonProps = _objectSpread(_objectSpread({}, row.getToggleRowExpandedProps()), {}, {
+          onClick: function onClick(event) {
+            // Prevents `onRowClick` from being called if `useOnRowClick` is included
+            event.stopPropagation();
+            row.toggleRowExpanded();
+          }
+        });
         var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
           _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
           expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
@@ -45,7 +51,7 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
           type: "button",
           "aria-label": expanderTitle,
           className: (0, _classnames.default)("".concat(blockClass, "__row-expander"), "".concat(_settings.carbon.prefix, "--btn"), "".concat(_settings.carbon.prefix, "--btn--ghost"))
-        }, row.getToggleRowExpandedProps(), {
+        }, expanderButtonProps, {
           title: expanderTitle
         }), /*#__PURE__*/_react.default.createElement(_icons.ChevronRight, {
           className: (0, _classnames.default)("".concat(blockClass, "__expander-icon"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__expander-icon--not-open"), !row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__expander-icon--open"), row.isExpanded), _cx))

package/lib/components/Datagrid/useRowExpander.js

@@ -8,20 +8,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _icons = require("@carbon/react/icons");
 var _settings = require("../../settings");
 var _classnames = _interopRequireDefault(require("classnames"));
 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; }
-/* eslint-disable react/prop-types */
-/**
- * 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.
- */
-
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable react/prop-types */ /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             * Copyright IBM Corp. 2020, 2023
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             *
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             * This source code is licensed under the Apache-2.0 license found in the
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             * LICENSE file in the root directory of this source tree.
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             */
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var useRowExpander = function useRowExpander(hooks) {
   var tempState = (0, _react.useRef)();
@@ -33,6 +33,13 @@ var useRowExpander = function useRowExpander(hooks) {
       id: 'expander',
       Cell: function Cell(_ref) {
         var row = _ref.row;
+        var expanderButtonProps = _objectSpread(_objectSpread({}, row.getToggleRowExpandedProps()), {}, {
+          onClick: function onClick(event) {
+            // Prevents `onRowClick` from being called if `useOnRowClick` is included
+            event.stopPropagation();
+            row.toggleRowExpanded();
+          }
+        });
         var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
           _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
           expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
@@ -43,7 +50,7 @@ var useRowExpander = function useRowExpander(hooks) {
           type: "button",
           "aria-label": expanderTitle,
           className: (0, _classnames.default)("".concat(blockClass, "__row-expander"), "".concat(_settings.carbon.prefix, "--btn"), "".concat(_settings.carbon.prefix, "--btn--ghost"))
-        }, row.getToggleRowExpandedProps(), {
+        }, expanderButtonProps, {
           title: expanderTitle
         }), row.isExpanded ? /*#__PURE__*/_react.default.createElement(_icons.ChevronUp, {
           className: "".concat(blockClass, "__row-expander--icon")

package/lib/components/Datagrid/useSelectAllToggle.js

@@ -24,7 +24,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 // @flow
 
-var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
+var blockClass = "".concat(_settings.pkg.prefix, "--datagrid__select-all");
 var useSelectAllToggle = function useSelectAllToggle(hooks) {
   useSelectAllWithToggleComponent(hooks);
   useAddClassNameToSelectRow(hooks);
@@ -71,7 +71,7 @@ var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
     var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
     if (column.id === _commonColumnIds.selectionColumnId && DatagridPagination) {
       return [props, {
-        className: (0, _classnames.default)("".concat(blockClass, "__select-all-toggle-on"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
+        className: (0, _classnames.default)("".concat(blockClass, "-toggle-on"), (0, _defineProperty2.default)({}, "".concat(blockClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
       }];
     }
     return [props];