@carbon/ibm-products 1.15.0 → 1.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/css/components/Datagrid/styles/datagrid.css +4 -0
  2. package/css/components/Datagrid/styles/datagrid.css.map +1 -1
  3. package/css/components/Datagrid/styles/index.css +5 -1
  4. package/css/components/Datagrid/styles/index.css.map +1 -1
  5. package/css/components/Datagrid/styles/useNestedRows.css +1 -1
  6. package/css/index-full-carbon.css +20 -4
  7. package/css/index-full-carbon.css.map +1 -1
  8. package/css/index-full-carbon.min.css +2 -2
  9. package/css/index-full-carbon.min.css.map +1 -1
  10. package/css/index-without-carbon.css +20 -4
  11. package/css/index-without-carbon.css.map +1 -1
  12. package/css/index-without-carbon.min.css +2 -2
  13. package/css/index-without-carbon.min.css.map +1 -1
  14. package/css/index.css +20 -4
  15. package/css/index.css.map +1 -1
  16. package/css/index.min.css +2 -2
  17. package/css/index.min.css.map +1 -1
  18. package/es/components/AddSelect/AddSelect.js +10 -5
  19. package/es/components/AddSelect/AddSelectFilter.js +47 -4
  20. package/es/components/DataSpreadsheet/DataSpreadsheet.js +12 -3
  21. package/es/components/DataSpreadsheet/DataSpreadsheetBody.js +39 -7
  22. package/es/components/DataSpreadsheet/DataSpreadsheetHeader.js +20 -4
  23. package/es/components/DataSpreadsheet/utils/generateData.js +17 -9
  24. package/es/components/DataSpreadsheet/utils/getSpreadsheetWidth.js +30 -0
  25. package/es/components/Datagrid/Datagrid/DatagridRow.js +12 -2
  26. package/es/components/Datagrid/useNestedRows.js +3 -3
  27. package/es/components/Datagrid/useRowExpander.js +1 -1
  28. package/lib/components/AddSelect/AddSelect.js +10 -5
  29. package/lib/components/AddSelect/AddSelectFilter.js +46 -3
  30. package/lib/components/DataSpreadsheet/DataSpreadsheet.js +12 -3
  31. package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js +40 -7
  32. package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.js +21 -5
  33. package/lib/components/DataSpreadsheet/utils/generateData.js +17 -9
  34. package/lib/components/DataSpreadsheet/utils/getSpreadsheetWidth.js +40 -0
  35. package/lib/components/Datagrid/Datagrid/DatagridRow.js +14 -2
  36. package/lib/components/Datagrid/useNestedRows.js +3 -3
  37. package/lib/components/Datagrid/useRowExpander.js +1 -1
  38. package/package.json +7 -7
  39. package/scss/components/AddSelect/_add-select.scss +9 -2
  40. package/scss/components/DataSpreadsheet/_data-spreadsheet.scss +7 -1
  41. package/scss/components/Datagrid/styles/datagrid.scss +8 -0
  42. package/scss/components/Datagrid/styles/useNestedRows.scss +1 -1
@@ -41,6 +41,8 @@ var _checkActiveHeaderCell = require("./utils/checkActiveHeaderCell");
41
41
 
42
42
  var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
43
43
 
44
+ var _getSpreadsheetWidth = require("./utils/getSpreadsheetWidth");
45
+
44
46
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
45
47
 
46
48
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -74,7 +76,9 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
74
76
  currentMatcher = _ref.currentMatcher,
75
77
  setCurrentMatcher = _ref.setCurrentMatcher,
76
78
  onSelectionAreaChange = _ref.onSelectionAreaChange,
77
- setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea;
79
+ setActiveCellInsideSelectionArea = _ref.setActiveCellInsideSelectionArea,
80
+ totalVisibleColumns = _ref.totalVisibleColumns;
81
+ var contentScrollRef = (0, _react.useRef)();
78
82
  var previousState = (0, _hooks.usePreviousValue)({
79
83
  selectionAreaData: selectionAreaData,
80
84
  clickAndHoldActive: clickAndHoldActive
@@ -271,6 +275,21 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
271
275
  }
272
276
  };
273
277
  }, [currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher, ref, setSelectionAreaData, setActiveCellInsideSelectionArea]);
278
+
279
+ var handleBodyScroll = function handleBodyScroll() {
280
+ var headerRowElement = ref.current.querySelector("\n .".concat(blockClass, "__header--container .").concat(blockClass, "__tr"));
281
+ headerRowElement.scrollLeft = contentScrollRef.current.scrollLeft;
282
+ };
283
+
284
+ (0, _react.useEffect)(function () {
285
+ contentScrollRef.current.addEventListener('scroll', function (event) {
286
+ return handleBodyScroll(event);
287
+ });
288
+ var contentScrollElementRef = contentScrollRef.current;
289
+ return function () {
290
+ contentScrollElementRef.removeEventListener('scroll', handleBodyScroll);
291
+ };
292
+ });
274
293
  var handleBodyCellHover = (0, _react.useCallback)(function (cell, columnIndex) {
275
294
  return function () {
276
295
  if (clickAndHoldActive) {
@@ -361,7 +380,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
361
380
  "data-row-index": index,
362
381
  "aria-rowindex": index + 1
363
382
  }), /*#__PURE__*/_react.default.createElement("div", {
364
- role: "rowheader"
383
+ role: "rowheader",
384
+ className: "".concat(blockClass, "__td-th--cell-container")
365
385
  }, /*#__PURE__*/_react.default.createElement("button", {
366
386
  id: "".concat(blockClass, "__cell--").concat(index, "--header"),
367
387
  tabIndex: -1,
@@ -371,7 +391,7 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
371
391
  onClick: handleRowHeaderClick(index),
372
392
  className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row'))),
373
393
  style: {
374
- width: (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth) - 4
394
+ width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
375
395
  }
376
396
  }, index + 1)), row.cells.map(function (cell, index) {
377
397
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
@@ -380,7 +400,8 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
380
400
  }, cell.getCellProps(), {
381
401
  role: "gridcell",
382
402
  style: _objectSpread(_objectSpread({}, cell.getCellProps().style), {}, {
383
- display: 'grid'
403
+ display: 'grid',
404
+ minWidth: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width
384
405
  })
385
406
  }), /*#__PURE__*/_react.default.createElement("button", {
386
407
  id: "".concat(blockClass, "__cell--").concat(cell.row.index, "--").concat(index),
@@ -395,7 +416,7 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
395
416
  }, cell.render('Cell')));
396
417
  }));
397
418
  }
398
- }, [prepareRow, rows, defaultColumn.rowHeaderWidth, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover]);
419
+ }, [prepareRow, rows, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas, handleRowHeaderClick, handleBodyCellClick, handleBodyCellHover, defaultColumn]);
399
420
  var spreadsheetBodyRef = (0, _react.useRef)();
400
421
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
401
422
  ref: spreadsheetBodyRef,
@@ -405,7 +426,13 @@ var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, re
405
426
  height: 400,
406
427
  itemCount: rows.length || defaultEmptyRowCount,
407
428
  itemSize: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
408
- width: totalColumnsWidth + scrollBarSize
429
+ width: (0, _getSpreadsheetWidth.getSpreadsheetWidth)({
430
+ scrollBarSizeValue: scrollBarSize,
431
+ totalVisibleColumns: totalVisibleColumns,
432
+ defaultColumn: defaultColumn,
433
+ totalColumnsWidth: totalColumnsWidth
434
+ }),
435
+ outerRef: contentScrollRef
409
436
  }, rows !== null && rows !== void 0 && rows.length ? RenderRow : RenderEmptyRows));
410
437
  });
411
438
  exports.DataSpreadsheetBody = DataSpreadsheetBody;
@@ -540,5 +567,11 @@ DataSpreadsheetBody.propTypes = {
540
567
  /**
541
568
  * The total columns width
542
569
  */
543
- totalColumnsWidth: _propTypes.default.number
570
+ totalColumnsWidth: _propTypes.default.number,
571
+
572
+ /**
573
+ * The total number of columns to be initially visible, additional columns will be rendered and
574
+ * visible via horizontal scrollbar
575
+ */
576
+ totalVisibleColumns: _propTypes.default.number
544
577
  };
@@ -21,8 +21,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
21
21
 
22
22
  var _classnames = _interopRequireDefault(require("classnames"));
23
23
 
24
- var _layout = require("@carbon/layout");
25
-
26
24
  var _settings = require("../../settings");
27
25
 
28
26
  var _hooks = require("../../global/js/hooks");
@@ -33,6 +31,8 @@ var _handleHeaderCellSelection = require("./utils/handleHeaderCellSelection");
33
31
 
34
32
  var _selectAllCells = require("./utils/selectAllCells");
35
33
 
34
+ var _getSpreadsheetWidth = require("./utils/getSpreadsheetWidth");
35
+
36
36
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
37
37
 
38
38
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -55,6 +55,7 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
55
55
  setSelectionAreas = _ref.setSelectionAreas,
56
56
  setSelectionAreaData = _ref.setSelectionAreaData,
57
57
  rows = _ref.rows,
58
+ totalVisibleColumns = _ref.totalVisibleColumns,
58
59
  updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
59
60
 
60
61
  var _useState = (0, _react.useState)(0),
@@ -115,13 +116,21 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
115
116
  key: "header_".concat(index)
116
117
  }, headerGroup.getHeaderGroupProps(), {
117
118
  style: _objectSpread(_objectSpread({}, headerGroup.getHeaderGroupProps().style), {}, {
118
- width: (0, _layout.px)(parseInt(headerGroup.getHeaderGroupProps().style.width) + scrollBarSizeValue)
119
+ width: (0, _getSpreadsheetWidth.getSpreadsheetWidth)({
120
+ type: 'header',
121
+ headerGroup: headerGroup,
122
+ scrollBarSizeValue: scrollBarSizeValue,
123
+ totalVisibleColumns: totalVisibleColumns,
124
+ defaultColumn: defaultColumn
125
+ }),
126
+ overflow: 'hidden'
119
127
  }),
120
128
  className: "".concat(blockClass, "__tr")
121
129
  }), /*#__PURE__*/_react.default.createElement("div", {
122
130
  role: "columnheader",
131
+ className: "".concat(blockClass, "__select-all-cell-container"),
123
132
  style: {
124
- width: (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth) - 4,
133
+ width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth,
125
134
  height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
126
135
  }
127
136
  }, /*#__PURE__*/_react.default.createElement("button", {
@@ -144,7 +153,8 @@ var DataSpreadsheetHeader = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
144
153
  tabIndex: -1,
145
154
  onClick: handleColumnHeaderClick(index),
146
155
  style: {
147
- height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
156
+ height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
157
+ width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width
148
158
  },
149
159
  className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'column'))),
150
160
  type: "button"
@@ -221,6 +231,12 @@ DataSpreadsheetHeader.propTypes = {
221
231
  */
222
232
  setSelectionAreas: _propTypes.default.func,
223
233
 
234
+ /**
235
+ * The total number of columns to be initially visible, additional columns will be rendered and
236
+ * visible via horizontal scrollbar
237
+ */
238
+ totalVisibleColumns: _propTypes.default.number,
239
+
224
240
  /**
225
241
  * Function used to update the active cell coordinates
226
242
  */
@@ -33,28 +33,36 @@ var range = function range(len) {
33
33
  return arr;
34
34
  };
35
35
 
36
- var newPet = function newPet() {
37
- return {
36
+ var newPet = function newPet(extraColumns) {
37
+ var extraDataProps = extraColumns && {
38
+ ownerName: petNames[Math.floor(Math.random() * petNames.length)],
39
+ weight: Math.floor(Math.random() * 40)
40
+ };
41
+ var defaultPet = {
38
42
  petType: pets[Math.floor(Math.random() * pets.length)],
39
43
  firstName: petNames[Math.floor(Math.random() * petNames.length)],
40
44
  age: Math.floor(Math.random() * 30),
41
45
  visits: Math.floor(Math.random() * 40),
42
46
  health: Math.floor(Math.random() * 100)
43
47
  };
44
- };
45
48
 
46
- var generateData = function generateData() {
47
- for (var _len = arguments.length, lens = new Array(_len), _key = 0; _key < _len; _key++) {
48
- lens[_key] = arguments[_key];
49
+ if (extraColumns) {
50
+ return _objectSpread(_objectSpread({}, defaultPet), extraDataProps);
49
51
  }
50
52
 
53
+ return defaultPet;
54
+ };
55
+
56
+ var generateData = function generateData(_ref) {
57
+ var rows = _ref.rows,
58
+ extraColumns = _ref.extraColumns;
59
+
51
60
  var makeDataLevel = function makeDataLevel() {
52
61
  var depth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
62
+ var lens = [rows];
53
63
  var len = lens[depth];
54
64
  return range(len).map(function () {
55
- return _objectSpread(_objectSpread({}, newPet()), {}, {
56
- subRows: lens[depth + 1] ? makeDataLevel(depth + 1) : undefined
57
- });
65
+ return _objectSpread({}, newPet(extraColumns));
58
66
  });
59
67
  };
60
68
 
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.getSpreadsheetWidth = void 0;
7
+
8
+ var _layout = require("@carbon/layout");
9
+
10
+ /**
11
+ * Copyright IBM Corp. 2022, 2022
12
+ *
13
+ * This source code is licensed under the Apache-2.0 license found in the
14
+ * LICENSE file in the root directory of this source tree.
15
+ */
16
+ var getSpreadsheetWidth = function getSpreadsheetWidth(_ref) {
17
+ var type = _ref.type,
18
+ headerGroup = _ref.headerGroup,
19
+ scrollBarSizeValue = _ref.scrollBarSizeValue,
20
+ totalVisibleColumns = _ref.totalVisibleColumns,
21
+ defaultColumn = _ref.defaultColumn,
22
+ totalColumnsWidth = _ref.totalColumnsWidth;
23
+ var additionalWidth = scrollBarSizeValue + defaultColumn.rowHeaderWidth;
24
+
25
+ if (!totalVisibleColumns) {
26
+ if (type === 'header') {
27
+ return (0, _layout.px)(parseInt(headerGroup.getHeaderGroupProps().style.width) + additionalWidth);
28
+ }
29
+
30
+ if (type !== 'header') {
31
+ return totalColumnsWidth + additionalWidth;
32
+ }
33
+ }
34
+
35
+ if (totalVisibleColumns) {
36
+ return totalVisibleColumns * (defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.width) + additionalWidth;
37
+ }
38
+ };
39
+
40
+ exports.getSpreadsheetWidth = getSpreadsheetWidth;
@@ -11,12 +11,16 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
11
 
12
12
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
13
 
14
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
+
14
16
  var _react = _interopRequireDefault(require("react"));
15
17
 
16
18
  var _carbonComponentsReact = require("carbon-components-react");
17
19
 
18
20
  var _commonColumnIds = require("../common-column-ids");
19
21
 
22
+ var _classnames = _interopRequireDefault(require("classnames"));
23
+
20
24
  var _settings = require("../../../settings");
21
25
 
22
26
  var _excluded = ["children"];
@@ -27,9 +31,17 @@ var TableRow = _carbonComponentsReact.DataTable.TableRow,
27
31
  var DatagridRow = function DatagridRow(datagridState) {
28
32
  var row = datagridState.row;
29
33
  return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
30
- className: "".concat(blockClass, "__carbon-row")
34
+ className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded))
31
35
  }, row.getRowProps(), {
32
- key: row.id
36
+ key: row.id,
37
+ onMouseEnter: function onMouseEnter(event) {
38
+ var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
39
+ hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.add("".concat(blockClass, "__carbon-row-expanded-hover-active"));
40
+ },
41
+ onMouseLeave: function onMouseLeave(event) {
42
+ var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
43
+ hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
44
+ }
33
45
  }), row.cells.map(function (cell) {
34
46
  var cellProps = cell.getCellProps();
35
47
  var children = cellProps.children,
@@ -22,7 +22,7 @@ var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
22
22
 
23
23
  var useNestedRows = function useNestedRows(hooks) {
24
24
  (0, _useRowExpander.default)(hooks);
25
- var marginLeft = 32;
25
+ var marginLeft = 24;
26
26
 
27
27
  var getRowProps = function getRowProps(props, _ref) {
28
28
  var row = _ref.row;
@@ -36,7 +36,7 @@ var useNestedRows = function useNestedRows(hooks) {
36
36
  return [props, {
37
37
  style: {
38
38
  marginLeft: "".concat(row.depth > 0 ? marginLeft : 0, "px"),
39
- paddingLeft: "".concat(row.depth > 1 ? marginLeft * (row.depth - 1) : 0, "px"),
39
+ paddingLeft: "".concat(row.depth > 1 ? marginLeft * (row.depth - 1) + marginLeft : row.depth === 1 ? marginLeft : 0, "px"),
40
40
  maxWidth: "calc(100% - ".concat(marginLeft * row.depth, "px)")
41
41
  }
42
42
  }];
@@ -51,7 +51,7 @@ var useNestedRows = function useNestedRows(hooks) {
51
51
  }) === 0;
52
52
  return [props, {
53
53
  style: {
54
- marginRight: isFirstCell ? "-".concat(marginLeft * cell.row.depth, "px") : ''
54
+ marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "-".concat(marginLeft * (cell.row.depth + 1), "px") : '')
55
55
  }
56
56
  }];
57
57
  };
@@ -30,7 +30,7 @@ var useRowExpander = function useRowExpander(hooks) {
30
30
  var row = _ref.row;
31
31
  return row.canExpand && /*#__PURE__*/_react.default.createElement("span", row.getToggleRowExpandedProps(), row.isExpanded ? /*#__PURE__*/_react.default.createElement(_iconsReact.ChevronUp16, null) : /*#__PURE__*/_react.default.createElement(_iconsReact.ChevronDown16, null));
32
32
  },
33
- width: 32,
33
+ width: 48,
34
34
  disableResizing: true,
35
35
  disableSortBy: true,
36
36
  Header: ''
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": "1.15.0",
4
+ "version": "1.16.0",
5
5
  "license": "Apache-2.0",
6
6
  "main": "lib/index.js",
7
7
  "module": "es/index.js",
@@ -57,23 +57,23 @@
57
57
  "change-case": "^4.1.2",
58
58
  "copyfiles": "^2.4.1",
59
59
  "cross-env": "^7.0.3",
60
- "fs-extra": "^10.0.1",
60
+ "fs-extra": "^10.1.0",
61
61
  "glob": "^8.0.1",
62
62
  "jest": "^27.5.1",
63
- "jest-config-ibm-cloud-cognitive": "^0.23.15",
63
+ "jest-config-ibm-cloud-cognitive": "^0.23.16",
64
64
  "namor": "^1.1.2",
65
65
  "npm-check-updates": "^12.5.9",
66
66
  "npm-run-all": "^4.1.5",
67
67
  "rimraf": "^3.0.2",
68
- "sass": "^1.50.0",
68
+ "sass": "^1.50.1",
69
69
  "yargs": "^17.4.1"
70
70
  },
71
71
  "dependencies": {
72
72
  "@babel/runtime": "^7.17.9",
73
73
  "@carbon/telemetry": "^0.1.0",
74
74
  "immutability-helper": "^3.1.1",
75
- "react-dnd": "^15.1.2",
76
- "react-dnd-html5-backend": "^15.1.3",
75
+ "react-dnd": "^16.0.1",
76
+ "react-dnd-html5-backend": "^16.0.1",
77
77
  "react-resize-detector": "^7.0.0",
78
78
  "react-table": "^7.7.0",
79
79
  "react-window": "^1.8.6"
@@ -92,5 +92,5 @@
92
92
  "react": "^16.8.6 || ^17.0.1",
93
93
  "react-dom": "^16.8.6 || ^17.0.1"
94
94
  },
95
- "gitHead": "202e15e26448cefc31d5ea1796b4d4b8b126a246"
95
+ "gitHead": "c9d83ac8cb5d738772533f2ea93b854a1f4d711f"
96
96
  }
@@ -228,6 +228,13 @@
228
228
  grid-gap: $spacing-05 2rem;
229
229
  grid-template-columns: repeat(2, 1fr);
230
230
  }
231
+
232
+ &-applied {
233
+ display: flex;
234
+ align-items: center;
235
+ padding: $spacing-03;
236
+ background: $ui-01;
237
+ }
231
238
  }
232
239
 
233
240
  .#{$block-class}__global-filter-button-set
@@ -248,7 +255,7 @@
248
255
  }
249
256
 
250
257
  // the influencer sidebar needs to be even with the buttons
251
- .#{$block-class} .#{$tearsheet-class} .#{$tearsheet-class}__influencer {
258
+ .#{$block-class} .#{$tearsheet-class}__influencer {
252
259
  max-width: 29rem;
253
260
  flex: 0 0 50%;
254
261
  }
@@ -257,7 +264,7 @@
257
264
  color: $text-02;
258
265
  }
259
266
 
260
- .#{$block-class} .#{$tearsheet-class} .#{$tearsheet-class}__content {
267
+ .#{$block-class} .#{$tearsheet-class}__content {
261
268
  display: flex;
262
269
  flex-direction: column;
263
270
  }
@@ -81,7 +81,13 @@
81
81
  }
82
82
  }
83
83
  .#{$block-class}__th--select-all {
84
- min-width: calc(#{$spacing-10} - #{$spacing-02});
84
+ width: $spacing-10;
85
+ }
86
+ .#{$block-class}__td-th--cell-container,
87
+ .#{$block-class}__select-all-cell-container {
88
+ position: sticky;
89
+ z-index: 4;
90
+ left: 0;
85
91
  }
86
92
  .#{$block-class}__td-th.#{$block-class}__td {
87
93
  @include carbon--font-weight('semibold');
@@ -316,3 +316,11 @@
316
316
  width: 100%;
317
317
  flex-direction: column;
318
318
  }
319
+
320
+ .#{$block-class}__carbon-row-expanded {
321
+ // Border applied to nested rows only on open chevron hover
322
+ &.#{$block-class}__carbon-row-expanded-hover-active
323
+ ~ .#{$block-class}__carbon-nested-row {
324
+ border-left: 1px solid $interactive-01;
325
+ }
326
+ }
@@ -9,7 +9,7 @@
9
9
  @import './variables';
10
10
 
11
11
  .#{$carbon-prefix}--data-table tr.#{$block-class}__carbon-nested-row {
12
- border-left: 2px solid $interactive-01;
12
+ border-left: 1px solid transparent;
13
13
 
14
14
  .#{$block-class}__cell {
15
15
  border-bottom: 1px solid $ui-03;