@carbon/ibm-products 2.0.0-rc.21 → 2.0.0-rc.22

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 (41) hide show
  1. package/css/index-full-carbon.css +4888 -2968
  2. package/css/index-full-carbon.css.map +1 -1
  3. package/css/index-full-carbon.min.css +4 -4
  4. package/css/index-full-carbon.min.css.map +1 -1
  5. package/css/index-without-carbon-released-only.css +59 -32
  6. package/css/index-without-carbon-released-only.css.map +1 -1
  7. package/css/index-without-carbon-released-only.min.css +3 -3
  8. package/css/index-without-carbon-released-only.min.css.map +1 -1
  9. package/css/index-without-carbon.css +109 -57
  10. package/css/index-without-carbon.css.map +1 -1
  11. package/css/index-without-carbon.min.css +4 -4
  12. package/css/index-without-carbon.min.css.map +1 -1
  13. package/css/index.css +268 -95
  14. package/css/index.css.map +1 -1
  15. package/css/index.min.css +4 -4
  16. package/css/index.min.css.map +1 -1
  17. package/es/components/Card/CardFooter.js +2 -2
  18. package/es/components/Datagrid/Datagrid/DatagridRow.js +42 -11
  19. package/es/components/Datagrid/Datagrid/DatagridSelectAll.js +20 -4
  20. package/es/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js +18 -2
  21. package/es/components/Datagrid/useActionsColumn.js +29 -1
  22. package/es/components/Datagrid/useDefaultStringRenderer.js +1 -1
  23. package/es/components/Datagrid/useNestedRows.js +2 -4
  24. package/es/components/Datagrid/useSelectAllToggle.js +18 -2
  25. package/es/components/Datagrid/useSelectRows.js +19 -2
  26. package/es/components/Datagrid/useStickyColumn.js +22 -5
  27. package/lib/components/Card/CardFooter.js +2 -2
  28. package/lib/components/Datagrid/Datagrid/DatagridRow.js +42 -11
  29. package/lib/components/Datagrid/Datagrid/DatagridSelectAll.js +27 -3
  30. package/lib/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js +17 -1
  31. package/lib/components/Datagrid/useActionsColumn.js +30 -1
  32. package/lib/components/Datagrid/useDefaultStringRenderer.js +1 -1
  33. package/lib/components/Datagrid/useNestedRows.js +2 -4
  34. package/lib/components/Datagrid/useSelectAllToggle.js +25 -2
  35. package/lib/components/Datagrid/useSelectRows.js +26 -2
  36. package/lib/components/Datagrid/useStickyColumn.js +22 -4
  37. package/package.json +8 -8
  38. package/scss/components/Datagrid/styles/_datagrid.scss +25 -3
  39. package/scss/components/Datagrid/styles/_useNestedRows.scss +19 -0
  40. package/scss/components/Datagrid/styles/_useSelectAllToggle.scss +12 -8
  41. package/scss/components/Datagrid/styles/_useStickyColumn.scss +3 -3
@@ -4,6 +4,10 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
4
4
  var _excluded = ["id", "itemText", "onClick", "icon"],
5
5
  _excluded2 = ["id", "onClick", "shouldHideMenuItem", "shouldDisableMenuItem", "disabled"];
6
6
 
7
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
8
+
9
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
10
+
7
11
  /*
8
12
  * Licensed Materials - Property of IBM
9
13
  * 5724-Q36
@@ -109,7 +113,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
109
113
  })))),
110
114
  className: cx((_cx3 = {}, _defineProperty(_cx3, "".concat(blockClass, "__actions-column-cell"), true), _defineProperty(_cx3, "".concat(blockClass, "__cell"), true), _cx3)),
111
115
  style: {
112
- width: 96
116
+ width: rowActions.length > 2 ? 48 : 96
113
117
  }
114
118
  }];
115
119
  }
@@ -121,6 +125,30 @@ var useActionsColumn = function useActionsColumn(hooks) {
121
125
  }
122
126
  };
123
127
 
128
+ var useStickyHeaderWidth = function useStickyHeaderWidth(instance) {
129
+ var rowActions = instance.rowActions;
130
+
131
+ if (rowActions && Array.isArray(rowActions)) {
132
+ var addHeaderWidth = function addHeaderWidth(props, cellData) {
133
+ var column = cellData.column;
134
+
135
+ if (column.isAction) {
136
+ return [props, {
137
+ style: _objectSpread(_objectSpread({}, props.style), {}, {
138
+ width: rowActions.length > 2 ? 48 : 96 // set header width based on action length
139
+
140
+ })
141
+ }];
142
+ }
143
+
144
+ return [props];
145
+ };
146
+
147
+ hooks.getHeaderProps.push(addHeaderWidth);
148
+ }
149
+ };
150
+
151
+ hooks.useInstance.push(useStickyHeaderWidth);
124
152
  hooks.useInstance.push(useAttachActionsOnInstance);
125
153
  };
126
154
 
@@ -22,7 +22,7 @@ var useDefaultStringRenderer = function useDefaultStringRenderer(hooks) {
22
22
  var _tableProps$column;
23
23
 
24
24
  return /*#__PURE__*/React.createElement("div", {
25
- className: cx("".concat(blockClass, "__defaultStringRenderer"), _defineProperty({}, "".concat(blockClass, "__defaultStringRenderer--multiline"), (_tableProps$column = tableProps.column) === null || _tableProps$column === void 0 ? void 0 : _tableProps$column.multiLineWrap)),
25
+ className: cx("".concat(blockClass, "__defaultStringRenderer"), _defineProperty({}, "".concat(blockClass, "__defaultStringRenderer--multiline"), ((_tableProps$column = tableProps.column) === null || _tableProps$column === void 0 ? void 0 : _tableProps$column.multiLineWrap) || (tableProps === null || tableProps === void 0 ? void 0 : tableProps.multiLineWrapAll))),
26
26
  title: tableProps.value
27
27
  }, tableProps.value);
28
28
  };
@@ -29,9 +29,7 @@ var useNestedRows = function useNestedRows(hooks) {
29
29
  var row = _ref2.row;
30
30
  return [props, {
31
31
  style: {
32
- marginLeft: "".concat(row.depth > 0 ? marginLeft : 0, "px"),
33
- paddingLeft: "".concat(row.depth === 2 ? marginLeft * (row.depth - 1) + marginLeft - 8 : row.depth > 2 ? marginLeft * (row.depth - 1) + marginLeft : row.depth === 1 ? marginLeft - 16 : 0, "px"),
34
- maxWidth: "calc(100% - ".concat(marginLeft * row.depth, "px)")
32
+ paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
35
33
  }
36
34
  }];
37
35
  };
@@ -45,7 +43,7 @@ var useNestedRows = function useNestedRows(hooks) {
45
43
  }) === 0;
46
44
  return [props, {
47
45
  style: {
48
- marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "-".concat(marginLeft * (cell.row.depth + 1), "px") : '')
46
+ marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
49
47
  }
50
48
  }];
51
49
  };
@@ -1,4 +1,5 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
+ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
2
3
 
3
4
  /*
4
5
  * Licensed Materials - Property of IBM
@@ -8,7 +9,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
8
9
  * restricted by GSA ADP Schedule Contract with IBM Corp.
9
10
  */
10
11
  // @flow
11
- import React from 'react';
12
+ import React, { useLayoutEffect, useState } from 'react';
12
13
  import cx from 'classnames';
13
14
  import { selectionColumnId } from './common-column-ids';
14
15
  import SelectAllWithToggle from './Datagrid/DatagridSelectAllWithToggle';
@@ -42,6 +43,21 @@ var useSelectAllWithToggleComponent = function useSelectAllWithToggleComponent(h
42
43
  };
43
44
 
44
45
  var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
46
+ var _useState = useState(window.innerWidth),
47
+ _useState2 = _slicedToArray(_useState, 2),
48
+ windowSize = _useState2[0],
49
+ setWindowSize = _useState2[1];
50
+
51
+ useLayoutEffect(function () {
52
+ function updateSize() {
53
+ setWindowSize(window.innerWidth);
54
+ }
55
+
56
+ window.addEventListener('resize', updateSize);
57
+ return function () {
58
+ return window.removeEventListener('resize', updateSize);
59
+ };
60
+ }, []);
45
61
  hooks.getCellProps.push(function (props, data) {
46
62
  var _columns$;
47
63
 
@@ -54,7 +70,7 @@ var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
54
70
 
55
71
  if (column.id === selectionColumnId && DatagridPagination) {
56
72
  return [props, {
57
- className: cx("".concat(blockClass, "__select-all-toggle-on"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft))
73
+ className: cx("".concat(blockClass, "__select-all-toggle-on"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
58
74
  }];
59
75
  }
60
76
 
@@ -1,5 +1,6 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
3
+ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
3
4
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
4
5
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
6
  var _excluded = ["onChange"];
@@ -16,7 +17,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
16
17
  * restricted by GSA ADP Schedule Contract with IBM Corp.
17
18
  */
18
19
  // @flow
19
- import React from 'react';
20
+ import React, { useLayoutEffect, useState } from 'react';
20
21
  import cx from 'classnames';
21
22
  import { TableSelectRow } from '@carbon/react';
22
23
  import { SelectAll } from './Datagrid/DatagridSelectAll';
@@ -82,6 +83,22 @@ var SelectRow = function SelectRow(datagridState) {
82
83
  onRadioSelect = datagridState.onRadioSelect,
83
84
  columns = datagridState.columns,
84
85
  withStickyColumn = datagridState.withStickyColumn;
86
+
87
+ var _useState = useState(window.innerWidth),
88
+ _useState2 = _slicedToArray(_useState, 2),
89
+ windowSize = _useState2[0],
90
+ setWindowSize = _useState2[1];
91
+
92
+ useLayoutEffect(function () {
93
+ function updateSize() {
94
+ setWindowSize(window.innerWidth);
95
+ }
96
+
97
+ window.addEventListener('resize', updateSize);
98
+ return function () {
99
+ return window.removeEventListener('resize', updateSize);
100
+ };
101
+ }, []);
85
102
  var selectDisabled = isFetching || row.getRowProps().selectDisabled;
86
103
 
87
104
  var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
@@ -107,7 +124,7 @@ var SelectRow = function SelectRow(datagridState) {
107
124
  },
108
125
  id: "".concat(tableId, "-").concat(row.index),
109
126
  name: "".concat(tableId, "-").concat(row.index, "-name"),
110
- className: cx("".concat(blockClass, "__checkbox-cell"), cellProps.className, _defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft)),
127
+ className: cx("".concat(blockClass, "__checkbox-cell"), cellProps.className, _defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)),
111
128
  ariaLabel: "".concat(tableId, "-row-").concat(row.index) // TODO: aria label should be i18n'ed
112
129
  ,
113
130
  disabled: selectDisabled
@@ -1,4 +1,5 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
+ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
2
3
 
3
4
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
4
5
 
@@ -11,7 +12,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
11
12
  * US Government Users Restricted Rights - Use, duplication or disclosure
12
13
  * restricted by GSA ADP Schedule Contract with IBM Corp.
13
14
  */
14
- import { useEffect, useRef } from 'react';
15
+ import { useEffect, useRef, useLayoutEffect, useState } from 'react';
15
16
  import debounce from 'lodash/debounce';
16
17
  import cx from 'classnames';
17
18
  import { pkg } from '../../settings';
@@ -23,8 +24,24 @@ var OFFSET_SCROLL_CLASS = "".concat(styleClassPrefix, "-offset-scroll");
23
24
  var useStickyColumn = function useStickyColumn(hooks) {
24
25
  var tableBodyRef = useRef();
25
26
  var stickyHeaderCellRef = useRef();
26
- hooks.getCellProps.push(changeProps.bind(null, 'cell', null));
27
- hooks.getHeaderProps.push(changeProps.bind(null, 'header', stickyHeaderCellRef));
27
+
28
+ var _useState = useState(window.innerWidth),
29
+ _useState2 = _slicedToArray(_useState, 2),
30
+ windowSize = _useState2[0],
31
+ setWindowSize = _useState2[1];
32
+
33
+ useLayoutEffect(function () {
34
+ function updateSize() {
35
+ setWindowSize(window.innerWidth);
36
+ }
37
+
38
+ window.addEventListener('resize', updateSize);
39
+ return function () {
40
+ return window.removeEventListener('resize', updateSize);
41
+ };
42
+ }, []);
43
+ hooks.getCellProps.push(changeProps.bind(null, 'cell', null, windowSize));
44
+ hooks.getHeaderProps.push(changeProps.bind(null, 'header', stickyHeaderCellRef, windowSize));
28
45
  hooks.getTableBodyProps.push(addTableBodyProps.bind(null, tableBodyRef));
29
46
  hooks.getHeaderGroupProps.push(function (props) {
30
47
  return [props, {
@@ -132,7 +149,7 @@ var addTableBodyProps = function addTableBodyProps(tableBodyRef, props) {
132
149
  }];
133
150
  };
134
151
 
135
- var changeProps = function changeProps(elementName, headerCellRef, props, data) {
152
+ var changeProps = function changeProps(elementName, headerCellRef, windowSize, props, data) {
136
153
  var column = data.column || data.cell.column;
137
154
 
138
155
  if (column.sticky === 'right') {
@@ -149,7 +166,7 @@ var changeProps = function changeProps(elementName, headerCellRef, props, data)
149
166
  var _data$instance, _cx2;
150
167
 
151
168
  return [props, _objectSpread({
152
- className: cx((_cx2 = {}, _defineProperty(_cx2, "".concat(leftStickyStyleClassPrefix, "-").concat(elementName), true), _defineProperty(_cx2, "".concat(leftStickyStyleClassPrefix, "-").concat(elementName, "--with-extra-select-column"), data === null || data === void 0 ? void 0 : (_data$instance = data.instance) === null || _data$instance === void 0 ? void 0 : _data$instance.withSelectRows), _cx2))
169
+ className: cx((_cx2 = {}, _defineProperty(_cx2, "".concat(leftStickyStyleClassPrefix, "-").concat(elementName), true && windowSize > 671), _defineProperty(_cx2, "".concat(leftStickyStyleClassPrefix, "-").concat(elementName, "--with-extra-select-column"), (data === null || data === void 0 ? void 0 : (_data$instance = data.instance) === null || _data$instance === void 0 ? void 0 : _data$instance.withSelectRows) && windowSize > 671), _cx2))
153
170
  }, headerCellRef && {
154
171
  ref: headerCellRef
155
172
  })];
@@ -83,13 +83,13 @@ CardFooter.propTypes = {
83
83
  onPrimaryButtonClick: _propTypes.default.func,
84
84
  onSecondaryButtonClick: _propTypes.default.func,
85
85
  primaryButtonHref: _propTypes.default.string,
86
- primaryButtonIcon: _propTypes.default.string,
86
+ primaryButtonIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
87
87
  primaryButtonKind: _propTypes.default.oneOf(['primary', 'ghost']),
88
88
  primaryButtonPlacement: _propTypes.default.oneOf(['top', 'bottom']),
89
89
  primaryButtonText: _propTypes.default.string,
90
90
  productive: _propTypes.default.bool,
91
91
  secondaryButtonHref: _propTypes.default.string,
92
- secondaryButtonIcon: _propTypes.default.string,
92
+ secondaryButtonIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
93
93
  secondaryButtonKind: _propTypes.default.oneOf(['secondary', 'ghost']),
94
94
  secondaryButtonText: _propTypes.default.string
95
95
  };
@@ -57,30 +57,61 @@ var DatagridRow = function DatagridRow(datagridState) {
57
57
  return size;
58
58
  };
59
59
 
60
+ var hoverHandler = function hoverHandler(event) {
61
+ var _hoverRow$style, _hoverRow$style2, _hoverRow$style3;
62
+
63
+ var subRowCount = getVisibleNestedRowCount(row);
64
+ var totalNestedRowIndicatorHeight = (0, _layout.px)(subRowCount * rowHeights[rowSize]);
65
+ var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
66
+ hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.add("".concat(blockClass, "__carbon-row-expanded-hover-active"));
67
+ var rowExpanderButton = hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.querySelector(".".concat(blockClass, "__row-expander"));
68
+ var rowSizeValue = rowSize || 'lg';
69
+ hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style = hoverRow.style) === null || _hoverRow$style === void 0 ? void 0 : _hoverRow$style.setProperty("--".concat(blockClass, "--indicator-height"), totalNestedRowIndicatorHeight);
70
+ hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style2 = hoverRow.style) === null || _hoverRow$style2 === void 0 ? void 0 : _hoverRow$style2.setProperty("--".concat(blockClass, "--row-height"), (0, _layout.px)(rowHeights[rowSizeValue]));
71
+ hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style3 = hoverRow.style) === null || _hoverRow$style3 === void 0 ? void 0 : _hoverRow$style3.setProperty("--".concat(blockClass, "--indicator-offset-amount"), (0, _layout.px)((rowExpanderButton === null || rowExpanderButton === void 0 ? void 0 : rowExpanderButton.offsetLeft) || 0));
72
+ };
73
+
74
+ var focusRemover = function focusRemover() {
75
+ var elements = document.querySelectorAll(".".concat(blockClass, "__carbon-row-expanded"));
76
+ elements.forEach(function (el) {
77
+ el.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
78
+ });
79
+ };
80
+
60
81
  return /*#__PURE__*/_react.default.createElement(_react2.TableRow, (0, _extends2.default)({
61
82
  className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx))
62
83
  }, row.getRowProps(), {
63
84
  key: row.id,
64
85
  onMouseEnter: function onMouseEnter(event) {
65
- var _hoverRow$style, _hoverRow$style2, _hoverRow$style3;
66
-
67
86
  if (!withNestedRows) {
68
87
  return;
69
88
  }
70
89
 
71
- var subRowCount = getVisibleNestedRowCount(row);
72
- var totalNestedRowIndicatorHeight = (0, _layout.px)(subRowCount * rowHeights[rowSize]);
73
- var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
74
- hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.add("".concat(blockClass, "__carbon-row-expanded-hover-active"));
75
- var rowExpanderButton = hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.querySelector(".".concat(blockClass, "__row-expander"));
76
- var rowSizeValue = rowSize || 'lg';
77
- hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style = hoverRow.style) === null || _hoverRow$style === void 0 ? void 0 : _hoverRow$style.setProperty("--".concat(blockClass, "--indicator-height"), totalNestedRowIndicatorHeight);
78
- hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style2 = hoverRow.style) === null || _hoverRow$style2 === void 0 ? void 0 : _hoverRow$style2.setProperty("--".concat(blockClass, "--row-height"), (0, _layout.px)(rowHeights[rowSizeValue]));
79
- hoverRow === null || hoverRow === void 0 ? void 0 : (_hoverRow$style3 = hoverRow.style) === null || _hoverRow$style3 === void 0 ? void 0 : _hoverRow$style3.setProperty("--".concat(blockClass, "--indicator-offset-amount"), (0, _layout.px)((rowExpanderButton === null || rowExpanderButton === void 0 ? void 0 : rowExpanderButton.offsetLeft) || 0));
90
+ hoverHandler(event);
80
91
  },
81
92
  onMouseLeave: function onMouseLeave(event) {
82
93
  var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
83
94
  hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
95
+ },
96
+ onFocus: function onFocus(event) {
97
+ if (!withNestedRows) {
98
+ return;
99
+ }
100
+
101
+ hoverHandler(event);
102
+ },
103
+ onBlur: function onBlur() {
104
+ focusRemover();
105
+ },
106
+ onKeyUp: function onKeyUp(event) {
107
+ if (!withNestedRows) {
108
+ return;
109
+ }
110
+
111
+ if (event.key === 'Enter' || event.key === 'Space') {
112
+ focusRemover();
113
+ hoverHandler(event);
114
+ }
84
115
  }
85
116
  }), row.cells.map(function (cell, index) {
86
117
  var cellProps = cell.getCellProps();
@@ -2,6 +2,8 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
+ var _typeof = require("@babel/runtime/helpers/typeof");
6
+
5
7
  Object.defineProperty(exports, "__esModule", {
6
8
  value: true
7
9
  });
@@ -13,7 +15,9 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
13
15
 
14
16
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
17
 
16
- var _react = _interopRequireDefault(require("react"));
18
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
19
+
20
+ var _react = _interopRequireWildcard(require("react"));
17
21
 
18
22
  var _react2 = require("@carbon/react");
19
23
 
@@ -22,11 +26,31 @@ var _classnames = _interopRequireDefault(require("classnames"));
22
26
  var _settings = require("../../../settings");
23
27
 
24
28
  var _excluded = ["onChange"];
29
+
30
+ 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); }
31
+
32
+ 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; }
33
+
25
34
  var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
26
35
 
27
36
  var SelectAll = function SelectAll(datagridState) {
28
37
  var _columns$;
29
38
 
39
+ var _useState = (0, _react.useState)(window.innerWidth),
40
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
41
+ windowSize = _useState2[0],
42
+ setWindowSize = _useState2[1];
43
+
44
+ (0, _react.useLayoutEffect)(function () {
45
+ function updateSize() {
46
+ setWindowSize(window.innerWidth);
47
+ }
48
+
49
+ window.addEventListener('resize', updateSize);
50
+ return function () {
51
+ return window.removeEventListener('resize', updateSize);
52
+ };
53
+ }, []);
30
54
  var isFetching = datagridState.isFetching,
31
55
  getToggleAllRowsSelectedProps = datagridState.getToggleAllRowsSelectedProps,
32
56
  getToggleAllPageRowsSelectedProps = datagridState.getToggleAllPageRowsSelectedProps,
@@ -40,7 +64,7 @@ var SelectAll = function SelectAll(datagridState) {
40
64
 
41
65
  if (hideSelectAll || radio) {
42
66
  return /*#__PURE__*/_react.default.createElement("div", {
43
- className: (0, _classnames.default)("".concat(blockClass, "__head-hidden-select-all"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft))
67
+ className: (0, _classnames.default)("".concat(blockClass, "__head-hidden-select-all"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
44
68
  });
45
69
  }
46
70
 
@@ -51,7 +75,7 @@ var SelectAll = function SelectAll(datagridState) {
51
75
  selectProps = (0, _objectWithoutProperties2.default)(_getProps, _excluded);
52
76
 
53
77
  return /*#__PURE__*/_react.default.createElement("div", {
54
- className: (0, _classnames.default)("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft))
78
+ className: (0, _classnames.default)("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
55
79
  }, /*#__PURE__*/_react.default.createElement(_react2.TableSelectAll, (0, _extends2.default)({}, selectProps, {
56
80
  name: "".concat(tableId, "-select-all-checkbox-name"),
57
81
  onSelect: onChange,
@@ -67,6 +67,22 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
67
67
  }
68
68
  }, [isAllRowsSelected, selectAllMode, onSelectAllRows]);
69
69
 
70
+ var _useState3 = (0, _react.useState)(window.innerWidth),
71
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
72
+ windowSize = _useState4[0],
73
+ setWindowSize = _useState4[1];
74
+
75
+ (0, _react.useLayoutEffect)(function () {
76
+ function updateSize() {
77
+ setWindowSize(window.innerWidth);
78
+ }
79
+
80
+ window.addEventListener('resize', updateSize);
81
+ return function () {
82
+ return window.removeEventListener('resize', updateSize);
83
+ };
84
+ }, []);
85
+
70
86
  var _ref2 = selectAllToggle || {},
71
87
  onSelectAllRows = _ref2.onSelectAllRows,
72
88
  labels = _ref2.labels;
@@ -87,7 +103,7 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
87
103
  return /*#__PURE__*/_react.default.createElement("th", {
88
104
  role: "columnheader",
89
105
  scope: "col",
90
- className: (0, _classnames.default)("".concat(blockClass, "__select-all-toggle-on"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft))
106
+ className: (0, _classnames.default)("".concat(blockClass, "__select-all-toggle-on"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
91
107
  }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_react2.Checkbox, (0, _extends2.default)({}, selectProps, {
92
108
  name: "".concat(tableId, "-select-all-checkbox-name"),
93
109
  onClick: function onClick(e) {
@@ -23,6 +23,11 @@ var _settings = require("../../settings");
23
23
 
24
24
  var _excluded = ["id", "itemText", "onClick", "icon"],
25
25
  _excluded2 = ["id", "onClick", "shouldHideMenuItem", "shouldDisableMenuItem", "disabled"];
26
+
27
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
28
+
29
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
30
+
26
31
  var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
27
32
 
28
33
  var useActionsColumn = function useActionsColumn(hooks) {
@@ -115,7 +120,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
115
120
  })))),
116
121
  className: (0, _classnames.default)((_cx3 = {}, (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__actions-column-cell"), true), (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__cell"), true), _cx3)),
117
122
  style: {
118
- width: 96
123
+ width: rowActions.length > 2 ? 48 : 96
119
124
  }
120
125
  }];
121
126
  }
@@ -127,6 +132,30 @@ var useActionsColumn = function useActionsColumn(hooks) {
127
132
  }
128
133
  };
129
134
 
135
+ var useStickyHeaderWidth = function useStickyHeaderWidth(instance) {
136
+ var rowActions = instance.rowActions;
137
+
138
+ if (rowActions && Array.isArray(rowActions)) {
139
+ var addHeaderWidth = function addHeaderWidth(props, cellData) {
140
+ var column = cellData.column;
141
+
142
+ if (column.isAction) {
143
+ return [props, {
144
+ style: _objectSpread(_objectSpread({}, props.style), {}, {
145
+ width: rowActions.length > 2 ? 48 : 96 // set header width based on action length
146
+
147
+ })
148
+ }];
149
+ }
150
+
151
+ return [props];
152
+ };
153
+
154
+ hooks.getHeaderProps.push(addHeaderWidth);
155
+ }
156
+ };
157
+
158
+ hooks.useInstance.push(useStickyHeaderWidth);
130
159
  hooks.useInstance.push(useAttachActionsOnInstance);
131
160
  };
132
161
 
@@ -28,7 +28,7 @@ var useDefaultStringRenderer = function useDefaultStringRenderer(hooks) {
28
28
  var _tableProps$column;
29
29
 
30
30
  return /*#__PURE__*/_react.default.createElement("div", {
31
- className: (0, _classnames.default)("".concat(blockClass, "__defaultStringRenderer"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__defaultStringRenderer--multiline"), (_tableProps$column = tableProps.column) === null || _tableProps$column === void 0 ? void 0 : _tableProps$column.multiLineWrap)),
31
+ className: (0, _classnames.default)("".concat(blockClass, "__defaultStringRenderer"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__defaultStringRenderer--multiline"), ((_tableProps$column = tableProps.column) === null || _tableProps$column === void 0 ? void 0 : _tableProps$column.multiLineWrap) || (tableProps === null || tableProps === void 0 ? void 0 : tableProps.multiLineWrapAll))),
32
32
  title: tableProps.value
33
33
  }, tableProps.value);
34
34
  };
@@ -41,9 +41,7 @@ var useNestedRows = function useNestedRows(hooks) {
41
41
  var row = _ref2.row;
42
42
  return [props, {
43
43
  style: {
44
- marginLeft: "".concat(row.depth > 0 ? marginLeft : 0, "px"),
45
- paddingLeft: "".concat(row.depth === 2 ? marginLeft * (row.depth - 1) + marginLeft - 8 : row.depth > 2 ? marginLeft * (row.depth - 1) + marginLeft : row.depth === 1 ? marginLeft - 16 : 0, "px"),
46
- maxWidth: "calc(100% - ".concat(marginLeft * row.depth, "px)")
44
+ paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
47
45
  }
48
46
  }];
49
47
  };
@@ -57,7 +55,7 @@ var useNestedRows = function useNestedRows(hooks) {
57
55
  }) === 0;
58
56
  return [props, {
59
57
  style: {
60
- marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "-".concat(marginLeft * (cell.row.depth + 1), "px") : '')
58
+ marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
61
59
  }
62
60
  }];
63
61
  };
@@ -2,6 +2,8 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
+ var _typeof = require("@babel/runtime/helpers/typeof");
6
+
5
7
  Object.defineProperty(exports, "__esModule", {
6
8
  value: true
7
9
  });
@@ -9,7 +11,9 @@ exports.default = void 0;
9
11
 
10
12
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
13
 
12
- var _react = _interopRequireDefault(require("react"));
14
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
+
16
+ var _react = _interopRequireWildcard(require("react"));
13
17
 
14
18
  var _classnames = _interopRequireDefault(require("classnames"));
15
19
 
@@ -19,6 +23,10 @@ var _DatagridSelectAllWithToggle = _interopRequireDefault(require("./Datagrid/Da
19
23
 
20
24
  var _settings = require("../../settings");
21
25
 
26
+ 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); }
27
+
28
+ 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; }
29
+
22
30
  /*
23
31
  * Licensed Materials - Property of IBM
24
32
  * 5724-Q36
@@ -56,6 +64,21 @@ var useSelectAllWithToggleComponent = function useSelectAllWithToggleComponent(h
56
64
  };
57
65
 
58
66
  var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
67
+ var _useState = (0, _react.useState)(window.innerWidth),
68
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
69
+ windowSize = _useState2[0],
70
+ setWindowSize = _useState2[1];
71
+
72
+ (0, _react.useLayoutEffect)(function () {
73
+ function updateSize() {
74
+ setWindowSize(window.innerWidth);
75
+ }
76
+
77
+ window.addEventListener('resize', updateSize);
78
+ return function () {
79
+ return window.removeEventListener('resize', updateSize);
80
+ };
81
+ }, []);
59
82
  hooks.getCellProps.push(function (props, data) {
60
83
  var _columns$;
61
84
 
@@ -68,7 +91,7 @@ var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
68
91
 
69
92
  if (column.id === _commonColumnIds.selectionColumnId && DatagridPagination) {
70
93
  return [props, {
71
- className: (0, _classnames.default)("".concat(blockClass, "__select-all-toggle-on"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft))
94
+ className: (0, _classnames.default)("".concat(blockClass, "__select-all-toggle-on"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
72
95
  }];
73
96
  }
74
97
 
@@ -2,6 +2,8 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
+ var _typeof = require("@babel/runtime/helpers/typeof");
6
+
5
7
  Object.defineProperty(exports, "__esModule", {
6
8
  value: true
7
9
  });
@@ -11,11 +13,13 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
13
 
12
14
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
15
 
16
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
17
+
14
18
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
15
19
 
16
20
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
21
 
18
- var _react = _interopRequireDefault(require("react"));
22
+ var _react = _interopRequireWildcard(require("react"));
19
23
 
20
24
  var _classnames = _interopRequireDefault(require("classnames"));
21
25
 
@@ -29,6 +33,10 @@ var _settings = require("../../settings");
29
33
 
30
34
  var _excluded = ["onChange"];
31
35
 
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
+
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; }
39
+
32
40
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
33
41
 
34
42
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -93,6 +101,22 @@ var SelectRow = function SelectRow(datagridState) {
93
101
  onRadioSelect = datagridState.onRadioSelect,
94
102
  columns = datagridState.columns,
95
103
  withStickyColumn = datagridState.withStickyColumn;
104
+
105
+ var _useState = (0, _react.useState)(window.innerWidth),
106
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
107
+ windowSize = _useState2[0],
108
+ setWindowSize = _useState2[1];
109
+
110
+ (0, _react.useLayoutEffect)(function () {
111
+ function updateSize() {
112
+ setWindowSize(window.innerWidth);
113
+ }
114
+
115
+ window.addEventListener('resize', updateSize);
116
+ return function () {
117
+ return window.removeEventListener('resize', updateSize);
118
+ };
119
+ }, []);
96
120
  var selectDisabled = isFetching || row.getRowProps().selectDisabled;
97
121
 
98
122
  var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
@@ -118,7 +142,7 @@ var SelectRow = function SelectRow(datagridState) {
118
142
  },
119
143
  id: "".concat(tableId, "-").concat(row.index),
120
144
  name: "".concat(tableId, "-").concat(row.index, "-name"),
121
- className: (0, _classnames.default)("".concat(blockClass, "__checkbox-cell"), cellProps.className, (0, _defineProperty2.default)({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft)),
145
+ className: (0, _classnames.default)("".concat(blockClass, "__checkbox-cell"), cellProps.className, (0, _defineProperty2.default)({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)),
122
146
  ariaLabel: "".concat(tableId, "-row-").concat(row.index) // TODO: aria label should be i18n'ed
123
147
  ,
124
148
  disabled: selectDisabled