@elliemae/ds-data-table 2.4.2-rc.12 → 2.4.2-rc.13
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/cjs/addons/Columns/ColumnExpand/ColumnExpand.js +3 -6
- package/cjs/addons/Columns/ColumnSelectMultiple/ColumnSelectMultiple.js +1 -2
- package/cjs/addons/Columns/ColumnSelectSingle/ColumnSelectSingle.js +1 -2
- package/cjs/addons/Editables/ComboboxEditableCell/ComboboxEditableCell.js +3 -4
- package/cjs/addons/Editables/DateEditableCell/DateEditableCell.js +1 -2
- package/cjs/addons/Editables/TextEditableCell/TextEditableCell.js +1 -2
- package/cjs/addons/Filters/Components/CurrencyRangeFilter/index.js +7 -10
- package/cjs/addons/Filters/Components/DateRangeFilter/index.js +0 -1
- package/cjs/addons/Filters/Components/DateSwitcherFilter/index.js +0 -1
- package/cjs/addons/Filters/Components/NumberRangeFilter/index.js +7 -10
- package/cjs/addons/Filters/Components/SelectFilter/BaseSelectFilter.js +0 -1
- package/cjs/addons/Filters/Components/SelectFilter/MultiSelectFilter.js +2 -3
- package/cjs/addons/Filters/Components/SelectFilter/SingleSelectFilter.js +1 -2
- package/cjs/addons/Filters/Components/SelectFilter/useSelectFilterHandlers.js +0 -1
- package/cjs/addons/Filters/Components/SelectFilter/utils.js +4 -9
- package/cjs/addons/Filters/Components/SingleDateFilter/index.js +0 -1
- package/cjs/configs/useDatatableConfig.js +1 -4
- package/cjs/configs/useRowFlattenization.js +6 -8
- package/cjs/configs/useTableColsWithAddons.js +1 -2
- package/cjs/exported-related/EditableCell.js +1 -4
- package/cjs/exported-related/FilterPopover.js +7 -14
- package/cjs/exported-related/Filters/dateRangeFilterFn.js +1 -2
- package/cjs/exported-related/Filters/numberRangeFilterFn.js +1 -1
- package/cjs/exported-related/Filters/singleDateFilterFn.js +0 -1
- package/cjs/exported-related/RowRenderer/DefaultRowContentRenderer.js +5 -8
- package/cjs/exported-related/RowRenderer/index.js +0 -1
- package/cjs/exported-related/RowRenderer/useRowRendererHandlers.js +1 -4
- package/cjs/exported-related/RowRenderer/useRowStyle.js +0 -1
- package/cjs/exported-related/Toolbar/Toolbar.js +0 -1
- package/cjs/exported-related/groupBy.js +0 -1
- package/cjs/helpers/addCellData.js +2 -6
- package/cjs/helpers/cellPadding.js +3 -5
- package/cjs/helpers/columnsToGrid.js +1 -3
- package/cjs/helpers/sizeToCss.js +1 -1
- package/cjs/hooks/useRecoverFocusCol.js +1 -8
- package/cjs/parts/Cells/Cell.js +3 -4
- package/cjs/parts/Cells/useCellStyle.js +2 -2
- package/cjs/parts/DnDHandle.js +2 -3
- package/cjs/parts/DropIndicator.js +8 -2
- package/cjs/parts/FilterBar/FiltersBar.js +5 -8
- package/cjs/parts/FilterBar/components/DateRangePill.js +4 -7
- package/cjs/parts/FilterBar/components/DateSwitcherPill.js +4 -7
- package/cjs/parts/FilterBar/components/MultiSelectPill.js +2 -5
- package/cjs/parts/FilterBar/components/NumberRangePill.js +3 -7
- package/cjs/parts/FilterBar/components/SelectPill.js +1 -3
- package/cjs/parts/FilterBar/components/SingleDatePill.js +1 -4
- package/cjs/parts/Filters/index.js +4 -4
- package/cjs/parts/Headers/HeaderCell.js +10 -13
- package/cjs/parts/Headers/HeaderCellGroup.js +5 -8
- package/cjs/parts/Headers/HeaderCellTitle.js +0 -1
- package/cjs/parts/Headers/HeaderResizer.js +3 -8
- package/cjs/parts/Headers/useHeaderCellConfig.js +1 -1
- package/cjs/parts/Headers/useHeaderCellHandlers.js +2 -4
- package/cjs/parts/HoC/withConditionalDnDColumnContext.js +2 -3
- package/cjs/parts/HoC/withConditionalDnDRowContext.js +1 -2
- package/cjs/parts/Row.js +0 -1
- package/cjs/parts/RowLoading.js +0 -1
- package/cjs/parts/RowVariants/RowVariantHeader.js +0 -1
- package/cjs/parts/RowVariants/index.js +3 -3
- package/cjs/parts/Rows.js +2 -2
- package/cjs/parts/TableContent.js +2 -3
- package/cjs/parts/VirtualRowsList.js +0 -1
- package/cjs/redux/reducers/headersReducers/logic.js +2 -2
- package/cjs/styled.js +50 -20
- package/esm/addons/Columns/ColumnExpand/ColumnExpand.js +3 -6
- package/esm/addons/Columns/ColumnSelectMultiple/ColumnSelectMultiple.js +1 -2
- package/esm/addons/Columns/ColumnSelectSingle/ColumnSelectSingle.js +1 -2
- package/esm/addons/Editables/ComboboxEditableCell/ComboboxEditableCell.js +2 -3
- package/esm/addons/Editables/DateEditableCell/DateEditableCell.js +0 -1
- package/esm/addons/Editables/TextEditableCell/TextEditableCell.js +0 -1
- package/esm/addons/Filters/Components/CurrencyRangeFilter/index.js +7 -10
- package/esm/addons/Filters/Components/DateRangeFilter/index.js +0 -1
- package/esm/addons/Filters/Components/DateSwitcherFilter/index.js +0 -1
- package/esm/addons/Filters/Components/NumberRangeFilter/index.js +7 -10
- package/esm/addons/Filters/Components/SelectFilter/BaseSelectFilter.js +0 -1
- package/esm/addons/Filters/Components/SelectFilter/MultiSelectFilter.js +1 -2
- package/esm/addons/Filters/Components/SelectFilter/SingleSelectFilter.js +0 -1
- package/esm/addons/Filters/Components/SelectFilter/useSelectFilterHandlers.js +0 -1
- package/esm/addons/Filters/Components/SelectFilter/utils.js +4 -9
- package/esm/addons/Filters/Components/SingleDateFilter/index.js +0 -1
- package/esm/configs/useDatatableConfig.js +1 -4
- package/esm/configs/useRowFlattenization.js +6 -8
- package/esm/configs/useTableColsWithAddons.js +4 -5
- package/esm/exported-related/EditableCell.js +1 -4
- package/esm/exported-related/FilterPopover.js +5 -12
- package/esm/exported-related/Filters/dateRangeFilterFn.js +1 -2
- package/esm/exported-related/Filters/numberRangeFilterFn.js +1 -1
- package/esm/exported-related/Filters/singleDateFilterFn.js +0 -1
- package/esm/exported-related/RowRenderer/DefaultRowContentRenderer.js +5 -8
- package/esm/exported-related/RowRenderer/index.js +0 -1
- package/esm/exported-related/RowRenderer/useRowRendererHandlers.js +1 -4
- package/esm/exported-related/RowRenderer/useRowStyle.js +0 -1
- package/esm/exported-related/Toolbar/Toolbar.js +0 -1
- package/esm/exported-related/groupBy.js +0 -1
- package/esm/helpers/addCellData.js +2 -6
- package/esm/helpers/cellPadding.js +3 -5
- package/esm/helpers/columnsToGrid.js +1 -3
- package/esm/helpers/sizeToCss.js +1 -1
- package/esm/hooks/useRecoverFocusCol.js +1 -8
- package/esm/parts/Cells/Cell.js +3 -4
- package/esm/parts/Cells/useCellStyle.js +2 -2
- package/esm/parts/DnDHandle.js +2 -3
- package/esm/parts/DropIndicator.js +8 -2
- package/esm/parts/FilterBar/FiltersBar.js +4 -7
- package/esm/parts/FilterBar/components/DateRangePill.js +4 -7
- package/esm/parts/FilterBar/components/DateSwitcherPill.js +4 -7
- package/esm/parts/FilterBar/components/MultiSelectPill.js +2 -5
- package/esm/parts/FilterBar/components/NumberRangePill.js +3 -7
- package/esm/parts/FilterBar/components/SelectPill.js +1 -3
- package/esm/parts/FilterBar/components/SingleDatePill.js +1 -4
- package/esm/parts/Filters/index.js +6 -6
- package/esm/parts/Headers/HeaderCell.js +10 -13
- package/esm/parts/Headers/HeaderCellGroup.js +5 -8
- package/esm/parts/Headers/HeaderCellTitle.js +0 -1
- package/esm/parts/Headers/HeaderResizer.js +3 -8
- package/esm/parts/Headers/useHeaderCellConfig.js +1 -1
- package/esm/parts/Headers/useHeaderCellHandlers.js +2 -4
- package/esm/parts/HoC/withConditionalDnDColumnContext.js +2 -3
- package/esm/parts/HoC/withConditionalDnDRowContext.js +1 -2
- package/esm/parts/Row.js +0 -1
- package/esm/parts/RowLoading.js +0 -1
- package/esm/parts/RowVariants/RowVariantHeader.js +0 -1
- package/esm/parts/RowVariants/index.js +2 -2
- package/esm/parts/Rows.js +2 -2
- package/esm/parts/TableContent.js +0 -1
- package/esm/parts/VirtualRowsList.js +0 -1
- package/esm/redux/reducers/headersReducers/logic.js +2 -2
- package/esm/styled.js +50 -20
- package/package.json +19 -19
|
@@ -12,7 +12,6 @@ var _jsx = require('@babel/runtime/helpers/jsx');
|
|
|
12
12
|
var React = require('react');
|
|
13
13
|
var index = require('../../addons/Columns/index.js');
|
|
14
14
|
var constants = require('../../configs/constants.js');
|
|
15
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
16
15
|
require('core-js/modules/esnext.async-iterator.reduce.js');
|
|
17
16
|
require('core-js/modules/esnext.iterator.reduce.js');
|
|
18
17
|
require('react-virtual');
|
|
@@ -47,7 +46,7 @@ _jsx__default["default"]("div", {
|
|
|
47
46
|
onKeyDown: e => e.stopPropagation()
|
|
48
47
|
}, void 0, props.children);
|
|
49
48
|
|
|
50
|
-
const ariaLabelMessage = (row, selected) =>
|
|
49
|
+
const ariaLabelMessage = (row, selected) => `Row number ${row.realIndex + 1}${row.parentIndex !== null ? `, child of row number ${row.parentIndex + 1}` : ''}. ${selected ? 'Selected. ' : ''}To interact with the cells press enter`;
|
|
51
50
|
|
|
52
51
|
const DefaultRowContentRenderer = props => {
|
|
53
52
|
const {
|
|
@@ -79,9 +78,7 @@ const DefaultRowContentRenderer = props => {
|
|
|
79
78
|
const isDragging = draggableProps && draggableProps.isDragging;
|
|
80
79
|
React.useLayoutEffect(() => {
|
|
81
80
|
if (row.uid === focusedRowId) {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
(_rowRef$current = rowRef.current) === null || _rowRef$current === void 0 ? void 0 : _rowRef$current.focus();
|
|
81
|
+
rowRef.current?.focus();
|
|
85
82
|
}
|
|
86
83
|
}, [focusedRowId, row.uid]);
|
|
87
84
|
const gridTemplateColProps = React.useMemo(() => ({
|
|
@@ -111,9 +108,9 @@ const DefaultRowContentRenderer = props => {
|
|
|
111
108
|
tabIndex: 0,
|
|
112
109
|
role: "row",
|
|
113
110
|
"aria-rowindex": row.realIndex + 1,
|
|
114
|
-
"aria-label": ariaLabelMessage(row,
|
|
111
|
+
"aria-label": ariaLabelMessage(row, selection?.[row.uid] === true),
|
|
115
112
|
"aria-level": row.depth + 1,
|
|
116
|
-
"aria-selected":
|
|
113
|
+
"aria-selected": selection?.[row.uid] === true,
|
|
117
114
|
"aria-expanded": isExpandable ? expandedRows[row.uid] === true : undefined,
|
|
118
115
|
"aria-disabled": disabledRows[row.uid]
|
|
119
116
|
}, gridTemplateColProps), {}, {
|
|
@@ -124,7 +121,7 @@ const DefaultRowContentRenderer = props => {
|
|
|
124
121
|
shouldDisplayHover: !isDndActive && !isDragging && !isDragOverlay,
|
|
125
122
|
isDragOverlay: isDragOverlay,
|
|
126
123
|
isDragging: isDragging,
|
|
127
|
-
selected: noSelectionColumn &&
|
|
124
|
+
selected: noSelectionColumn && selection?.[row.uid] === true,
|
|
128
125
|
disabled: disabledRows[row.uid],
|
|
129
126
|
"data-testid": constants.DATA_TESTID.DATA_TABLE_ROW_CONTENT,
|
|
130
127
|
children: /*#__PURE__*/_jsx__default["default"](index$1, {
|
|
@@ -16,7 +16,6 @@ var useRowRendererProperties = require('./useRowRendererProperties.js');
|
|
|
16
16
|
var DropIndicator = require('../../parts/DropIndicator.js');
|
|
17
17
|
var SortableItemContext = require('../../parts/HoC/SortableItemContext.js');
|
|
18
18
|
var constants = require('../../configs/constants.js');
|
|
19
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
20
19
|
require('core-js/modules/esnext.async-iterator.reduce.js');
|
|
21
20
|
require('core-js/modules/esnext.iterator.reduce.js');
|
|
22
21
|
require('react-virtual');
|
|
@@ -9,7 +9,6 @@ var React = require('react');
|
|
|
9
9
|
var constants = require('../../configs/constants.js');
|
|
10
10
|
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
11
11
|
require('core-js/modules/esnext.iterator.filter.js');
|
|
12
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
13
12
|
require('core-js/modules/esnext.async-iterator.reduce.js');
|
|
14
13
|
require('core-js/modules/esnext.iterator.reduce.js');
|
|
15
14
|
require('react-virtual');
|
|
@@ -112,9 +111,7 @@ const useRowRendererHandlers = _ref => {
|
|
|
112
111
|
}
|
|
113
112
|
}, [isDragOverlay, isActive, selectedRowId, row, setSelectedRowId, handleItemClick, itemIndex, items, setFocusedRowId]);
|
|
114
113
|
const handleOnBlur = React.useCallback(e => {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
if (((_e$relatedTarget = e.relatedTarget) === null || _e$relatedTarget === void 0 ? void 0 : _e$relatedTarget.getAttribute('data-testid')) === 'data-table-row-content') {
|
|
114
|
+
if (e.relatedTarget?.getAttribute('data-testid') === 'data-table-row-content') {
|
|
118
115
|
setSelectedRowId(null);
|
|
119
116
|
}
|
|
120
117
|
}, [setSelectedRowId]);
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
6
5
|
var React = require('react');
|
|
7
6
|
var DataTableContext = require('../../DataTableContext.js');
|
|
8
7
|
var SortableItemContext = require('../../parts/HoC/SortableItemContext.js');
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
6
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
7
6
|
var React = require('react');
|
|
8
7
|
var styled = require('styled-components');
|
|
9
8
|
var DSButton = require('@elliemae/ds-button');
|
|
@@ -7,7 +7,6 @@ require('core-js/modules/esnext.iterator.constructor.js');
|
|
|
7
7
|
require('core-js/modules/esnext.iterator.for-each.js');
|
|
8
8
|
require('core-js/modules/esnext.async-iterator.map.js');
|
|
9
9
|
require('core-js/modules/esnext.iterator.map.js');
|
|
10
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
11
10
|
var uid = require('uid');
|
|
12
11
|
|
|
13
12
|
const groupBy = (data, headerKey) => {
|
|
@@ -18,11 +18,7 @@ const BasicCell = /*#__PURE__*/React__default["default"].memo(_ref => {
|
|
|
18
18
|
return cell.value;
|
|
19
19
|
});
|
|
20
20
|
|
|
21
|
-
const getCellValue = (row, accessor) =>
|
|
22
|
-
var _row$original$accesso;
|
|
23
|
-
|
|
24
|
-
return (_row$original$accesso = row.original[accessor]) !== null && _row$original$accesso !== void 0 ? _row$original$accesso : null;
|
|
25
|
-
};
|
|
21
|
+
const getCellValue = (row, accessor) => row.original[accessor] ?? null;
|
|
26
22
|
|
|
27
23
|
const addColumnData = (datum, column) => {
|
|
28
24
|
datum.cells.push({
|
|
@@ -31,7 +27,7 @@ const addColumnData = (datum, column) => {
|
|
|
31
27
|
render: column.Cell || BasicCell,
|
|
32
28
|
row: datum,
|
|
33
29
|
ref: /*#__PURE__*/React__default["default"].createRef(),
|
|
34
|
-
id:
|
|
30
|
+
id: `${datum.uid}__${column.id}`
|
|
35
31
|
});
|
|
36
32
|
};
|
|
37
33
|
|
|
@@ -5,13 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
5
5
|
var sizeToCss = require('./sizeToCss.js');
|
|
6
6
|
|
|
7
7
|
const cellPadding = _ref => {
|
|
8
|
-
var _sizeToCss;
|
|
9
|
-
|
|
10
8
|
let {
|
|
11
9
|
theme,
|
|
12
10
|
column
|
|
13
11
|
} = _ref;
|
|
14
|
-
return
|
|
12
|
+
return `padding: 0 ${sizeToCss.sizeToCss(column.padding) ?? theme.space.xxs};`;
|
|
15
13
|
};
|
|
16
14
|
const columnPadding = _ref2 => {
|
|
17
15
|
let {
|
|
@@ -20,9 +18,9 @@ const columnPadding = _ref2 => {
|
|
|
20
18
|
shouldShowDnD
|
|
21
19
|
} = _ref2;
|
|
22
20
|
// Internal columns
|
|
23
|
-
if (column.padding !== undefined) return
|
|
21
|
+
if (column.padding !== undefined) return `padding: 0 ${sizeToCss.sizeToCss(column.padding)};`; // Default user columns
|
|
24
22
|
|
|
25
|
-
return
|
|
23
|
+
return `padding: 0 ${theme.space.xxxs} 0 ${shouldShowDnD ? '2px' : theme.space.xxs};`;
|
|
26
24
|
};
|
|
27
25
|
|
|
28
26
|
exports.cellPadding = cellPadding;
|
|
@@ -9,9 +9,7 @@ var constants = require('../configs/constants.js');
|
|
|
9
9
|
var sizeToCss = require('./sizeToCss.js');
|
|
10
10
|
|
|
11
11
|
const columnsToGridImpl = (c, grid, colsLayoutStyle) => {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
if ('columns' in c) c.columns.forEach(col => columnsToGridImpl(col, grid, colsLayoutStyle));else grid.push(sizeToCss.sizeToCss((_c$width = c.width) !== null && _c$width !== void 0 ? _c$width : colsLayoutStyle === constants.ColsLayoutStyle.Auto ? '1fr' : 150));
|
|
12
|
+
if ('columns' in c) c.columns.forEach(col => columnsToGridImpl(col, grid, colsLayoutStyle));else grid.push(sizeToCss.sizeToCss(c.width ?? (colsLayoutStyle === constants.ColsLayoutStyle.Auto ? '1fr' : 150)));
|
|
15
13
|
};
|
|
16
14
|
|
|
17
15
|
const columnsToGrid = (columns, colsLayoutStyle) => {
|
package/cjs/helpers/sizeToCss.js
CHANGED
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
const sizeToCss = size => typeof size === 'number' && !Number.isNaN(size) ?
|
|
5
|
+
const sizeToCss = size => typeof size === 'number' && !Number.isNaN(size) ? `${size}px` : size;
|
|
6
6
|
|
|
7
7
|
exports.sizeToCss = sizeToCss;
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
6
5
|
var React = require('react');
|
|
7
6
|
|
|
8
7
|
// so we just keep track of it and focus it if necessary
|
|
@@ -11,13 +10,7 @@ const useRecoverFocusCol = (condition, ref) => {
|
|
|
11
10
|
const [prevCondition, setPrevCondition] = React.useState(condition);
|
|
12
11
|
React.useEffect(() => {
|
|
13
12
|
if (prevCondition && !condition) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
if (ref.current) (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.focus();else setTimeout(() => {
|
|
17
|
-
var _ref$current2;
|
|
18
|
-
|
|
19
|
-
return (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.focus();
|
|
20
|
-
});
|
|
13
|
+
if (ref.current) ref.current?.focus();else setTimeout(() => ref.current?.focus());
|
|
21
14
|
}
|
|
22
15
|
|
|
23
16
|
setPrevCondition(condition);
|
package/cjs/parts/Cells/Cell.js
CHANGED
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
4
|
-
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
5
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
6
3
|
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
7
4
|
require('core-js/modules/esnext.iterator.constructor.js');
|
|
8
5
|
require('core-js/modules/esnext.iterator.filter.js');
|
|
9
6
|
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
10
7
|
require('core-js/modules/esnext.iterator.for-each.js');
|
|
8
|
+
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
9
|
+
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
11
10
|
var React = require('react');
|
|
12
11
|
var dsTruncatedTooltipText = require('@elliemae/ds-truncated-tooltip-text');
|
|
13
12
|
var Grid = require('@elliemae/ds-grid');
|
|
@@ -109,7 +108,7 @@ const Cell = _ref2 => {
|
|
|
109
108
|
if (typeof column.editable === 'string') {
|
|
110
109
|
const {
|
|
111
110
|
EditableComponent
|
|
112
|
-
} = index.outOfTheBoxEditables
|
|
111
|
+
} = index.outOfTheBoxEditables?.[column.editable];
|
|
113
112
|
if (EditableComponent) return /*#__PURE__*/jsxRuntime.jsx(EditableComponent, _objectSpread(_objectSpread({}, cellProps), {}, {
|
|
114
113
|
DefaultCellRender: DefaultCellContentJSX
|
|
115
114
|
}));
|
|
@@ -31,8 +31,8 @@ const useCellStyle = (column, shouldAddExpandCell) => {
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
if (shouldAddExpandCell) {
|
|
34
|
-
newStyle.gridColumn =
|
|
35
|
-
newStyle.padding =
|
|
34
|
+
newStyle.gridColumn = `span 2`;
|
|
35
|
+
newStyle.padding = `0 16px 0 2px`;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
return newStyle;
|
package/cjs/parts/DnDHandle.js
CHANGED
|
@@ -12,7 +12,6 @@ var dsIcons = require('@elliemae/ds-icons');
|
|
|
12
12
|
var styled = require('styled-components');
|
|
13
13
|
var SortableItemContext = require('./HoC/SortableItemContext.js');
|
|
14
14
|
var constants = require('../configs/constants.js');
|
|
15
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
16
15
|
require('core-js/modules/esnext.async-iterator.reduce.js');
|
|
17
16
|
require('core-js/modules/esnext.iterator.reduce.js');
|
|
18
17
|
require('react-virtual');
|
|
@@ -70,8 +69,8 @@ const DragHandle = _ref2 => {
|
|
|
70
69
|
ref: innerRef,
|
|
71
70
|
tabIndex: isReachable ? 0 : -1,
|
|
72
71
|
"data-testid": constants.DATA_TESTID.DATA_TABLE_DRAG_HANDLE,
|
|
73
|
-
id:
|
|
74
|
-
key:
|
|
72
|
+
id: `${id}-drag-handle`,
|
|
73
|
+
key: `${id}-drag-handle`
|
|
75
74
|
}), /*#__PURE__*/_jsx__default["default"](dsIcons.GripperVertical, {
|
|
76
75
|
size: "s",
|
|
77
76
|
color: isDragging ? ['neutral', '500'] : ['brand-primary', '800']
|
|
@@ -21,10 +21,16 @@ const getPositionStyles = _ref => {
|
|
|
21
21
|
} = _ref;
|
|
22
22
|
|
|
23
23
|
if (vertical) {
|
|
24
|
-
return
|
|
24
|
+
return `
|
|
25
|
+
left: ${dropIndicatorPosition === SortableItemContext.DropIndicatorPosition.Before ? '0' : 'unset'};
|
|
26
|
+
right: ${dropIndicatorPosition === SortableItemContext.DropIndicatorPosition.After ? '0' : 'unset'};
|
|
27
|
+
`;
|
|
25
28
|
}
|
|
26
29
|
|
|
27
|
-
return
|
|
30
|
+
return `
|
|
31
|
+
top: ${dropIndicatorPosition === SortableItemContext.DropIndicatorPosition.Before ? '0' : 'unset'};
|
|
32
|
+
bottom: ${dropIndicatorPosition === SortableItemContext.DropIndicatorPosition.After ? '0' : 'unset'};
|
|
33
|
+
`;
|
|
28
34
|
};
|
|
29
35
|
|
|
30
36
|
const getCircleStyles = _ref2 => {
|
|
@@ -8,15 +8,14 @@ require('core-js/modules/esnext.iterator.map.js');
|
|
|
8
8
|
require('core-js/modules/esnext.async-iterator.find.js');
|
|
9
9
|
require('core-js/modules/esnext.iterator.constructor.js');
|
|
10
10
|
require('core-js/modules/esnext.iterator.find.js');
|
|
11
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
12
11
|
var React = require('react');
|
|
13
12
|
var DSButton = require('@elliemae/ds-button');
|
|
14
13
|
var dsIcons = require('@elliemae/ds-icons');
|
|
15
|
-
require('@babel/runtime/helpers/defineProperty');
|
|
16
14
|
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
17
15
|
require('core-js/modules/esnext.iterator.filter.js');
|
|
18
16
|
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
19
17
|
require('core-js/modules/esnext.iterator.for-each.js');
|
|
18
|
+
require('@babel/runtime/helpers/defineProperty');
|
|
20
19
|
require('@elliemae/ds-popperjs');
|
|
21
20
|
require('styled-components');
|
|
22
21
|
require('../../redux/reducers/index.js');
|
|
@@ -94,14 +93,12 @@ const FiltersBar = () => {
|
|
|
94
93
|
"aria-relevant": "additions removals",
|
|
95
94
|
gutter: "xs"
|
|
96
95
|
}, void 0, filters.map((_ref, index) => {
|
|
97
|
-
var _visibleColumns$find, _pillGroupRefs;
|
|
98
|
-
|
|
99
96
|
let {
|
|
100
97
|
id: column,
|
|
101
98
|
type,
|
|
102
99
|
value
|
|
103
100
|
} = _ref;
|
|
104
|
-
const columnHeader =
|
|
101
|
+
const columnHeader = visibleColumns.find(col => col.accessor === column)?.Header;
|
|
105
102
|
|
|
106
103
|
let Component = () => null;
|
|
107
104
|
|
|
@@ -109,7 +106,7 @@ const FiltersBar = () => {
|
|
|
109
106
|
|
|
110
107
|
if (filterType in pillRenderMapper) {
|
|
111
108
|
Component = pillRenderMapper[filterType];
|
|
112
|
-
} else if (filterBarProps
|
|
109
|
+
} else if (filterBarProps?.customPillRenderer) {
|
|
113
110
|
Component = filterBarProps.customPillRenderer;
|
|
114
111
|
}
|
|
115
112
|
|
|
@@ -121,7 +118,7 @@ const FiltersBar = () => {
|
|
|
121
118
|
onFiltersChange: onFiltersChange,
|
|
122
119
|
prevRef: pillGroupRefs[index - 1],
|
|
123
120
|
innerRef: pillGroupRefs[index],
|
|
124
|
-
nextRef:
|
|
121
|
+
nextRef: pillGroupRefs[index + 1] ?? dropdownMenuRef
|
|
125
122
|
}, column);
|
|
126
123
|
}), /*#__PURE__*/_jsx__default["default"](styled.StyledDropdownMenu, {
|
|
127
124
|
preventOverflow: "scrollParent",
|
|
@@ -129,7 +126,7 @@ const FiltersBar = () => {
|
|
|
129
126
|
id: '__internal__option__clear__filters',
|
|
130
127
|
label: 'Clear Filters',
|
|
131
128
|
onClick: removeAllFilters
|
|
132
|
-
}, ...(
|
|
129
|
+
}, ...(filterBarProps?.extraOptions || [])],
|
|
133
130
|
triggerComponent: /*#__PURE__*/_jsx__default["default"](DSButton__default["default"], {
|
|
134
131
|
containerProps: {
|
|
135
132
|
'data-testid': constants.DATA_TESTID.DATA_TABLE_FILTER_BAR_DD_MENU_BUTTON
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
6
|
-
require('core-js/modules/es.string.replace.js');
|
|
7
6
|
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
8
7
|
require('core-js/modules/esnext.iterator.constructor.js');
|
|
9
8
|
require('core-js/modules/esnext.iterator.filter.js');
|
|
@@ -14,7 +13,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
14
13
|
|
|
15
14
|
var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
|
|
16
15
|
|
|
17
|
-
const format = value => value
|
|
16
|
+
const format = value => value?.replace(/-/g, '/');
|
|
18
17
|
|
|
19
18
|
const DateRangePill = _ref => {
|
|
20
19
|
let {
|
|
@@ -28,17 +27,15 @@ const DateRangePill = _ref => {
|
|
|
28
27
|
nextRef
|
|
29
28
|
} = _ref;
|
|
30
29
|
const handleOnRemove = React.useCallback(() => {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (prevRef !== null && prevRef !== void 0 && prevRef.current) prevRef.current.focus();else (_nextRef$current = nextRef.current) === null || _nextRef$current === void 0 ? void 0 : _nextRef$current.focus();
|
|
30
|
+
if (prevRef?.current) prevRef.current.focus();else nextRef.current?.focus();
|
|
34
31
|
onFiltersChange(filters.filter(filter => filter.id !== column));
|
|
35
32
|
}, [onFiltersChange, filters, prevRef, nextRef, column]);
|
|
36
|
-
return value
|
|
33
|
+
return value?.startDate && value?.endDate ? /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {}, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
37
34
|
type: "label",
|
|
38
35
|
label: columnHeader
|
|
39
36
|
}), /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
40
37
|
type: "removable",
|
|
41
|
-
label:
|
|
38
|
+
label: `${format(value.startDate)} - ${format(value.endDate)}`,
|
|
42
39
|
onRemove: handleOnRemove,
|
|
43
40
|
innerRef: innerRef
|
|
44
41
|
})) : null;
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
6
|
-
require('core-js/modules/es.string.replace.js');
|
|
7
6
|
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
8
7
|
require('core-js/modules/esnext.iterator.constructor.js');
|
|
9
8
|
require('core-js/modules/esnext.iterator.filter.js');
|
|
@@ -14,7 +13,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
14
13
|
|
|
15
14
|
var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
|
|
16
15
|
|
|
17
|
-
const format = value => value
|
|
16
|
+
const format = value => value?.replace(/-/g, '/');
|
|
18
17
|
|
|
19
18
|
const DateSwitcherPill = _ref => {
|
|
20
19
|
let {
|
|
@@ -28,17 +27,15 @@ const DateSwitcherPill = _ref => {
|
|
|
28
27
|
nextRef
|
|
29
28
|
} = _ref;
|
|
30
29
|
const handleOnRemove = React.useCallback(() => {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (prevRef !== null && prevRef !== void 0 && prevRef.current) prevRef.current.focus();else (_nextRef$current = nextRef.current) === null || _nextRef$current === void 0 ? void 0 : _nextRef$current.focus();
|
|
30
|
+
if (prevRef?.current) prevRef.current.focus();else nextRef.current?.focus();
|
|
34
31
|
onFiltersChange(filters.filter(filter => filter.id !== column));
|
|
35
32
|
}, [onFiltersChange, filters, prevRef, nextRef, column]);
|
|
36
|
-
return value
|
|
33
|
+
return value?.startDate && value?.endDate ? /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {}, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
37
34
|
type: "label",
|
|
38
35
|
label: columnHeader
|
|
39
36
|
}), /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
40
37
|
type: "removable",
|
|
41
|
-
label: value.isDateRange ?
|
|
38
|
+
label: value.isDateRange ? `${format(value.startDate)} - ${format(value.endDate)}` : format(value.startDate),
|
|
42
39
|
onRemove: handleOnRemove,
|
|
43
40
|
innerRef: innerRef
|
|
44
41
|
})) : null;
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
6
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
7
6
|
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
8
7
|
require('core-js/modules/esnext.iterator.constructor.js');
|
|
9
8
|
require('core-js/modules/esnext.iterator.filter.js');
|
|
@@ -34,15 +33,13 @@ const MultiSelectPill = _ref => {
|
|
|
34
33
|
newFilters[filterIndex].value = multiSelectedValue.filter(val => val.dsId !== valToRemove.dsId);
|
|
35
34
|
|
|
36
35
|
if (newFilters[filterIndex].value.length === 0) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
if (prevRef !== null && prevRef !== void 0 && prevRef.current) prevRef.current.focus();else (_nextRef$current = nextRef.current) === null || _nextRef$current === void 0 ? void 0 : _nextRef$current.focus();
|
|
36
|
+
if (prevRef?.current) prevRef.current.focus();else nextRef.current?.focus();
|
|
40
37
|
newFilters.splice(filterIndex, 1);
|
|
41
38
|
}
|
|
42
39
|
|
|
43
40
|
onFiltersChange(newFilters);
|
|
44
41
|
}, [filters, multiSelectedValue, onFiltersChange, column, prevRef, nextRef]);
|
|
45
|
-
return multiSelectedValue
|
|
42
|
+
return multiSelectedValue?.length ? /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {}, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
46
43
|
type: "label",
|
|
47
44
|
label: columnHeader
|
|
48
45
|
}), multiSelectedValue.map((val, index) => /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
@@ -14,8 +14,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
14
14
|
var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
|
|
15
15
|
|
|
16
16
|
const NumberRangePill = _ref => {
|
|
17
|
-
var _value$from, _value$to;
|
|
18
|
-
|
|
19
17
|
let {
|
|
20
18
|
columnHeader,
|
|
21
19
|
column,
|
|
@@ -27,17 +25,15 @@ const NumberRangePill = _ref => {
|
|
|
27
25
|
nextRef
|
|
28
26
|
} = _ref;
|
|
29
27
|
const handleOnRemove = React.useCallback(() => {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
if (prevRef !== null && prevRef !== void 0 && prevRef.current) prevRef.current.focus();else (_nextRef$current = nextRef.current) === null || _nextRef$current === void 0 ? void 0 : _nextRef$current.focus();
|
|
28
|
+
if (prevRef?.current) prevRef.current.focus();else nextRef.current?.focus();
|
|
33
29
|
onFiltersChange(filters.filter(filter => filter.id !== column));
|
|
34
30
|
}, [onFiltersChange, filters, column, prevRef, nextRef]);
|
|
35
|
-
return (
|
|
31
|
+
return (value?.from ?? '') !== '' && (value?.to ?? '') !== '' ? /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {}, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
36
32
|
type: "label",
|
|
37
33
|
label: columnHeader
|
|
38
34
|
}), /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
39
35
|
type: "removable",
|
|
40
|
-
label:
|
|
36
|
+
label: `${value.from} - ${value.to}`,
|
|
41
37
|
onRemove: handleOnRemove,
|
|
42
38
|
innerRef: innerRef
|
|
43
39
|
})) : null;
|
|
@@ -25,9 +25,7 @@ const SelectPill = _ref => {
|
|
|
25
25
|
nextRef
|
|
26
26
|
} = _ref;
|
|
27
27
|
const handleOnRemove = React.useCallback(() => {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
if (prevRef !== null && prevRef !== void 0 && prevRef.current) prevRef.current.focus();else (_nextRef$current = nextRef.current) === null || _nextRef$current === void 0 ? void 0 : _nextRef$current.focus();
|
|
28
|
+
if (prevRef?.current) prevRef.current.focus();else nextRef.current?.focus();
|
|
31
29
|
onFiltersChange(filters.filter(filter => filter.id !== column));
|
|
32
30
|
}, [onFiltersChange, filters, prevRef, nextRef, column]);
|
|
33
31
|
return value ? /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {}, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
@@ -6,7 +6,6 @@ var _jsx = require('@babel/runtime/helpers/jsx');
|
|
|
6
6
|
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
7
7
|
require('core-js/modules/esnext.iterator.constructor.js');
|
|
8
8
|
require('core-js/modules/esnext.iterator.filter.js');
|
|
9
|
-
require('core-js/modules/es.string.replace.js');
|
|
10
9
|
var React = require('react');
|
|
11
10
|
var dsPills = require('@elliemae/ds-pills');
|
|
12
11
|
|
|
@@ -26,9 +25,7 @@ const SingleDatePill = _ref => {
|
|
|
26
25
|
nextRef
|
|
27
26
|
} = _ref;
|
|
28
27
|
const handleOnRemove = React.useCallback(() => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
if (prevRef !== null && prevRef !== void 0 && prevRef.current) prevRef.current.focus();else (_nextRef$current = nextRef.current) === null || _nextRef$current === void 0 ? void 0 : _nextRef$current.focus();
|
|
28
|
+
if (prevRef?.current) prevRef.current.focus();else nextRef.current?.focus();
|
|
32
29
|
onFiltersChange(filters.filter(filter => filter.id !== column));
|
|
33
30
|
}, [onFiltersChange, filters, prevRef, nextRef, column]);
|
|
34
31
|
return value ? /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {}, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
|
|
@@ -8,7 +8,7 @@ require('core-js/modules/esnext.iterator.constructor.js');
|
|
|
8
8
|
require('core-js/modules/esnext.iterator.find.js');
|
|
9
9
|
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
10
10
|
require('core-js/modules/esnext.iterator.filter.js');
|
|
11
|
-
require('core-js/modules/
|
|
11
|
+
require('core-js/modules/es.error.cause.js');
|
|
12
12
|
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
13
13
|
require('core-js/modules/esnext.iterator.for-each.js');
|
|
14
14
|
var React = require('react');
|
|
@@ -100,7 +100,7 @@ const FilterMapItem = props => {
|
|
|
100
100
|
}, [column.id, filters, onFiltersChange]);
|
|
101
101
|
|
|
102
102
|
const filterProps = _objectSpread(_objectSpread({}, props), {}, {
|
|
103
|
-
filterValue: filterValue
|
|
103
|
+
filterValue: filterValue?.value,
|
|
104
104
|
onValueChange,
|
|
105
105
|
patchHeader,
|
|
106
106
|
patchHeaderFilterButtonAndMenu
|
|
@@ -108,7 +108,7 @@ const FilterMapItem = props => {
|
|
|
108
108
|
|
|
109
109
|
if (typeof column.filter === 'string') {
|
|
110
110
|
if (!(column.filter in FilterMapper)) {
|
|
111
|
-
throw new Error(
|
|
111
|
+
throw new Error(`column.filter must be a supported out-of-the-box filter in ${column}`);
|
|
112
112
|
}
|
|
113
113
|
|
|
114
114
|
const FilterComp = FilterMapper[column.filter];
|
|
@@ -117,7 +117,7 @@ const FilterMapItem = props => {
|
|
|
117
117
|
|
|
118
118
|
if (column.Filter) {
|
|
119
119
|
if (typeof column.Filter !== 'function') {
|
|
120
|
-
throw new Error(
|
|
120
|
+
throw new Error(`column.Filter must be a component`);
|
|
121
121
|
}
|
|
122
122
|
|
|
123
123
|
const FilterComp = column.Filter;
|
|
@@ -32,7 +32,6 @@ var useHeaderCellHandlers = require('./useHeaderCellHandlers.js');
|
|
|
32
32
|
var useHeaderCellConfig = require('./useHeaderCellConfig.js');
|
|
33
33
|
var useRecoverFocusCol = require('../../hooks/useRecoverFocusCol.js');
|
|
34
34
|
var constants = require('../../configs/constants.js');
|
|
35
|
-
require('core-js/modules/web.dom-collections.iterator.js');
|
|
36
35
|
require('core-js/modules/esnext.async-iterator.reduce.js');
|
|
37
36
|
require('core-js/modules/esnext.iterator.reduce.js');
|
|
38
37
|
require('react-virtual');
|
|
@@ -60,26 +59,24 @@ const buildScreenReaderInstructions = (colSpan, draggable, filterable, sortable)
|
|
|
60
59
|
let message = sortable ? 'You can sort the data ascendingly/descendingly by this column. Use the up / down arrows keys to do so' : '';
|
|
61
60
|
|
|
62
61
|
if (draggable && filterable) {
|
|
63
|
-
message =
|
|
62
|
+
message = `This column is draggable and filterable. To enable these interactions press the enter key. ${message}`;
|
|
64
63
|
} else if (draggable || filterable) {
|
|
65
|
-
message =
|
|
64
|
+
message = `This column is ${draggable ? 'draggable' : 'filterable'}. To enable this interaction press the enter key. ${message}`;
|
|
66
65
|
}
|
|
67
66
|
|
|
68
|
-
return
|
|
67
|
+
return `${preffix}${message}`;
|
|
69
68
|
};
|
|
70
69
|
|
|
71
70
|
function mapStateToProps(state, ownProps) {
|
|
72
|
-
var _state$headers;
|
|
73
|
-
|
|
74
71
|
return {
|
|
75
|
-
reduxHeader:
|
|
72
|
+
reduxHeader: state.headers?.[ownProps.column.id]
|
|
76
73
|
};
|
|
77
74
|
}
|
|
78
75
|
|
|
79
76
|
const connector = reactRedux.connect(mapStateToProps);
|
|
80
77
|
|
|
81
78
|
const HeaderCellComp = props => {
|
|
82
|
-
var _FilterMapItem
|
|
79
|
+
var _FilterMapItem;
|
|
83
80
|
|
|
84
81
|
const {
|
|
85
82
|
reduxHeader,
|
|
@@ -146,10 +143,10 @@ const HeaderCellComp = props => {
|
|
|
146
143
|
hideFocus: isDragging
|
|
147
144
|
}, void 0, /*#__PURE__*/_jsx__default["default"](DnDHandle, {
|
|
148
145
|
innerRef: dragHandleRef,
|
|
149
|
-
isReachable: reduxHeader
|
|
146
|
+
isReachable: reduxHeader?.withTabStops,
|
|
150
147
|
id: column.id,
|
|
151
148
|
isDragOverlay: isDragOverlay
|
|
152
|
-
}, column.id))), [column.id, isDragOverlay, isDragging, reduxHeader
|
|
149
|
+
}, column.id))), [column.id, isDragOverlay, isDragging, reduxHeader?.withTabStops]);
|
|
153
150
|
const handlers = useHeaderCellHandlers.useHeaderCellHandlers({
|
|
154
151
|
hasFilter,
|
|
155
152
|
patchHeader,
|
|
@@ -166,11 +163,11 @@ const HeaderCellComp = props => {
|
|
|
166
163
|
}, handlers), {}, {
|
|
167
164
|
role: colSpan === 1 ? 'columnheader' : 'group',
|
|
168
165
|
colSpan: colSpan,
|
|
169
|
-
"aria-describedby":
|
|
166
|
+
"aria-describedby": `${column.id}-instructions` // eslint-disable-next-line no-nested-ternary
|
|
170
167
|
,
|
|
171
168
|
"aria-sort": hasSortingCaret ? column.isSortedDesc ? 'descending' : 'ascending' : 'none',
|
|
172
169
|
"data-testid": constants.DATA_TESTID.DATA_TABLE_HEADER,
|
|
173
|
-
isFirstRowGroup: !!
|
|
170
|
+
isFirstRowGroup: !!flattenedData[0]?.original?.dimsumHeaderValue,
|
|
174
171
|
tabIndex: column.isFocuseable === false ? -1 : 0,
|
|
175
172
|
isDragOverlay: isDragOverlay,
|
|
176
173
|
isDraggingActive: draggableProps && draggableProps.active,
|
|
@@ -187,7 +184,7 @@ const HeaderCellComp = props => {
|
|
|
187
184
|
}), rightIcons, isResizeable && column.canResize !== false && /*#__PURE__*/_jsx__default["default"](HeaderResizer.HeaderResizer, {
|
|
188
185
|
column: column
|
|
189
186
|
})), /*#__PURE__*/_jsx__default["default"]("span", {
|
|
190
|
-
id:
|
|
187
|
+
id: `${column.id}-instructions`,
|
|
191
188
|
style: {
|
|
192
189
|
display: 'none'
|
|
193
190
|
},
|