@carbon/ibm-products 2.15.0 → 2.15.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. package/es/components/Datagrid/Datagrid/DatagridToolbar.js +18 -19
  2. package/es/components/Datagrid/useColumnCenterAlign.js +6 -6
  3. package/es/components/Datagrid/useColumnRightAlign.js +6 -6
  4. package/es/components/Datagrid/useNestedRowExpander.js +10 -1
  5. package/es/components/Datagrid/useRowExpander.js +11 -1
  6. package/es/components/Datagrid/useSelectAllToggle.js +2 -2
  7. package/es/components/Datagrid/useSelectRows.js +27 -21
  8. package/lib/components/Datagrid/Datagrid/DatagridToolbar.js +18 -19
  9. package/lib/components/Datagrid/useColumnCenterAlign.js +5 -6
  10. package/lib/components/Datagrid/useColumnRightAlign.js +5 -6
  11. package/lib/components/Datagrid/useNestedRowExpander.js +15 -9
  12. package/lib/components/Datagrid/useRowExpander.js +16 -9
  13. package/lib/components/Datagrid/useSelectAllToggle.js +2 -2
  14. package/lib/components/Datagrid/useSelectRows.js +27 -21
  15. package/package.json +2 -2
package/es/components/Datagrid/Datagrid/DatagridToolbar.js CHANGED
@@ -12,9 +12,8 @@ import { TableToolbar, TableBatchActions, TableBatchAction, MenuButton, MenuItem
12
12
  import { useResizeObserver } from '../../../global/js/hooks/useResizeObserver';
13
13
  import { pkg, carbon } from '../../../settings';
14
14
  import cx from 'classnames';
15
- var blockClass = "".concat(pkg.prefix, "--datagrid");
15
+ var blockClass = "".concat(pkg.prefix, "--datagrid__table-toolbar");
16
16
  var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridState, width, ref) {
17
- var _Object$keys;
18
17
  var _useState = useState(false),
19
18
  _useState2 = _slicedToArray(_useState, 2),
20
19
  displayAllInMenu = _useState2[0],
@@ -33,7 +32,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
33
32
  toolbarBatchActions = datagridState.toolbarBatchActions,
34
33
  setGlobalFilter = datagridState.setGlobalFilter,
35
34
  rows = datagridState.rows;
36
- var totalSelected = (_Object$keys = Object.keys(selectedRowIds || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length;
35
+ var selectedKeys = Object.keys(selectedRowIds || {});
36
+ var totalSelected = selectedKeys.length;
37
37
 
38
38
  // Get initial width of batch actions container,
39
39
  // used to measure when all items are put inside
@@ -54,21 +54,20 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
54
54
  }
55
55
  }, [width, ref, initialListWidth]);
56
56
  var getSelectedRowData = function getSelectedRowData() {
57
- var selectedRowIndexes = Object.keys(selectedRowIds);
58
- var selectedRowData = selectedRowIndexes && selectedRowIndexes.length ? selectedRowIndexes.map(function (rowIndex) {
57
+ if (selectedKeys.length === 0) {
58
+ return [];
59
+ }
60
+ return selectedKeys.map(function (rowIndex) {
59
61
  var filteredRow = rows.filter(function (row) {
60
62
  return row.index === parseInt(rowIndex);
61
63
  });
62
- if (filteredRow.length) {
63
- return filteredRow[0];
64
- }
65
- return [];
66
- }) : [];
67
- return selectedRowData;
64
+ return filteredRow.length ? filteredRow[0] : [];
65
+ });
68
66
  };
69
67
 
70
68
  // Render batch actions in ButtonMenu
71
69
  var renderBatchActionOverflow = function renderBatchActionOverflow() {
70
+ var menuClass = "".concat(blockClass, "__button-menu");
72
71
  var minWidthBeforeOverflowIcon = 380;
73
72
  // Do not render ButtonMenu when there are 3 or less items
74
73
  // and if there is enough available space to render all the items
@@ -86,12 +85,12 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
86
85
  };
87
86
  return /*#__PURE__*/React.createElement(MenuButton, {
88
87
  label: "More",
89
- className: cx("".concat(blockClass, "__button-menu"), _defineProperty({}, "".concat(blockClass, "__button-menu--icon-only"), width <= minWidthBeforeOverflowIcon))
90
- }, toolbarBatchActions && toolbarBatchActions.map(function (batchAction, index) {
91
- if (index < 2 && !displayAllInMenu) {
92
- return;
88
+ className: cx([menuClass, _defineProperty({}, "".concat(menuClass, "-icon-only"), width <= minWidthBeforeOverflowIcon)])
89
+ }, toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
90
+ var hidden = index < 2 && !displayAllInMenu;
91
+ if (!hidden) {
92
+ return renderItem(batchAction, index);
93
93
  }
94
- return renderItem(batchAction, index);
95
94
  }));
96
95
  };
97
96
  var onClickHandler = function onClickHandler(event, batchAction) {
@@ -139,12 +138,12 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
139
138
  DatagridBatchActions = datagridState.DatagridBatchActions,
140
139
  batchActions = datagridState.batchActions,
141
140
  rowSize = datagridState.rowSize;
142
- var getRowHeight = rowSize ? rowSize : 'lg';
141
+ var getRowHeight = rowSize || 'lg';
143
142
  return batchActions && DatagridActions ? /*#__PURE__*/React.createElement("div", {
144
143
  ref: ref,
145
- className: cx("".concat(blockClass, "__table-toolbar"), "".concat(blockClass, "__table-toolbar--").concat(getRowHeight))
144
+ className: cx([blockClass, "".concat(blockClass, "--").concat(getRowHeight)])
146
145
  }, /*#__PURE__*/React.createElement(TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React.createElement("div", {
147
- className: "".concat(blockClass, "__table-toolbar")
146
+ className: blockClass
148
147
  }, /*#__PURE__*/React.createElement(TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
149
148
  };
150
149
  export default DatagridToolbar;
package/es/components/Datagrid/useColumnCenterAlign.js CHANGED
@@ -2,13 +2,13 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
3
  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; }
4
4
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
- /*
6
- * Licensed Materials - Property of IBM
7
- * 5724-Q36
8
- * (c) Copyright IBM Corp. 2020
9
- * US Government Users Restricted Rights - Use, duplication or disclosure
10
- * restricted by GSA ADP Schedule Contract with IBM Corp.
5
+ /**
6
+ * Copyright IBM Corp. 2020, 2023
7
+ *
8
+ * This source code is licensed under the Apache-2.0 license found in the
9
+ * LICENSE file in the root directory of this source tree.
11
10
  */
11
+
12
12
  import React from 'react';
13
13
  import cx from 'classnames';
14
14
  import { pkg } from '../../settings';
package/es/components/Datagrid/useColumnRightAlign.js CHANGED
@@ -2,13 +2,13 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
3
  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; }
4
4
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
- /*
6
- * Licensed Materials - Property of IBM
7
- * 5724-Q36
8
- * (c) Copyright IBM Corp. 2020
9
- * US Government Users Restricted Rights - Use, duplication or disclosure
10
- * restricted by GSA ADP Schedule Contract with IBM Corp.
5
+ /**
6
+ * Copyright IBM Corp. 2020, 2023
7
+ *
8
+ * This source code is licensed under the Apache-2.0 license found in the
9
+ * LICENSE file in the root directory of this source tree.
11
10
  */
11
+
12
12
  import React from 'react';
13
13
  import cx from 'classnames';
14
14
  import { pkg } from '../../settings';
package/es/components/Datagrid/useNestedRowExpander.js CHANGED
@@ -1,6 +1,8 @@
1
1
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
3
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
4
+ 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; }
5
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
6
  /* eslint-disable react/prop-types */
5
7
  /**
6
8
  * Copyright IBM Corp. 2020, 2023
@@ -25,6 +27,13 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
25
27
  Cell: function Cell(_ref) {
26
28
  var _cx;
27
29
  var row = _ref.row;
30
+ var expanderButtonProps = _objectSpread(_objectSpread({}, row.getToggleRowExpandedProps()), {}, {
31
+ onClick: function onClick(event) {
32
+ // Prevents `onRowClick` from being called if `useOnRowClick` is included
33
+ event.stopPropagation();
34
+ row.toggleRowExpanded();
35
+ }
36
+ });
28
37
  var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
29
38
  _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
30
39
  expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
@@ -35,7 +44,7 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
35
44
  type: "button",
36
45
  "aria-label": expanderTitle,
37
46
  className: cx("".concat(blockClass, "__row-expander"), "".concat(carbon.prefix, "--btn"), "".concat(carbon.prefix, "--btn--ghost"))
38
- }, row.getToggleRowExpandedProps(), {
47
+ }, expanderButtonProps, {
39
48
  title: expanderTitle
40
49
  }), /*#__PURE__*/React.createElement(ChevronRight, {
41
50
  className: cx("".concat(blockClass, "__expander-icon"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__expander-icon--not-open"), !row.isExpanded), _defineProperty(_cx, "".concat(blockClass, "__expander-icon--open"), row.isExpanded), _cx))
package/es/components/Datagrid/useRowExpander.js CHANGED
@@ -1,5 +1,8 @@
1
1
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
4
+ 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; }
5
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
3
6
  /* eslint-disable react/prop-types */
4
7
  /**
5
8
  * Copyright IBM Corp. 2020, 2023
@@ -23,6 +26,13 @@ var useRowExpander = function useRowExpander(hooks) {
23
26
  id: 'expander',
24
27
  Cell: function Cell(_ref) {
25
28
  var row = _ref.row;
29
+ var expanderButtonProps = _objectSpread(_objectSpread({}, row.getToggleRowExpandedProps()), {}, {
30
+ onClick: function onClick(event) {
31
+ // Prevents `onRowClick` from being called if `useOnRowClick` is included
32
+ event.stopPropagation();
33
+ row.toggleRowExpanded();
34
+ }
35
+ });
26
36
  var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
27
37
  _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
28
38
  expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
@@ -33,7 +43,7 @@ var useRowExpander = function useRowExpander(hooks) {
33
43
  type: "button",
34
44
  "aria-label": expanderTitle,
35
45
  className: cx("".concat(blockClass, "__row-expander"), "".concat(carbon.prefix, "--btn"), "".concat(carbon.prefix, "--btn--ghost"))
36
- }, row.getToggleRowExpandedProps(), {
46
+ }, expanderButtonProps, {
37
47
  title: expanderTitle
38
48
  }), row.isExpanded ? /*#__PURE__*/React.createElement(ChevronUp, {
39
49
  className: "".concat(blockClass, "__row-expander--icon")
package/es/components/Datagrid/useSelectAllToggle.js CHANGED
@@ -13,7 +13,7 @@ import cx from 'classnames';
13
13
  import { selectionColumnId } from './common-column-ids';
14
14
  import SelectAllWithToggle from './Datagrid/DatagridSelectAllWithToggle';
15
15
  import { pkg } from '../../settings';
16
- var blockClass = "".concat(pkg.prefix, "--datagrid");
16
+ var blockClass = "".concat(pkg.prefix, "--datagrid__select-all");
17
17
  var useSelectAllToggle = function useSelectAllToggle(hooks) {
18
18
  useSelectAllWithToggleComponent(hooks);
19
19
  useAddClassNameToSelectRow(hooks);
@@ -60,7 +60,7 @@ var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
60
60
  var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
61
61
  if (column.id === selectionColumnId && DatagridPagination) {
62
62
  return [props, {
63
- className: cx("".concat(blockClass, "__select-all-toggle-on"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
63
+ className: cx("".concat(blockClass, "-toggle-on"), _defineProperty({}, "".concat(blockClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
64
64
  }];
65
65
  }
66
66
  return [props];
package/es/components/Datagrid/useSelectRows.js CHANGED
@@ -3,7 +3,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
3
3
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
4
4
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
5
5
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
6
- var _excluded = ["onChange"];
6
+ var _excluded = ["onChange", "title"];
7
7
  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; }
8
8
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
9
9
  /*
@@ -21,6 +21,7 @@ import { SelectAll } from './Datagrid/DatagridSelectAll';
21
21
  import { selectionColumnId } from './common-column-ids';
22
22
  import { pkg, carbon } from '../../settings';
23
23
  var blockClass = "".concat(pkg.prefix, "--datagrid");
24
+ var checkboxClass = "".concat(pkg.prefix, "--datagrid__checkbox-cell");
24
25
  var useSelectRows = function useSelectRows(hooks) {
25
26
  useHighlightSelection(hooks);
26
27
  var useInstance = function useInstance(instance) {
@@ -54,9 +55,12 @@ var useSelectRows = function useSelectRows(hooks) {
54
55
  };
55
56
  var useHighlightSelection = function useHighlightSelection(hooks) {
56
57
  var getRowProps = function getRowProps(props, _ref) {
58
+ var _ref2;
57
59
  var row = _ref.row;
60
+ var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
61
+ checked = _row$getToggleRowSele.checked;
58
62
  return [props, {
59
- className: cx("".concat(blockClass, "__carbon-row"), row.getToggleRowSelectedProps().checked ? "".concat(carbon.prefix, "--data-table--selected ").concat(blockClass, "__active-row") : '')
63
+ className: cx(["".concat(blockClass, "__carbon-row"), (_ref2 = {}, _defineProperty(_ref2, "".concat(carbon.prefix, "--data-table--selected"), checked), _defineProperty(_ref2, "".concat(blockClass, "__active-row"), checked), _ref2)])
60
64
  }];
61
65
  };
62
66
  hooks.getRowProps.push(getRowProps);
@@ -87,30 +91,32 @@ var SelectRow = function SelectRow(datagridState) {
87
91
  return window.removeEventListener('resize', updateSize);
88
92
  };
89
93
  }, []);
94
+ var onSelectHandler = function onSelectHandler(e) {
95
+ e.stopPropagation(); // avoid triggering onRowClick
96
+ if (radio) {
97
+ toggleAllRowsSelected(false);
98
+ if (onRadioSelect) {
99
+ onRadioSelect(row);
100
+ }
101
+ }
102
+ onChange(e);
103
+ onRowSelect === null || onRowSelect === void 0 || onRowSelect(row, e);
104
+ };
90
105
  var selectDisabled = isFetching || row.getRowProps().disabled;
91
- var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
92
- onChange = _row$getToggleRowSele.onChange,
93
- selectProps = _objectWithoutProperties(_row$getToggleRowSele, _excluded);
106
+ var _row$getToggleRowSele2 = row.getToggleRowSelectedProps(),
107
+ onChange = _row$getToggleRowSele2.onChange,
108
+ title = _row$getToggleRowSele2.title,
109
+ selectProps = _objectWithoutProperties(_row$getToggleRowSele2, _excluded);
94
110
  var cellProps = cell.getCellProps();
95
111
  var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
112
+ var rowId = "".concat(tableId, "-").concat(row.index);
96
113
  return /*#__PURE__*/React.createElement(TableSelectRow, _extends({}, cellProps, selectProps, {
97
114
  radio: radio,
98
- onSelect: function onSelect(e) {
99
- e.stopPropagation(); // avoid triggering onRowClick
100
- if (radio) {
101
- toggleAllRowsSelected(false);
102
- if (onRadioSelect) {
103
- onRadioSelect(row);
104
- }
105
- }
106
- onChange(e);
107
- onRowSelect === null || onRowSelect === void 0 || onRowSelect(row, e);
108
- },
109
- id: "".concat(tableId, "-").concat(row.index),
110
- name: "".concat(tableId, "-").concat(row.index, "-name"),
111
- className: cx("".concat(blockClass, "__checkbox-cell"), cellProps.className, _defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)),
112
- ariaLabel: "".concat(tableId, "-row-").concat(row.index) // TODO: aria label should be i18n'ed
113
- ,
115
+ onSelect: onSelectHandler,
116
+ id: rowId,
117
+ name: "".concat(rowId, "-name"),
118
+ className: cx([checkboxClass, cellProps.className, _defineProperty({}, "".concat(checkboxClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)]),
119
+ ariaLabel: title,
114
120
  disabled: selectDisabled
115
121
  }));
116
122
  };
package/lib/components/Datagrid/Datagrid/DatagridToolbar.js CHANGED
@@ -22,9 +22,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
22
22
  * LICENSE file in the root directory of this source tree.
23
23
  */
24
24
 
25
- var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
25
+ var blockClass = "".concat(_settings.pkg.prefix, "--datagrid__table-toolbar");
26
26
  var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridState, width, ref) {
27
- var _Object$keys;
28
27
  var _useState = (0, _react.useState)(false),
29
28
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
30
29
  displayAllInMenu = _useState2[0],
@@ -43,7 +42,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
43
42
  toolbarBatchActions = datagridState.toolbarBatchActions,
44
43
  setGlobalFilter = datagridState.setGlobalFilter,
45
44
  rows = datagridState.rows;
46
- var totalSelected = (_Object$keys = Object.keys(selectedRowIds || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length;
45
+ var selectedKeys = Object.keys(selectedRowIds || {});
46
+ var totalSelected = selectedKeys.length;
47
47
 
48
48
  // Get initial width of batch actions container,
49
49
  // used to measure when all items are put inside
@@ -64,21 +64,20 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
64
64
  }
65
65
  }, [width, ref, initialListWidth]);
66
66
  var getSelectedRowData = function getSelectedRowData() {
67
- var selectedRowIndexes = Object.keys(selectedRowIds);
68
- var selectedRowData = selectedRowIndexes && selectedRowIndexes.length ? selectedRowIndexes.map(function (rowIndex) {
67
+ if (selectedKeys.length === 0) {
68
+ return [];
69
+ }
70
+ return selectedKeys.map(function (rowIndex) {
69
71
  var filteredRow = rows.filter(function (row) {
70
72
  return row.index === parseInt(rowIndex);
71
73
  });
72
- if (filteredRow.length) {
73
- return filteredRow[0];
74
- }
75
- return [];
76
- }) : [];
77
- return selectedRowData;
74
+ return filteredRow.length ? filteredRow[0] : [];
75
+ });
78
76
  };
79
77
 
80
78
  // Render batch actions in ButtonMenu
81
79
  var renderBatchActionOverflow = function renderBatchActionOverflow() {
80
+ var menuClass = "".concat(blockClass, "__button-menu");
82
81
  var minWidthBeforeOverflowIcon = 380;
83
82
  // Do not render ButtonMenu when there are 3 or less items
84
83
  // and if there is enough available space to render all the items
@@ -96,12 +95,12 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
96
95
  };
97
96
  return /*#__PURE__*/_react.default.createElement(_react2.MenuButton, {
98
97
  label: "More",
99
- className: (0, _classnames.default)("".concat(blockClass, "__button-menu"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__button-menu--icon-only"), width <= minWidthBeforeOverflowIcon))
100
- }, toolbarBatchActions && toolbarBatchActions.map(function (batchAction, index) {
101
- if (index < 2 && !displayAllInMenu) {
102
- return;
98
+ className: (0, _classnames.default)([menuClass, (0, _defineProperty2.default)({}, "".concat(menuClass, "-icon-only"), width <= minWidthBeforeOverflowIcon)])
99
+ }, toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
100
+ var hidden = index < 2 && !displayAllInMenu;
101
+ if (!hidden) {
102
+ return renderItem(batchAction, index);
103
103
  }
104
- return renderItem(batchAction, index);
105
104
  }));
106
105
  };
107
106
  var onClickHandler = function onClickHandler(event, batchAction) {
@@ -149,12 +148,12 @@ var DatagridToolbar = function DatagridToolbar(datagridState) {
149
148
  DatagridBatchActions = datagridState.DatagridBatchActions,
150
149
  batchActions = datagridState.batchActions,
151
150
  rowSize = datagridState.rowSize;
152
- var getRowHeight = rowSize ? rowSize : 'lg';
151
+ var getRowHeight = rowSize || 'lg';
153
152
  return batchActions && DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
154
153
  ref: ref,
155
- className: (0, _classnames.default)("".concat(blockClass, "__table-toolbar"), "".concat(blockClass, "__table-toolbar--").concat(getRowHeight))
154
+ className: (0, _classnames.default)([blockClass, "".concat(blockClass, "--").concat(getRowHeight)])
156
155
  }, /*#__PURE__*/_react.default.createElement(_react2.TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActionsToolbar && DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/_react.default.createElement("div", {
157
- className: "".concat(blockClass, "__table-toolbar")
156
+ className: blockClass
158
157
  }, /*#__PURE__*/_react.default.createElement(_react2.TableToolbar, null, DatagridActions && DatagridActions(datagridState), DatagridBatchActions && DatagridBatchActions(datagridState))) : null;
159
158
  };
160
159
  var _default = exports.default = DatagridToolbar;
package/lib/components/Datagrid/useColumnCenterAlign.js CHANGED
@@ -11,12 +11,11 @@ var _react = _interopRequireDefault(require("react"));
11
11
  var _classnames = _interopRequireDefault(require("classnames"));
12
12
  var _settings = require("../../settings");
13
13
  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; }
14
- 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; } /*
15
- * Licensed Materials - Property of IBM
16
- * 5724-Q36
17
- * (c) Copyright IBM Corp. 2020
18
- * US Government Users Restricted Rights - Use, duplication or disclosure
19
- * restricted by GSA ADP Schedule Contract with IBM Corp.
14
+ 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; } /**
15
+ * Copyright IBM Corp. 2020, 2023
16
+ *
17
+ * This source code is licensed under the Apache-2.0 license found in the
18
+ * LICENSE file in the root directory of this source tree.
20
19
  */
21
20
  var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
22
21
  var useColumnCenterAlign = function useColumnCenterAlign(hooks) {
package/lib/components/Datagrid/useColumnRightAlign.js CHANGED
@@ -11,12 +11,11 @@ var _react = _interopRequireDefault(require("react"));
11
11
  var _classnames = _interopRequireDefault(require("classnames"));
12
12
  var _settings = require("../../settings");
13
13
  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; }
14
- 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; } /*
15
- * Licensed Materials - Property of IBM
16
- * 5724-Q36
17
- * (c) Copyright IBM Corp. 2020
18
- * US Government Users Restricted Rights - Use, duplication or disclosure
19
- * restricted by GSA ADP Schedule Contract with IBM Corp.
14
+ 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; } /**
15
+ * Copyright IBM Corp. 2020, 2023
16
+ *
17
+ * This source code is licensed under the Apache-2.0 license found in the
18
+ * LICENSE file in the root directory of this source tree.
20
19
  */
21
20
  var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
22
21
  var useColumnRightAlign = function useColumnRightAlign(hooks) {
package/lib/components/Datagrid/useNestedRowExpander.js CHANGED
@@ -15,14 +15,13 @@ var _classnames = _interopRequireDefault(require("classnames"));
15
15
  var _settings = require("../../settings");
16
16
  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); }
17
17
  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; }
18
- /* eslint-disable react/prop-types */
19
- /**
20
- * Copyright IBM Corp. 2020, 2023
21
- *
22
- * This source code is licensed under the Apache-2.0 license found in the
23
- * LICENSE file in the root directory of this source tree.
24
- */
25
-
18
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
19
+ 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 */ /**
20
+ * Copyright IBM Corp. 2020, 2023
21
+ *
22
+ * This source code is licensed under the Apache-2.0 license found in the
23
+ * LICENSE file in the root directory of this source tree.
24
+ */
26
25
  var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
27
26
  var useNestedRowExpander = function useNestedRowExpander(hooks) {
28
27
  var tempState = (0, _react.useRef)();
@@ -35,6 +34,13 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
35
34
  Cell: function Cell(_ref) {
36
35
  var _cx;
37
36
  var row = _ref.row;
37
+ var expanderButtonProps = _objectSpread(_objectSpread({}, row.getToggleRowExpandedProps()), {}, {
38
+ onClick: function onClick(event) {
39
+ // Prevents `onRowClick` from being called if `useOnRowClick` is included
40
+ event.stopPropagation();
41
+ row.toggleRowExpanded();
42
+ }
43
+ });
38
44
  var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
39
45
  _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
40
46
  expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
@@ -45,7 +51,7 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
45
51
  type: "button",
46
52
  "aria-label": expanderTitle,
47
53
  className: (0, _classnames.default)("".concat(blockClass, "__row-expander"), "".concat(_settings.carbon.prefix, "--btn"), "".concat(_settings.carbon.prefix, "--btn--ghost"))
48
- }, row.getToggleRowExpandedProps(), {
54
+ }, expanderButtonProps, {
49
55
  title: expanderTitle
50
56
  }), /*#__PURE__*/_react.default.createElement(_icons.ChevronRight, {
51
57
  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 CHANGED
@@ -8,20 +8,20 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.default = void 0;
9
9
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
10
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
12
  var _react = _interopRequireWildcard(require("react"));
12
13
  var _icons = require("@carbon/react/icons");
13
14
  var _settings = require("../../settings");
14
15
  var _classnames = _interopRequireDefault(require("classnames"));
15
16
  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); }
16
17
  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; }
17
- /* eslint-disable react/prop-types */
18
- /**
19
- * Copyright IBM Corp. 2020, 2023
20
- *
21
- * This source code is licensed under the Apache-2.0 license found in the
22
- * LICENSE file in the root directory of this source tree.
23
- */
24
-
18
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
19
+ 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 */ /**
20
+ * Copyright IBM Corp. 2020, 2023
21
+ *
22
+ * This source code is licensed under the Apache-2.0 license found in the
23
+ * LICENSE file in the root directory of this source tree.
24
+ */
25
25
  var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
26
26
  var useRowExpander = function useRowExpander(hooks) {
27
27
  var tempState = (0, _react.useRef)();
@@ -33,6 +33,13 @@ var useRowExpander = function useRowExpander(hooks) {
33
33
  id: 'expander',
34
34
  Cell: function Cell(_ref) {
35
35
  var row = _ref.row;
36
+ var expanderButtonProps = _objectSpread(_objectSpread({}, row.getToggleRowExpandedProps()), {}, {
37
+ onClick: function onClick(event) {
38
+ // Prevents `onRowClick` from being called if `useOnRowClick` is included
39
+ event.stopPropagation();
40
+ row.toggleRowExpanded();
41
+ }
42
+ });
36
43
  var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
37
44
  _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
38
45
  expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
@@ -43,7 +50,7 @@ var useRowExpander = function useRowExpander(hooks) {
43
50
  type: "button",
44
51
  "aria-label": expanderTitle,
45
52
  className: (0, _classnames.default)("".concat(blockClass, "__row-expander"), "".concat(_settings.carbon.prefix, "--btn"), "".concat(_settings.carbon.prefix, "--btn--ghost"))
46
- }, row.getToggleRowExpandedProps(), {
53
+ }, expanderButtonProps, {
47
54
  title: expanderTitle
48
55
  }), row.isExpanded ? /*#__PURE__*/_react.default.createElement(_icons.ChevronUp, {
49
56
  className: "".concat(blockClass, "__row-expander--icon")
package/lib/components/Datagrid/useSelectAllToggle.js CHANGED
@@ -24,7 +24,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
24
24
  */
25
25
  // @flow
26
26
 
27
- var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
27
+ var blockClass = "".concat(_settings.pkg.prefix, "--datagrid__select-all");
28
28
  var useSelectAllToggle = function useSelectAllToggle(hooks) {
29
29
  useSelectAllWithToggleComponent(hooks);
30
30
  useAddClassNameToSelectRow(hooks);
@@ -71,7 +71,7 @@ var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
71
71
  var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
72
72
  if (column.id === _commonColumnIds.selectionColumnId && DatagridPagination) {
73
73
  return [props, {
74
- className: (0, _classnames.default)("".concat(blockClass, "__select-all-toggle-on"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
74
+ className: (0, _classnames.default)("".concat(blockClass, "-toggle-on"), (0, _defineProperty2.default)({}, "".concat(blockClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
75
75
  }];
76
76
  }
77
77
  return [props];
package/lib/components/Datagrid/useSelectRows.js CHANGED
@@ -17,7 +17,7 @@ var _react2 = require("@carbon/react");
17
17
  var _DatagridSelectAll = require("./Datagrid/DatagridSelectAll");
18
18
  var _commonColumnIds = require("./common-column-ids");
19
19
  var _settings = require("../../settings");
20
- var _excluded = ["onChange"];
20
+ var _excluded = ["onChange", "title"];
21
21
  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); }
22
22
  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; }
23
23
  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; }
@@ -29,6 +29,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
29
29
  * restricted by GSA ADP Schedule Contract with IBM Corp.
30
30
  */ // @flow
31
31
  var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
32
+ var checkboxClass = "".concat(_settings.pkg.prefix, "--datagrid__checkbox-cell");
32
33
  var useSelectRows = function useSelectRows(hooks) {
33
34
  useHighlightSelection(hooks);
34
35
  var useInstance = function useInstance(instance) {
@@ -62,9 +63,12 @@ var useSelectRows = function useSelectRows(hooks) {
62
63
  };
63
64
  var useHighlightSelection = function useHighlightSelection(hooks) {
64
65
  var getRowProps = function getRowProps(props, _ref) {
66
+ var _ref2;
65
67
  var row = _ref.row;
68
+ var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
69
+ checked = _row$getToggleRowSele.checked;
66
70
  return [props, {
67
- className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), row.getToggleRowSelectedProps().checked ? "".concat(_settings.carbon.prefix, "--data-table--selected ").concat(blockClass, "__active-row") : '')
71
+ className: (0, _classnames.default)(["".concat(blockClass, "__carbon-row"), (_ref2 = {}, (0, _defineProperty2.default)(_ref2, "".concat(_settings.carbon.prefix, "--data-table--selected"), checked), (0, _defineProperty2.default)(_ref2, "".concat(blockClass, "__active-row"), checked), _ref2)])
68
72
  }];
69
73
  };
70
74
  hooks.getRowProps.push(getRowProps);
@@ -95,30 +99,32 @@ var SelectRow = function SelectRow(datagridState) {
95
99
  return window.removeEventListener('resize', updateSize);
96
100
  };
97
101
  }, []);
102
+ var onSelectHandler = function onSelectHandler(e) {
103
+ e.stopPropagation(); // avoid triggering onRowClick
104
+ if (radio) {
105
+ toggleAllRowsSelected(false);
106
+ if (onRadioSelect) {
107
+ onRadioSelect(row);
108
+ }
109
+ }
110
+ onChange(e);
111
+ onRowSelect === null || onRowSelect === void 0 || onRowSelect(row, e);
112
+ };
98
113
  var selectDisabled = isFetching || row.getRowProps().disabled;
99
- var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
100
- onChange = _row$getToggleRowSele.onChange,
101
- selectProps = (0, _objectWithoutProperties2.default)(_row$getToggleRowSele, _excluded);
114
+ var _row$getToggleRowSele2 = row.getToggleRowSelectedProps(),
115
+ onChange = _row$getToggleRowSele2.onChange,
116
+ title = _row$getToggleRowSele2.title,
117
+ selectProps = (0, _objectWithoutProperties2.default)(_row$getToggleRowSele2, _excluded);
102
118
  var cellProps = cell.getCellProps();
103
119
  var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
120
+ var rowId = "".concat(tableId, "-").concat(row.index);
104
121
  return /*#__PURE__*/_react.default.createElement(_react2.TableSelectRow, (0, _extends2.default)({}, cellProps, selectProps, {
105
122
  radio: radio,
106
- onSelect: function onSelect(e) {
107
- e.stopPropagation(); // avoid triggering onRowClick
108
- if (radio) {
109
- toggleAllRowsSelected(false);
110
- if (onRadioSelect) {
111
- onRadioSelect(row);
112
- }
113
- }
114
- onChange(e);
115
- onRowSelect === null || onRowSelect === void 0 || onRowSelect(row, e);
116
- },
117
- id: "".concat(tableId, "-").concat(row.index),
118
- name: "".concat(tableId, "-").concat(row.index, "-name"),
119
- className: (0, _classnames.default)("".concat(blockClass, "__checkbox-cell"), cellProps.className, (0, _defineProperty2.default)({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)),
120
- ariaLabel: "".concat(tableId, "-row-").concat(row.index) // TODO: aria label should be i18n'ed
121
- ,
123
+ onSelect: onSelectHandler,
124
+ id: rowId,
125
+ name: "".concat(rowId, "-name"),
126
+ className: (0, _classnames.default)([checkboxClass, cellProps.className, (0, _defineProperty2.default)({}, "".concat(checkboxClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)]),
127
+ ariaLabel: title,
122
128
  disabled: selectDisabled
123
129
  }));
124
130
  };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@carbon/ibm-products",
3
3
  "description": "Carbon for IBM Products",
4
- "version": "2.15.0",
4
+ "version": "2.15.1",
5
5
  "license": "Apache-2.0",
6
6
  "main": "lib/index.js",
7
7
  "module": "es/index.js",
@@ -96,5 +96,5 @@
96
96
  "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
97
97
  "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
98
98
  },
99
- "gitHead": "71e9863315eb75b25df98cf9989f7bca88a10718"
99
+ "gitHead": "0837acd5a6efa4b8ebe5c86d40f6995b5a1565c5"
100
100
  }