@itwin/itwinui-react 3.19.1 → 3.19.3
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.
- package/CHANGELOG.md +18 -0
- package/DEV-cjs/core/Avatar/Avatar.js +0 -2
- package/DEV-cjs/core/Breadcrumbs/Breadcrumbs.js +10 -5
- package/DEV-cjs/core/ComboBox/ComboBox.js +6 -4
- package/DEV-cjs/core/Popover/Popover.js +1 -1
- package/DEV-cjs/core/Select/Select.js +9 -7
- package/DEV-cjs/core/Table/columns/expanderColumn.js +20 -25
- package/DEV-cjs/core/Table/columns/selectionColumn.js +8 -14
- package/DEV-cjs/core/Table/hooks/useExpanderCell.js +6 -10
- package/DEV-cjs/styles.js +1 -1
- package/DEV-esm/core/Avatar/Avatar.js +0 -2
- package/DEV-esm/core/Breadcrumbs/Breadcrumbs.js +11 -5
- package/DEV-esm/core/ComboBox/ComboBox.js +6 -4
- package/DEV-esm/core/Popover/Popover.js +1 -1
- package/DEV-esm/core/Select/Select.js +9 -7
- package/DEV-esm/core/Table/columns/expanderColumn.js +20 -25
- package/DEV-esm/core/Table/columns/selectionColumn.js +8 -14
- package/DEV-esm/core/Table/hooks/useExpanderCell.js +6 -10
- package/DEV-esm/styles.js +1 -1
- package/cjs/core/Avatar/Avatar.d.ts +4 -8
- package/cjs/core/Avatar/Avatar.js +0 -2
- package/cjs/core/AvatarGroup/AvatarGroup.d.ts +0 -3
- package/cjs/core/Breadcrumbs/Breadcrumbs.js +10 -5
- package/cjs/core/ComboBox/ComboBox.js +6 -4
- package/cjs/core/Popover/Popover.js +1 -1
- package/cjs/core/Select/Select.js +9 -7
- package/cjs/core/Table/columns/expanderColumn.d.ts +2 -2
- package/cjs/core/Table/columns/expanderColumn.js +20 -25
- package/cjs/core/Table/columns/selectionColumn.d.ts +2 -2
- package/cjs/core/Table/columns/selectionColumn.js +8 -14
- package/cjs/core/Table/hooks/useExpanderCell.js +6 -10
- package/cjs/core/Typography/Kbd.d.ts +1 -1
- package/cjs/styles.js +1 -1
- package/esm/core/Avatar/Avatar.d.ts +4 -8
- package/esm/core/Avatar/Avatar.js +0 -2
- package/esm/core/AvatarGroup/AvatarGroup.d.ts +0 -3
- package/esm/core/Breadcrumbs/Breadcrumbs.js +11 -5
- package/esm/core/ComboBox/ComboBox.js +6 -4
- package/esm/core/Popover/Popover.js +1 -1
- package/esm/core/Select/Select.js +9 -7
- package/esm/core/Table/columns/expanderColumn.d.ts +2 -2
- package/esm/core/Table/columns/expanderColumn.js +20 -25
- package/esm/core/Table/columns/selectionColumn.d.ts +2 -2
- package/esm/core/Table/columns/selectionColumn.js +8 -14
- package/esm/core/Table/hooks/useExpanderCell.js +6 -10
- package/esm/core/Typography/Kbd.d.ts +1 -1
- package/esm/styles.js +1 -1
- package/package.json +1 -1
- package/styles.css +10 -10
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 3.19.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2622](https://github.com/iTwin/iTwinUI/pull/2622): Fixed `ComboBox` and `Select` bug by no longer rendering the deselect ("❌") button in the tags when the multiselect `ComboBox`'s input or the multiselect `Select` is disabled.
|
|
8
|
+
- [#2618](https://github.com/iTwin/iTwinUI/pull/2618): `TreeNode` hover styles only applied when hover is supported.
|
|
9
|
+
- [#2624](https://github.com/iTwin/iTwinUI/pull/2624): Floating elements will try to prefer a best fit placement.
|
|
10
|
+
|
|
11
|
+
## 3.19.2
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- [#2612](https://github.com/iTwin/iTwinUI/pull/2612): Fixed theme bridge to use StrataKit fonts.
|
|
16
|
+
- [#2616](https://github.com/iTwin/iTwinUI/pull/2616): Reverted the internal change made in [v3.19.0](https://github.com/iTwin/iTwinUI/releases/tag/%40itwin%2Fitwinui-react%403.19.0) where `Table`'s `SelectionColumn` and `ExpanderColumn` had been fixed to use `cellRenderer` instead of `Cell`.
|
|
17
|
+
- [#2603](https://github.com/iTwin/iTwinUI/pull/2603): `Breadcrumbs.Item` now respects the `aria-current` prop.
|
|
18
|
+
- [#2615](https://github.com/iTwin/iTwinUI/pull/2615): `Table` row and header separators made more subtle.
|
|
19
|
+
|
|
3
20
|
## 3.19.1
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -16,6 +33,7 @@
|
|
|
16
33
|
|
|
17
34
|
- [#2573](https://github.com/iTwin/iTwinUI/pull/2573): Added the ability to pass `future={true}` to `ThemeProvider` to enable _all_ future flags.
|
|
18
35
|
- [#2543](https://github.com/iTwin/iTwinUI/pull/2543): Added a new future flag to `ThemeProvider`'s `future` prop: `ToggleSwitch.consistentPropsSpread`. Setting this to `true` will result in all `ToggleSwitch` DOM props being applied on the input element.
|
|
36
|
+
|
|
19
37
|
- [#2544](https://github.com/iTwin/iTwinUI/pull/2544): Added a new `wrapperProps` prop to `ToggleSwitch` to pass props to the wrapper. To prevent breaking changes:
|
|
20
38
|
- If this new `wrapperProps` is provided or `ThemeProvider`'s `ToggleSwitch.consistentPropsSpread` future flag is `true`, `className` and `style` will be applied on the `input` and `wrapperProps` will be applied on the wrapper.
|
|
21
39
|
- Else, `className` and `style` continue to be applied on the wrapper.
|
|
@@ -44,7 +44,6 @@ const Avatar = _react.forwardRef((props, ref) => {
|
|
|
44
44
|
abbreviation,
|
|
45
45
|
image,
|
|
46
46
|
backgroundColor,
|
|
47
|
-
title,
|
|
48
47
|
translatedStatusTitles,
|
|
49
48
|
className,
|
|
50
49
|
style,
|
|
@@ -61,7 +60,6 @@ const Avatar = _react.forwardRef((props, ref) => {
|
|
|
61
60
|
className: (0, _classnames.default)('iui-avatar', className),
|
|
62
61
|
'data-iui-size': 'medium' !== size ? size : void 0,
|
|
63
62
|
'data-iui-status': status,
|
|
64
|
-
title: title,
|
|
65
63
|
style: {
|
|
66
64
|
backgroundColor: getBackground(backgroundColor),
|
|
67
65
|
...style,
|
|
@@ -143,17 +143,22 @@ const ListItem = ({ item, isActive }) => {
|
|
|
143
143
|
);
|
|
144
144
|
children = _react.createElement(BreadcrumbsItem, children.props);
|
|
145
145
|
}
|
|
146
|
+
let getProps = _react.useCallback(
|
|
147
|
+
(children) => {
|
|
148
|
+
let defaultAriaCurrent = isActive ? 'location' : void 0;
|
|
149
|
+
return {
|
|
150
|
+
'aria-current': children.props['aria-current'] ?? defaultAriaCurrent,
|
|
151
|
+
};
|
|
152
|
+
},
|
|
153
|
+
[isActive],
|
|
154
|
+
);
|
|
146
155
|
return _react.createElement(
|
|
147
156
|
_index.Box,
|
|
148
157
|
{
|
|
149
158
|
as: 'li',
|
|
150
159
|
className: 'iui-breadcrumbs-item',
|
|
151
160
|
},
|
|
152
|
-
children
|
|
153
|
-
_react.cloneElement(children, {
|
|
154
|
-
'aria-current':
|
|
155
|
-
children.props['aria-current'] ?? isActive ? 'location' : void 0,
|
|
156
|
-
}),
|
|
161
|
+
children ? (0, _index.cloneElementWithRef)(children, getProps) : null,
|
|
157
162
|
);
|
|
158
163
|
};
|
|
159
164
|
const Separator = ({ separator }) =>
|
|
@@ -410,10 +410,12 @@ const ComboBox = _react.forwardRef((props, forwardedRef) => {
|
|
|
410
410
|
return _react.createElement(_SelectTag.SelectTag, {
|
|
411
411
|
key: option.label,
|
|
412
412
|
label: option.label,
|
|
413
|
-
onRemove:
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
413
|
+
onRemove: inputProps?.disabled
|
|
414
|
+
? void 0
|
|
415
|
+
: () => {
|
|
416
|
+
handleOptionSelection(__originalIndex);
|
|
417
|
+
hide();
|
|
418
|
+
},
|
|
417
419
|
});
|
|
418
420
|
})
|
|
419
421
|
.filter(Boolean)
|
|
@@ -238,14 +238,16 @@ const CustomSelect = _react.forwardRef((props, forwardedRef) => {
|
|
|
238
238
|
_react.createElement(_SelectTag.SelectTag, {
|
|
239
239
|
key: option.label,
|
|
240
240
|
label: option.label,
|
|
241
|
-
onRemove:
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
241
|
+
onRemove: disabled
|
|
242
|
+
? void 0
|
|
243
|
+
: () => {
|
|
244
|
+
handleOptionSelection(option, {
|
|
245
|
+
isSelected: true,
|
|
246
|
+
});
|
|
247
|
+
selectRef.current?.focus();
|
|
248
|
+
},
|
|
247
249
|
}),
|
|
248
|
-
[handleOptionSelection],
|
|
250
|
+
[disabled, handleOptionSelection],
|
|
249
251
|
);
|
|
250
252
|
let popover = (0, _Popover.usePopover)({
|
|
251
253
|
visible: isOpen,
|
|
@@ -35,35 +35,30 @@ const ExpanderColumn = (props = {}) => {
|
|
|
35
35
|
maxWidth: 48,
|
|
36
36
|
columnClassName: 'iui-slot',
|
|
37
37
|
cellClassName: 'iui-slot',
|
|
38
|
-
Cell: () =>
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
let children = subComponent?.(row)
|
|
42
|
-
? _react.createElement(
|
|
43
|
-
_IconButton.IconButton,
|
|
44
|
-
{
|
|
45
|
-
'aria-label': 'Toggle expandable content',
|
|
46
|
-
className: 'iui-table-row-expander',
|
|
47
|
-
styleType: 'borderless',
|
|
48
|
-
size: 'small',
|
|
49
|
-
onClick: (e) => {
|
|
50
|
-
e.stopPropagation();
|
|
51
|
-
row.toggleRowExpanded();
|
|
52
|
-
},
|
|
53
|
-
disabled: isDisabled?.(row.original),
|
|
54
|
-
'aria-expanded': row.isExpanded,
|
|
55
|
-
},
|
|
56
|
-
_react.createElement(_index.SvgChevronRight, null),
|
|
57
|
-
)
|
|
58
|
-
: null;
|
|
38
|
+
Cell: (props) => {
|
|
39
|
+
let { row } = props;
|
|
40
|
+
if (!subComponent?.(row)) return null;
|
|
59
41
|
return _react.createElement(
|
|
60
|
-
|
|
42
|
+
_IconButton.IconButton,
|
|
61
43
|
{
|
|
62
|
-
|
|
63
|
-
|
|
44
|
+
'aria-label': 'Toggle expandable content',
|
|
45
|
+
className: 'iui-table-row-expander',
|
|
46
|
+
styleType: 'borderless',
|
|
47
|
+
size: 'small',
|
|
48
|
+
onClick: (e) => {
|
|
49
|
+
e.stopPropagation();
|
|
50
|
+
row.toggleRowExpanded();
|
|
51
|
+
},
|
|
52
|
+
disabled: isDisabled?.(props.row.original),
|
|
53
|
+
'aria-expanded': row.isExpanded,
|
|
64
54
|
},
|
|
65
|
-
|
|
55
|
+
_react.createElement(_index.SvgChevronRight, null),
|
|
66
56
|
);
|
|
67
57
|
},
|
|
58
|
+
cellRenderer: (props) =>
|
|
59
|
+
_react.createElement(_index1.DefaultCell, {
|
|
60
|
+
...props,
|
|
61
|
+
isDisabled: (rowData) => !!isDisabled?.(rowData),
|
|
62
|
+
}),
|
|
68
63
|
};
|
|
69
64
|
};
|
|
@@ -64,10 +64,8 @@ const SelectionColumn = (props = {}) => {
|
|
|
64
64
|
onChange: () => toggleAllRowsSelected(nextToggleState),
|
|
65
65
|
});
|
|
66
66
|
},
|
|
67
|
-
Cell: () =>
|
|
68
|
-
|
|
69
|
-
let { row, selectSubRows = true } = props.cellProps;
|
|
70
|
-
let children = _react.createElement(_Checkbox.Checkbox, {
|
|
67
|
+
Cell: ({ row, selectSubRows = true }) =>
|
|
68
|
+
_react.createElement(_Checkbox.Checkbox, {
|
|
71
69
|
...row.getToggleRowSelectedProps(),
|
|
72
70
|
style: {},
|
|
73
71
|
title: '',
|
|
@@ -87,15 +85,11 @@ const SelectionColumn = (props = {}) => {
|
|
|
87
85
|
);
|
|
88
86
|
else row.toggleRowSelected(!row.isSelected);
|
|
89
87
|
},
|
|
90
|
-
})
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
},
|
|
97
|
-
children,
|
|
98
|
-
);
|
|
99
|
-
},
|
|
88
|
+
}),
|
|
89
|
+
cellRenderer: (props) =>
|
|
90
|
+
_react.createElement(_index.DefaultCell, {
|
|
91
|
+
...props,
|
|
92
|
+
isDisabled: (rowData) => !!isDisabled?.(rowData),
|
|
93
|
+
}),
|
|
100
94
|
};
|
|
101
95
|
};
|
|
@@ -11,7 +11,6 @@ Object.defineProperty(exports, 'useExpanderCell', {
|
|
|
11
11
|
const _interop_require_wildcard = require('@swc/helpers/_/_interop_require_wildcard');
|
|
12
12
|
const _react = /*#__PURE__*/ _interop_require_wildcard._(require('react'));
|
|
13
13
|
const _index = require('../columns/index.js');
|
|
14
|
-
const _DefaultCell = require('../cells/DefaultCell.js');
|
|
15
14
|
const useExpanderCell =
|
|
16
15
|
(subComponent, expanderCell, isRowDisabled) => (hooks) => {
|
|
17
16
|
if (!subComponent) return;
|
|
@@ -27,17 +26,14 @@ const useExpanderCell =
|
|
|
27
26
|
return [
|
|
28
27
|
{
|
|
29
28
|
...expanderColumn,
|
|
30
|
-
|
|
31
|
-
? (
|
|
29
|
+
Cell: expanderCell
|
|
30
|
+
? (cellProps) =>
|
|
32
31
|
_react.createElement(
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
isDisabled: (rowData) => !!isRowDisabled?.(rowData),
|
|
37
|
-
},
|
|
38
|
-
expanderCell(props.cellProps),
|
|
32
|
+
_react.Fragment,
|
|
33
|
+
null,
|
|
34
|
+
expanderCell(cellProps),
|
|
39
35
|
)
|
|
40
|
-
: expanderColumn.
|
|
36
|
+
: expanderColumn.Cell,
|
|
41
37
|
},
|
|
42
38
|
...columns,
|
|
43
39
|
];
|
package/DEV-cjs/styles.js
CHANGED
|
@@ -19,7 +19,6 @@ export const Avatar = React.forwardRef((props, ref) => {
|
|
|
19
19
|
abbreviation,
|
|
20
20
|
image,
|
|
21
21
|
backgroundColor,
|
|
22
|
-
title,
|
|
23
22
|
translatedStatusTitles,
|
|
24
23
|
className,
|
|
25
24
|
style,
|
|
@@ -36,7 +35,6 @@ export const Avatar = React.forwardRef((props, ref) => {
|
|
|
36
35
|
className: cx('iui-avatar', className),
|
|
37
36
|
'data-iui-size': 'medium' !== size ? size : void 0,
|
|
38
37
|
'data-iui-status': status,
|
|
39
|
-
title: title,
|
|
40
38
|
style: {
|
|
41
39
|
backgroundColor: getBackground(backgroundColor),
|
|
42
40
|
...style,
|
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
Box,
|
|
6
6
|
OverflowContainer,
|
|
7
7
|
useWarningLogger,
|
|
8
|
+
cloneElementWithRef,
|
|
8
9
|
} from '../../utils/index.js';
|
|
9
10
|
import { Button } from '../Buttons/Button.js';
|
|
10
11
|
import { Anchor } from '../Typography/Anchor.js';
|
|
@@ -134,17 +135,22 @@ let ListItem = ({ item, isActive }) => {
|
|
|
134
135
|
);
|
|
135
136
|
children = React.createElement(BreadcrumbsItem, children.props);
|
|
136
137
|
}
|
|
138
|
+
let getProps = React.useCallback(
|
|
139
|
+
(children) => {
|
|
140
|
+
let defaultAriaCurrent = isActive ? 'location' : void 0;
|
|
141
|
+
return {
|
|
142
|
+
'aria-current': children.props['aria-current'] ?? defaultAriaCurrent,
|
|
143
|
+
};
|
|
144
|
+
},
|
|
145
|
+
[isActive],
|
|
146
|
+
);
|
|
137
147
|
return React.createElement(
|
|
138
148
|
Box,
|
|
139
149
|
{
|
|
140
150
|
as: 'li',
|
|
141
151
|
className: 'iui-breadcrumbs-item',
|
|
142
152
|
},
|
|
143
|
-
children
|
|
144
|
-
React.cloneElement(children, {
|
|
145
|
-
'aria-current':
|
|
146
|
-
children.props['aria-current'] ?? isActive ? 'location' : void 0,
|
|
147
|
-
}),
|
|
153
|
+
children ? cloneElementWithRef(children, getProps) : null,
|
|
148
154
|
);
|
|
149
155
|
};
|
|
150
156
|
let Separator = ({ separator }) =>
|
|
@@ -406,10 +406,12 @@ export const ComboBox = React.forwardRef((props, forwardedRef) => {
|
|
|
406
406
|
return React.createElement(SelectTag, {
|
|
407
407
|
key: option.label,
|
|
408
408
|
label: option.label,
|
|
409
|
-
onRemove:
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
409
|
+
onRemove: inputProps?.disabled
|
|
410
|
+
? void 0
|
|
411
|
+
: () => {
|
|
412
|
+
handleOptionSelection(__originalIndex);
|
|
413
|
+
hide();
|
|
414
|
+
},
|
|
413
415
|
});
|
|
414
416
|
})
|
|
415
417
|
.filter(Boolean)
|
|
@@ -230,14 +230,16 @@ let CustomSelect = React.forwardRef((props, forwardedRef) => {
|
|
|
230
230
|
React.createElement(SelectTag, {
|
|
231
231
|
key: option.label,
|
|
232
232
|
label: option.label,
|
|
233
|
-
onRemove:
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
233
|
+
onRemove: disabled
|
|
234
|
+
? void 0
|
|
235
|
+
: () => {
|
|
236
|
+
handleOptionSelection(option, {
|
|
237
|
+
isSelected: true,
|
|
238
|
+
});
|
|
239
|
+
selectRef.current?.focus();
|
|
240
|
+
},
|
|
239
241
|
}),
|
|
240
|
-
[handleOptionSelection],
|
|
242
|
+
[disabled, handleOptionSelection],
|
|
241
243
|
);
|
|
242
244
|
let popover = usePopover({
|
|
243
245
|
visible: isOpen,
|
|
@@ -15,35 +15,30 @@ export const ExpanderColumn = (props = {}) => {
|
|
|
15
15
|
maxWidth: 48,
|
|
16
16
|
columnClassName: 'iui-slot',
|
|
17
17
|
cellClassName: 'iui-slot',
|
|
18
|
-
Cell: () =>
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
let children = subComponent?.(row)
|
|
22
|
-
? React.createElement(
|
|
23
|
-
IconButton,
|
|
24
|
-
{
|
|
25
|
-
'aria-label': 'Toggle expandable content',
|
|
26
|
-
className: 'iui-table-row-expander',
|
|
27
|
-
styleType: 'borderless',
|
|
28
|
-
size: 'small',
|
|
29
|
-
onClick: (e) => {
|
|
30
|
-
e.stopPropagation();
|
|
31
|
-
row.toggleRowExpanded();
|
|
32
|
-
},
|
|
33
|
-
disabled: isDisabled?.(row.original),
|
|
34
|
-
'aria-expanded': row.isExpanded,
|
|
35
|
-
},
|
|
36
|
-
React.createElement(SvgChevronRight, null),
|
|
37
|
-
)
|
|
38
|
-
: null;
|
|
18
|
+
Cell: (props) => {
|
|
19
|
+
let { row } = props;
|
|
20
|
+
if (!subComponent?.(row)) return null;
|
|
39
21
|
return React.createElement(
|
|
40
|
-
|
|
22
|
+
IconButton,
|
|
41
23
|
{
|
|
42
|
-
|
|
43
|
-
|
|
24
|
+
'aria-label': 'Toggle expandable content',
|
|
25
|
+
className: 'iui-table-row-expander',
|
|
26
|
+
styleType: 'borderless',
|
|
27
|
+
size: 'small',
|
|
28
|
+
onClick: (e) => {
|
|
29
|
+
e.stopPropagation();
|
|
30
|
+
row.toggleRowExpanded();
|
|
31
|
+
},
|
|
32
|
+
disabled: isDisabled?.(props.row.original),
|
|
33
|
+
'aria-expanded': row.isExpanded,
|
|
44
34
|
},
|
|
45
|
-
|
|
35
|
+
React.createElement(SvgChevronRight, null),
|
|
46
36
|
);
|
|
47
37
|
},
|
|
38
|
+
cellRenderer: (props) =>
|
|
39
|
+
React.createElement(DefaultCell, {
|
|
40
|
+
...props,
|
|
41
|
+
isDisabled: (rowData) => !!isDisabled?.(rowData),
|
|
42
|
+
}),
|
|
48
43
|
};
|
|
49
44
|
};
|
|
@@ -44,10 +44,8 @@ export const SelectionColumn = (props = {}) => {
|
|
|
44
44
|
onChange: () => toggleAllRowsSelected(nextToggleState),
|
|
45
45
|
});
|
|
46
46
|
},
|
|
47
|
-
Cell: () =>
|
|
48
|
-
|
|
49
|
-
let { row, selectSubRows = true } = props.cellProps;
|
|
50
|
-
let children = React.createElement(Checkbox, {
|
|
47
|
+
Cell: ({ row, selectSubRows = true }) =>
|
|
48
|
+
React.createElement(Checkbox, {
|
|
51
49
|
...row.getToggleRowSelectedProps(),
|
|
52
50
|
style: {},
|
|
53
51
|
title: '',
|
|
@@ -67,15 +65,11 @@ export const SelectionColumn = (props = {}) => {
|
|
|
67
65
|
);
|
|
68
66
|
else row.toggleRowSelected(!row.isSelected);
|
|
69
67
|
},
|
|
70
|
-
})
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
},
|
|
77
|
-
children,
|
|
78
|
-
);
|
|
79
|
-
},
|
|
68
|
+
}),
|
|
69
|
+
cellRenderer: (props) =>
|
|
70
|
+
React.createElement(DefaultCell, {
|
|
71
|
+
...props,
|
|
72
|
+
isDisabled: (rowData) => !!isDisabled?.(rowData),
|
|
73
|
+
}),
|
|
80
74
|
};
|
|
81
75
|
};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { ExpanderColumn, EXPANDER_CELL_ID } from '../columns/index.js';
|
|
3
|
-
import { DefaultCell } from '../cells/DefaultCell.js';
|
|
4
3
|
export const useExpanderCell =
|
|
5
4
|
(subComponent, expanderCell, isRowDisabled) => (hooks) => {
|
|
6
5
|
if (!subComponent) return;
|
|
@@ -14,17 +13,14 @@ export const useExpanderCell =
|
|
|
14
13
|
return [
|
|
15
14
|
{
|
|
16
15
|
...expanderColumn,
|
|
17
|
-
|
|
18
|
-
? (
|
|
16
|
+
Cell: expanderCell
|
|
17
|
+
? (cellProps) =>
|
|
19
18
|
React.createElement(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
isDisabled: (rowData) => !!isRowDisabled?.(rowData),
|
|
24
|
-
},
|
|
25
|
-
expanderCell(props.cellProps),
|
|
19
|
+
React.Fragment,
|
|
20
|
+
null,
|
|
21
|
+
expanderCell(cellProps),
|
|
26
22
|
)
|
|
27
|
-
: expanderColumn.
|
|
23
|
+
: expanderColumn.Cell,
|
|
28
24
|
},
|
|
29
25
|
...columns,
|
|
30
26
|
];
|
package/DEV-esm/styles.js
CHANGED
|
@@ -15,10 +15,6 @@ type AvatarProps = {
|
|
|
15
15
|
* Status/Availability of a user.
|
|
16
16
|
*/
|
|
17
17
|
status?: AvatarStatus;
|
|
18
|
-
/**
|
|
19
|
-
* Text which will appear when hovering over the icon.
|
|
20
|
-
*/
|
|
21
|
-
title?: string;
|
|
22
18
|
/**
|
|
23
19
|
* Abbreviation to be displayed.
|
|
24
20
|
*/
|
|
@@ -41,16 +37,16 @@ export declare const defaultStatusTitles: StatusTitles;
|
|
|
41
37
|
* Basic avatar component
|
|
42
38
|
* @example
|
|
43
39
|
* <caption>Small icon with abbreviation</caption>
|
|
44
|
-
* <Avatar size='small'
|
|
40
|
+
* <Avatar size='small' abbreviation='TR' backgroundColor='green'/>
|
|
45
41
|
* @example
|
|
46
42
|
* <caption>Medium icon with image</caption>
|
|
47
|
-
* <Avatar size='medium'
|
|
43
|
+
* <Avatar size='medium' abbreviation='TR' backgroundColor='green' image={<img src="https://cdn.example.com/user/profile/pic.png" />}/>
|
|
48
44
|
* @example
|
|
49
45
|
* <caption>Large icon with status</caption>
|
|
50
|
-
* <Avatar size='large'
|
|
46
|
+
* <Avatar size='large' abbreviation='TR' backgroundColor='green' status='online' />
|
|
51
47
|
* @example
|
|
52
48
|
* <caption>X-large icon with image</caption>
|
|
53
|
-
* <Avatar size='x-large'
|
|
49
|
+
* <Avatar size='x-large' abbreviation='TR' backgroundColor='green' image={<img src="https://cdn.example.com/user/profile/pic.png" />}/>
|
|
54
50
|
*/
|
|
55
51
|
export declare const Avatar: PolymorphicForwardRefComponent<"span", AvatarProps>;
|
|
56
52
|
export {};
|
|
@@ -44,7 +44,6 @@ const Avatar = _react.forwardRef((props, ref) => {
|
|
|
44
44
|
abbreviation,
|
|
45
45
|
image,
|
|
46
46
|
backgroundColor,
|
|
47
|
-
title,
|
|
48
47
|
translatedStatusTitles,
|
|
49
48
|
className,
|
|
50
49
|
style,
|
|
@@ -61,7 +60,6 @@ const Avatar = _react.forwardRef((props, ref) => {
|
|
|
61
60
|
className: (0, _classnames.default)('iui-avatar', className),
|
|
62
61
|
'data-iui-size': 'medium' !== size ? size : void 0,
|
|
63
62
|
'data-iui-status': status,
|
|
64
|
-
title: title,
|
|
65
63
|
style: {
|
|
66
64
|
backgroundColor: getBackground(backgroundColor),
|
|
67
65
|
...style,
|
|
@@ -43,17 +43,14 @@ type AvatarGroupProps = {
|
|
|
43
43
|
* <Avatar
|
|
44
44
|
* abbreviation="TR"
|
|
45
45
|
* backgroundColor={getUserColor("Terry Rivers")}
|
|
46
|
-
* title="Terry Rivers"
|
|
47
46
|
* />
|
|
48
47
|
* <Avatar
|
|
49
48
|
* abbreviation="RM"
|
|
50
49
|
* backgroundColor={getUserColor("Robin Mercer")}
|
|
51
|
-
* title="Robin Mercer"
|
|
52
50
|
* />
|
|
53
51
|
* <Avatar
|
|
54
52
|
* abbreviation="JM"
|
|
55
53
|
* backgroundColor={getUserColor("Jean Mullins")}
|
|
56
|
-
* title="Jean Mullins"
|
|
57
54
|
* />
|
|
58
55
|
* </AvatarGroup>
|
|
59
56
|
*/
|
|
@@ -143,17 +143,22 @@ const ListItem = ({ item, isActive }) => {
|
|
|
143
143
|
);
|
|
144
144
|
children = _react.createElement(BreadcrumbsItem, children.props);
|
|
145
145
|
}
|
|
146
|
+
let getProps = _react.useCallback(
|
|
147
|
+
(children) => {
|
|
148
|
+
let defaultAriaCurrent = isActive ? 'location' : void 0;
|
|
149
|
+
return {
|
|
150
|
+
'aria-current': children.props['aria-current'] ?? defaultAriaCurrent,
|
|
151
|
+
};
|
|
152
|
+
},
|
|
153
|
+
[isActive],
|
|
154
|
+
);
|
|
146
155
|
return _react.createElement(
|
|
147
156
|
_index.Box,
|
|
148
157
|
{
|
|
149
158
|
as: 'li',
|
|
150
159
|
className: 'iui-breadcrumbs-item',
|
|
151
160
|
},
|
|
152
|
-
children
|
|
153
|
-
_react.cloneElement(children, {
|
|
154
|
-
'aria-current':
|
|
155
|
-
children.props['aria-current'] ?? isActive ? 'location' : void 0,
|
|
156
|
-
}),
|
|
161
|
+
children ? (0, _index.cloneElementWithRef)(children, getProps) : null,
|
|
157
162
|
);
|
|
158
163
|
};
|
|
159
164
|
const Separator = ({ separator }) =>
|
|
@@ -410,10 +410,12 @@ const ComboBox = _react.forwardRef((props, forwardedRef) => {
|
|
|
410
410
|
return _react.createElement(_SelectTag.SelectTag, {
|
|
411
411
|
key: option.label,
|
|
412
412
|
label: option.label,
|
|
413
|
-
onRemove:
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
413
|
+
onRemove: inputProps?.disabled
|
|
414
|
+
? void 0
|
|
415
|
+
: () => {
|
|
416
|
+
handleOptionSelection(__originalIndex);
|
|
417
|
+
hide();
|
|
418
|
+
},
|
|
417
419
|
});
|
|
418
420
|
})
|
|
419
421
|
.filter(Boolean)
|
|
@@ -238,14 +238,16 @@ const CustomSelect = _react.forwardRef((props, forwardedRef) => {
|
|
|
238
238
|
_react.createElement(_SelectTag.SelectTag, {
|
|
239
239
|
key: option.label,
|
|
240
240
|
label: option.label,
|
|
241
|
-
onRemove:
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
241
|
+
onRemove: disabled
|
|
242
|
+
? void 0
|
|
243
|
+
: () => {
|
|
244
|
+
handleOptionSelection(option, {
|
|
245
|
+
isSelected: true,
|
|
246
|
+
});
|
|
247
|
+
selectRef.current?.focus();
|
|
248
|
+
},
|
|
247
249
|
}),
|
|
248
|
-
[handleOptionSelection],
|
|
250
|
+
[disabled, handleOptionSelection],
|
|
249
251
|
);
|
|
250
252
|
let popover = (0, _Popover.usePopover)({
|
|
251
253
|
visible: isOpen,
|