@progress/kendo-react-data-tools 5.4.0-dev.202205271059 → 5.4.0-dev.202206090823
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/dist/cdn/js/kendo-react-data-tools.js +1 -1
- package/dist/es/columnmenu/ColumnMenu.js +11 -7
- package/dist/es/columnmenu/ColumnMenuFilterForm.d.ts +1 -0
- package/dist/es/columnmenu/ColumnMenuItem.js +1 -1
- package/dist/es/columnmenu/ColumnMenuOperators.js +12 -8
- package/dist/es/drag/ColumnDraggable.d.ts +1 -0
- package/dist/es/drag/ColumnDraggable.js +1 -0
- package/dist/es/drag/ColumnResize.d.ts +5 -4
- package/dist/es/drag/ColumnResize.js +3 -0
- package/dist/es/drag/ColumnResizer.js +1 -0
- package/dist/es/drag/CommonDragLogic.d.ts +4 -3
- package/dist/es/drag/CommonDragLogic.js +1 -0
- package/dist/es/drag/DragClue.d.ts +1 -1
- package/dist/es/drag/DropClue.d.ts +1 -1
- package/dist/es/filter/Filter.d.ts +1 -1
- package/dist/es/filter/Filter.js +3 -3
- package/dist/es/filter/Group.js +44 -24
- package/dist/es/filter/filters/BooleanFilter.d.ts +2 -2
- package/dist/es/filter/filters/EnumFilter.d.ts +2 -2
- package/dist/es/filter/filters/TextFilter.d.ts +1 -2
- package/dist/es/filter/operators.js +12 -8
- package/dist/es/filteringCells/BooleanFilter.js +9 -5
- package/dist/es/filteringCells/FilterComponent.js +10 -6
- package/dist/es/header/ColumnProps.d.ts +8 -8
- package/dist/es/header/FilterRow.js +1 -1
- package/dist/es/header/HeaderCell.d.ts +1 -1
- package/dist/es/header/HeaderCell.js +2 -2
- package/dist/es/header/HeaderRow.d.ts +9 -7
- package/dist/es/header/HeaderSelectionCell.d.ts +2 -1
- package/dist/es/header/HeaderSelectionCell.js +2 -2
- package/dist/es/header/HeaderThElement.d.ts +10 -10
- package/dist/es/header/SortSettings.js +9 -5
- package/dist/es/header/utils/index.d.ts +5 -2
- package/dist/es/header/utils/index.js +1 -1
- package/dist/es/navigation/TableKeyboardNavigation.d.ts +7 -7
- package/dist/es/navigation/TableKeyboardNavigation.js +9 -5
- package/dist/es/navigation/TableKeyboardNavigationContext.d.ts +1 -1
- package/dist/es/navigation/constants.js +10 -6
- package/dist/es/navigation/utils.d.ts +14 -14
- package/dist/es/navigation/utils.js +10 -10
- package/dist/es/package-metadata.js +1 -1
- package/dist/es/pager/Pager.d.ts +2 -1
- package/dist/es/pager/Pager.js +18 -1
- package/dist/es/pager/PagerInput.js +2 -2
- package/dist/es/pager/PagerPageSizes.d.ts +1 -1
- package/dist/es/selection/utils.d.ts +3 -3
- package/dist/es/selection/utils.js +11 -7
- package/dist/es/utils/data-operations.js +11 -7
- package/dist/es/utils/group-operations.d.ts +1 -1
- package/dist/es/utils/group-operations.js +1 -1
- package/dist/es/virtualization/columns.js +9 -5
- package/dist/npm/columnmenu/ColumnMenu.js +14 -10
- package/dist/npm/columnmenu/ColumnMenuFilterForm.d.ts +1 -0
- package/dist/npm/columnmenu/ColumnMenuFilterForm.js +1 -1
- package/dist/npm/columnmenu/ColumnMenuFilterLogic.js +1 -1
- package/dist/npm/columnmenu/ColumnMenuFilters.js +2 -2
- package/dist/npm/columnmenu/ColumnMenuItem.js +2 -2
- package/dist/npm/columnmenu/ColumnMenuOperators.js +12 -8
- package/dist/npm/columnmenu/index.js +5 -1
- package/dist/npm/drag/ColumnDraggable.d.ts +1 -0
- package/dist/npm/drag/ColumnDraggable.js +1 -0
- package/dist/npm/drag/ColumnResize.d.ts +5 -4
- package/dist/npm/drag/ColumnResize.js +3 -0
- package/dist/npm/drag/ColumnResizer.js +1 -0
- package/dist/npm/drag/CommonDragLogic.d.ts +4 -3
- package/dist/npm/drag/CommonDragLogic.js +3 -2
- package/dist/npm/drag/DragClue.d.ts +1 -1
- package/dist/npm/drag/DragClue.js +1 -1
- package/dist/npm/drag/DropClue.d.ts +1 -1
- package/dist/npm/drag/DropClue.js +1 -1
- package/dist/npm/filter/Expression.js +6 -6
- package/dist/npm/filter/Filter.d.ts +1 -1
- package/dist/npm/filter/Filter.js +4 -4
- package/dist/npm/filter/Group.js +48 -28
- package/dist/npm/filter/filters/BooleanFilter.d.ts +2 -2
- package/dist/npm/filter/filters/EnumFilter.d.ts +2 -2
- package/dist/npm/filter/filters/EnumFilter.js +2 -2
- package/dist/npm/filter/filters/TextFilter.d.ts +1 -2
- package/dist/npm/filter/filters/index.js +5 -1
- package/dist/npm/filter/index.js +5 -1
- package/dist/npm/filter/operators.js +12 -8
- package/dist/npm/filteringCells/BooleanFilter.js +10 -6
- package/dist/npm/filteringCells/DateFilter.js +1 -1
- package/dist/npm/filteringCells/FilterComponent.js +11 -7
- package/dist/npm/filteringCells/NumericFilter.js +1 -1
- package/dist/npm/filteringCells/TextFilter.js +1 -1
- package/dist/npm/filteringCells/index.js +5 -1
- package/dist/npm/header/ColumnProps.d.ts +8 -8
- package/dist/npm/header/FilterRow.js +3 -3
- package/dist/npm/header/Header.js +1 -1
- package/dist/npm/header/HeaderCell.d.ts +1 -1
- package/dist/npm/header/HeaderCell.js +2 -2
- package/dist/npm/header/HeaderRow.d.ts +9 -7
- package/dist/npm/header/HeaderRow.js +4 -4
- package/dist/npm/header/HeaderSelectionCell.d.ts +2 -1
- package/dist/npm/header/HeaderSelectionCell.js +2 -2
- package/dist/npm/header/HeaderThElement.d.ts +10 -10
- package/dist/npm/header/HeaderThElement.js +1 -1
- package/dist/npm/header/SortSettings.js +9 -5
- package/dist/npm/header/index.js +5 -1
- package/dist/npm/header/utils/index.d.ts +5 -2
- package/dist/npm/header/utils/index.js +1 -1
- package/dist/npm/main.js +5 -1
- package/dist/npm/navigation/TableKeyboardNavigation.d.ts +7 -7
- package/dist/npm/navigation/TableKeyboardNavigation.js +17 -13
- package/dist/npm/navigation/TableKeyboardNavigationContext.d.ts +1 -1
- package/dist/npm/navigation/constants.js +10 -6
- package/dist/npm/navigation/utils.d.ts +14 -14
- package/dist/npm/navigation/utils.js +13 -13
- package/dist/npm/package-metadata.js +1 -1
- package/dist/npm/pager/Pager.d.ts +2 -1
- package/dist/npm/pager/Pager.js +24 -7
- package/dist/npm/pager/PagerInput.js +5 -5
- package/dist/npm/pager/PagerNumericButtons.js +2 -2
- package/dist/npm/pager/PagerPageSizes.d.ts +1 -1
- package/dist/npm/pager/PagerPageSizes.js +2 -2
- package/dist/npm/selection/TableSelection.js +15 -15
- package/dist/npm/selection/utils.d.ts +3 -3
- package/dist/npm/selection/utils.js +21 -17
- package/dist/npm/utils/data-operations.js +14 -10
- package/dist/npm/utils/group-operations.d.ts +1 -1
- package/dist/npm/utils/group-operations.js +4 -4
- package/dist/npm/virtualization/columns.js +9 -5
- package/dist/npm/virtualization/index.js +5 -1
- package/dist/systemjs/kendo-react-data-tools.js +1 -1
- package/package.json +10 -10
|
@@ -6,18 +6,20 @@ import { SortSettings } from './SortSettings';
|
|
|
6
6
|
import { ColumnResize } from '../drag/ColumnResize';
|
|
7
7
|
import { ColumnDraggableProps } from '../drag/ColumnDraggable';
|
|
8
8
|
import { ColumnMenuProps } from '../columnmenu';
|
|
9
|
+
import { CellProps } from './CellProps';
|
|
10
|
+
import { FilterCellProps } from '../filteringCells';
|
|
9
11
|
/**
|
|
10
12
|
* @hidden
|
|
11
13
|
*/
|
|
12
|
-
export interface HeaderRowProps extends ColumnDraggableProps {
|
|
14
|
+
export interface HeaderRowProps<C = CellProps, H = HeaderCellProps, F = FilterCellProps> extends ColumnDraggableProps {
|
|
13
15
|
sortable?: SortSettings;
|
|
14
16
|
sortChange?: (e: React.SyntheticEvent<any>, descriptors: SortDescriptor[], field?: string) => void;
|
|
15
17
|
sort?: SortDescriptor[];
|
|
16
|
-
columns: ExtendedColumnProps[];
|
|
18
|
+
columns: ExtendedColumnProps<C, H, F>[];
|
|
17
19
|
columnsMap: number[][];
|
|
18
20
|
selectionChange: (e: any) => void;
|
|
19
21
|
cellRender?: (defaultRendering: React.ReactNode | null, props: HeaderCellProps) => React.ReactNode;
|
|
20
|
-
columnResize?: ColumnResize
|
|
22
|
+
columnResize?: ColumnResize<C, H, F>;
|
|
21
23
|
columnMenu?: React.ComponentType<ColumnMenuProps>;
|
|
22
24
|
columnMenuFilter?: CompositeFilterDescriptor[];
|
|
23
25
|
columnMenuFilterChange?: (e: React.SyntheticEvent<any>, filter: CompositeFilterDescriptor[], field?: string) => void;
|
|
@@ -25,10 +27,10 @@ export interface HeaderRowProps extends ColumnDraggableProps {
|
|
|
25
27
|
/**
|
|
26
28
|
* @hidden
|
|
27
29
|
*/
|
|
28
|
-
export declare class HeaderRow extends React.Component<HeaderRowProps, {}> {
|
|
29
|
-
cellClick: (e: React.MouseEvent<HTMLSpanElement> | React.KeyboardEvent<HTMLElement>, column: TreeColumnBaseProps) => void;
|
|
30
|
-
cellKeyDown: (event: React.KeyboardEvent<HTMLElement>, column: TreeColumnBaseProps) => void;
|
|
31
|
-
sortIcon(sortIndex: number): JSX.Element[];
|
|
30
|
+
export declare class HeaderRow<C = CellProps, H = HeaderCellProps, F = FilterCellProps> extends React.Component<HeaderRowProps<C, H, F>, {}> {
|
|
31
|
+
cellClick: (e: React.MouseEvent<HTMLSpanElement> | React.KeyboardEvent<HTMLElement>, column: TreeColumnBaseProps<C, H, F>) => void;
|
|
32
|
+
cellKeyDown: (event: React.KeyboardEvent<HTMLElement>, column: TreeColumnBaseProps<C, H, F>) => void;
|
|
33
|
+
sortIcon(sortIndex: number): false | (false | JSX.Element)[] | null;
|
|
32
34
|
render(): JSX.Element[];
|
|
33
35
|
private cells;
|
|
34
36
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
1
2
|
import { HeaderCellProps } from './HeaderCell';
|
|
2
3
|
/**
|
|
3
4
|
* @hidden
|
|
@@ -8,4 +9,4 @@ export interface HeaderSelectionCellProps extends HeaderCellProps {
|
|
|
8
9
|
/**
|
|
9
10
|
* @hidden
|
|
10
11
|
*/
|
|
11
|
-
export declare function HeaderSelectionCell(props: HeaderSelectionCellProps):
|
|
12
|
+
export declare function HeaderSelectionCell(props: HeaderSelectionCellProps): JSX.Element;
|
|
@@ -12,7 +12,7 @@ export function HeaderSelectionCell(props) {
|
|
|
12
12
|
} })),
|
|
13
13
|
(React.createElement("label", { key: 1, className: "k-checkbox-label", htmlFor: props.inputId }))
|
|
14
14
|
];
|
|
15
|
-
return props.render ?
|
|
15
|
+
return (React.createElement(React.Fragment, null, props.render ?
|
|
16
16
|
props.render.call(undefined, defaultRendering, props) :
|
|
17
|
-
defaultRendering;
|
|
17
|
+
defaultRendering));
|
|
18
18
|
}
|
|
@@ -4,20 +4,20 @@
|
|
|
4
4
|
*/
|
|
5
5
|
export declare const HeaderThElement: {
|
|
6
6
|
(props: {
|
|
7
|
-
ariaSort?:
|
|
8
|
-
ariaLabel?: string;
|
|
9
|
-
ariaColumnIndex?: number;
|
|
10
|
-
ariaSelected?: boolean;
|
|
11
|
-
ariaDescription?: string;
|
|
12
|
-
colSpan?: number;
|
|
13
|
-
rowSpan?: number;
|
|
14
|
-
role?: string;
|
|
7
|
+
ariaSort?: "none" | "ascending" | "descending" | undefined;
|
|
8
|
+
ariaLabel?: string | undefined;
|
|
9
|
+
ariaColumnIndex?: number | undefined;
|
|
10
|
+
ariaSelected?: boolean | undefined;
|
|
11
|
+
ariaDescription?: string | undefined;
|
|
12
|
+
colSpan?: number | undefined;
|
|
13
|
+
rowSpan?: number | undefined;
|
|
14
|
+
role?: string | undefined;
|
|
15
15
|
columnId: string;
|
|
16
|
-
className?: string;
|
|
16
|
+
className?: string | undefined;
|
|
17
17
|
style?: any;
|
|
18
18
|
children: any;
|
|
19
19
|
onKeyDown?: any;
|
|
20
|
-
navigatable?: boolean;
|
|
20
|
+
navigatable?: boolean | undefined;
|
|
21
21
|
}): JSX.Element;
|
|
22
22
|
displayName: string;
|
|
23
23
|
};
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
2
|
-
for (var i = 0,
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
2
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
3
|
+
if (ar || !(i in from)) {
|
|
4
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
5
|
+
ar[i] = from[i];
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
5
9
|
};
|
|
6
10
|
/**
|
|
7
11
|
* @hidden
|
|
@@ -11,5 +15,5 @@ export var normalize = function () {
|
|
|
11
15
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
12
16
|
settings[_i] = arguments[_i];
|
|
13
17
|
}
|
|
14
|
-
return Object.assign.apply(Object, __spreadArray([{ allowUnsort: true, mode: 'single' }], settings));
|
|
18
|
+
return Object.assign.apply(Object, __spreadArray([{ allowUnsort: true, mode: 'single' }], settings, false));
|
|
15
19
|
};
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { FilterCellProps } from '../../filteringCells';
|
|
2
|
+
import { CellProps } from '../CellProps';
|
|
1
3
|
import { ExtendedColumnProps, TreeColumnBaseProps } from '../ColumnProps';
|
|
4
|
+
import { HeaderCellProps } from '../HeaderCell';
|
|
2
5
|
/**
|
|
3
6
|
* @hidden
|
|
4
7
|
*/
|
|
@@ -20,10 +23,10 @@ export declare function mapColumns(columns: Array<{
|
|
|
20
23
|
/**
|
|
21
24
|
* @hidden
|
|
22
25
|
*/
|
|
23
|
-
export declare function readColumns(elements: TreeColumnBaseProps[], idInfo: {
|
|
26
|
+
export declare function readColumns<C = CellProps, H = HeaderCellProps, F = FilterCellProps>(elements: TreeColumnBaseProps<C, H, F>[], idInfo: {
|
|
24
27
|
prevId: number;
|
|
25
28
|
idPrefix: string;
|
|
26
|
-
}, depth?: number): ExtendedColumnProps[];
|
|
29
|
+
}, depth?: number): ExtendedColumnProps<C, H, F>[];
|
|
27
30
|
/**
|
|
28
31
|
* @hidden
|
|
29
32
|
*/
|
|
@@ -107,7 +107,7 @@ export function readColumns(elements, idInfo, depth) {
|
|
|
107
107
|
elements.forEach(function (columnProps) {
|
|
108
108
|
var children = readColumns(columnProps.children || [], idInfo, depth + 1);
|
|
109
109
|
columns.push(Object.assign({}, { depth: depth }, ColumnDefaultProps, columnProps, {
|
|
110
|
-
id: columnProps.id ? columnProps.id : generateNavigatableId(""
|
|
110
|
+
id: columnProps.id ? columnProps.id : generateNavigatableId("".concat(idInfo.prevId++), idInfo.idPrefix, 'column'),
|
|
111
111
|
declarationIndex: columns.length,
|
|
112
112
|
children: children,
|
|
113
113
|
rowSpan: 0,
|
|
@@ -13,10 +13,10 @@ export declare const tableKeyboardNavigation: {
|
|
|
13
13
|
navigationStateRef: {
|
|
14
14
|
current?: TableKeyboardNavigationStateType;
|
|
15
15
|
};
|
|
16
|
-
idPrefix?: string;
|
|
16
|
+
idPrefix?: string | undefined;
|
|
17
17
|
}) => void;
|
|
18
18
|
onComponentDidMount: (options: {
|
|
19
|
-
scope?: HTMLElement;
|
|
19
|
+
scope?: HTMLElement | undefined;
|
|
20
20
|
contextStateRef: {
|
|
21
21
|
current?: TableKeyboardNavigationContextType;
|
|
22
22
|
};
|
|
@@ -25,7 +25,7 @@ export declare const tableKeyboardNavigation: {
|
|
|
25
25
|
};
|
|
26
26
|
}) => void;
|
|
27
27
|
onGetSnapshotBeforeUpdate: (options: {
|
|
28
|
-
document?: Document;
|
|
28
|
+
document?: Document | undefined;
|
|
29
29
|
contextStateRef: {
|
|
30
30
|
current?: TableKeyboardNavigationContextType;
|
|
31
31
|
};
|
|
@@ -34,7 +34,7 @@ export declare const tableKeyboardNavigation: {
|
|
|
34
34
|
};
|
|
35
35
|
}) => void;
|
|
36
36
|
onComponentDidUpdate: (options: {
|
|
37
|
-
scope?: HTMLElement;
|
|
37
|
+
scope?: HTMLElement | undefined;
|
|
38
38
|
contextStateRef: {
|
|
39
39
|
current?: TableKeyboardNavigationContextType;
|
|
40
40
|
};
|
|
@@ -54,13 +54,13 @@ export declare const tableKeyboardNavigation: {
|
|
|
54
54
|
navigationStateRef: {
|
|
55
55
|
current?: TableKeyboardNavigationStateType;
|
|
56
56
|
};
|
|
57
|
-
onNavigationAction?: (options: {
|
|
57
|
+
onNavigationAction?: ((options: {
|
|
58
58
|
event: React.KeyboardEvent<HTMLElement>;
|
|
59
59
|
focusElement: any;
|
|
60
|
-
}) => void;
|
|
60
|
+
}) => void) | undefined;
|
|
61
61
|
}) => void;
|
|
62
62
|
generateMatrix: (options: {
|
|
63
|
-
scope?: HTMLElement;
|
|
63
|
+
scope?: HTMLElement | undefined;
|
|
64
64
|
navigationStateRef: {
|
|
65
65
|
current?: TableKeyboardNavigationStateType;
|
|
66
66
|
};
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
2
|
-
for (var i = 0,
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
2
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
3
|
+
if (ar || !(i in from)) {
|
|
4
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
5
|
+
ar[i] = from[i];
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
5
9
|
};
|
|
6
10
|
import { guid, Keys } from '@progress/kendo-react-common';
|
|
7
11
|
import { findId, findNextIdByCellIndex, findNextIdByRowIndex, getBodyElement, getHeaderElement, getNavigatableId, tableKeyboardNavigationTools as navigationTools } from './utils';
|
|
@@ -196,7 +200,7 @@ var generateMatrix = function (options) {
|
|
|
196
200
|
}
|
|
197
201
|
var headerRows = Array.from(thead.children);
|
|
198
202
|
var bodyRows = Array.from(tbody.children);
|
|
199
|
-
__spreadArray(__spreadArray([], headerRows), bodyRows).forEach(function (row, rowIndex) {
|
|
203
|
+
__spreadArray(__spreadArray([], headerRows, true), bodyRows, true).forEach(function (row, rowIndex) {
|
|
200
204
|
Array.from(row.children).forEach(function (cell) {
|
|
201
205
|
var cellId = getNavigatableId(cell);
|
|
202
206
|
if (!cellId) {
|
|
@@ -3,4 +3,4 @@ import { TableKeyboardNavigationContextType } from './TableKeyboardNavigationCon
|
|
|
3
3
|
/**
|
|
4
4
|
* @hidden
|
|
5
5
|
*/
|
|
6
|
-
export declare const TableKeyboardNavigationContext: React.Context<TableKeyboardNavigationContextType>;
|
|
6
|
+
export declare const TableKeyboardNavigationContext: React.Context<TableKeyboardNavigationContextType | undefined>;
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
2
|
-
for (var i = 0,
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
2
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
3
|
+
if (ar || !(i in from)) {
|
|
4
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
5
|
+
ar[i] = from[i];
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
5
9
|
};
|
|
6
10
|
var _a, _b, _c;
|
|
7
11
|
/**
|
|
@@ -50,11 +54,11 @@ var FOCUSABLE_ELEMENTS_BASE = [
|
|
|
50
54
|
/**
|
|
51
55
|
* @hidden
|
|
52
56
|
*/
|
|
53
|
-
export var FOCUSABLE_ELEMENTS = __spreadArray(__spreadArray([], FOCUSABLE_ELEMENTS_BASE), ['[tabindex]']);
|
|
57
|
+
export var FOCUSABLE_ELEMENTS = __spreadArray(__spreadArray([], FOCUSABLE_ELEMENTS_BASE, true), ['[tabindex]'], false);
|
|
54
58
|
/**
|
|
55
59
|
* @hidden
|
|
56
60
|
*/
|
|
57
|
-
export var TABBABLE_ELEMENTS = __spreadArray(__spreadArray([], FOCUSABLE_ELEMENTS_BASE), ['[tabindex]']).map(function (selector) { return selector + ':not([tabindex="-1"])'; });
|
|
61
|
+
export var TABBABLE_ELEMENTS = __spreadArray(__spreadArray([], FOCUSABLE_ELEMENTS_BASE, true), ['[tabindex]'], false).map(function (selector) { return selector + ':not([tabindex="-1"])'; });
|
|
58
62
|
/**
|
|
59
63
|
* @hidden
|
|
60
64
|
*/
|
|
@@ -7,11 +7,11 @@ export declare const generateNavigatableId: (navigationId: string, idPrefix: str
|
|
|
7
7
|
/**
|
|
8
8
|
* @hidden
|
|
9
9
|
*/
|
|
10
|
-
export declare const getNavigatableLevel: (element: Element | null) => number;
|
|
10
|
+
export declare const getNavigatableLevel: (element: Element | null) => number | undefined;
|
|
11
11
|
/**
|
|
12
12
|
* @hidden
|
|
13
13
|
*/
|
|
14
|
-
export declare const getNavigatableId: (element: Element | null) => string;
|
|
14
|
+
export declare const getNavigatableId: (element: Element | null) => string | undefined;
|
|
15
15
|
/**
|
|
16
16
|
* @hidden
|
|
17
17
|
*/
|
|
@@ -25,7 +25,7 @@ export declare const getNavigatableElement: (scope: HTMLElement, options?: {
|
|
|
25
25
|
/**
|
|
26
26
|
* @hidden
|
|
27
27
|
*/
|
|
28
|
-
export declare const getClosestNavigatableElement: (target: HTMLElement) => Element;
|
|
28
|
+
export declare const getClosestNavigatableElement: (target: HTMLElement) => Element | null;
|
|
29
29
|
/**
|
|
30
30
|
* @hidden
|
|
31
31
|
*/
|
|
@@ -33,15 +33,15 @@ export declare const getActiveElement: (scope: HTMLElement, activeId?: string) =
|
|
|
33
33
|
/**
|
|
34
34
|
* @hidden
|
|
35
35
|
*/
|
|
36
|
-
export declare const getClosestScope: (target: HTMLElement) => Element;
|
|
36
|
+
export declare const getClosestScope: (target: HTMLElement) => Element | null;
|
|
37
37
|
/**
|
|
38
38
|
* @hidden
|
|
39
39
|
*/
|
|
40
|
-
export declare const getHeaderElement: (scope: HTMLElement) => Element;
|
|
40
|
+
export declare const getHeaderElement: (scope: HTMLElement) => Element | null;
|
|
41
41
|
/**
|
|
42
42
|
* @hidden
|
|
43
43
|
*/
|
|
44
|
-
export declare const getBodyElement: (scope: HTMLElement) => Element;
|
|
44
|
+
export declare const getBodyElement: (scope: HTMLElement) => Element | null;
|
|
45
45
|
/**
|
|
46
46
|
* @hidden
|
|
47
47
|
*/
|
|
@@ -65,7 +65,7 @@ export declare const filterNavigatableElements: (options?: {
|
|
|
65
65
|
*/
|
|
66
66
|
export declare const focusElement: (options: {
|
|
67
67
|
elementForFocus: HTMLElement;
|
|
68
|
-
prevElement?: HTMLElement;
|
|
68
|
+
prevElement?: HTMLElement | undefined;
|
|
69
69
|
contextStateRef: {
|
|
70
70
|
current?: TableKeyboardNavigationContextType;
|
|
71
71
|
};
|
|
@@ -104,16 +104,16 @@ export declare const getFilterColumnId: (columnId: string) => string;
|
|
|
104
104
|
*/
|
|
105
105
|
export declare const tableKeyboardNavigationTools: {
|
|
106
106
|
generateNavigatableId: (navigationId: string, idPrefix: string, type?: 'column' | 'cell') => string;
|
|
107
|
-
getNavigatableId: (element: Element | null) => string;
|
|
108
|
-
getNavigatableLevel: (element: Element | null) => number;
|
|
107
|
+
getNavigatableId: (element: Element | null) => string | undefined;
|
|
108
|
+
getNavigatableLevel: (element: Element | null) => number | undefined;
|
|
109
109
|
getNavigatableElement: (scope: HTMLElement, options?: {
|
|
110
110
|
level: number;
|
|
111
111
|
}) => HTMLElement;
|
|
112
|
-
getClosestNavigatableElement: (target: HTMLElement) => Element;
|
|
112
|
+
getClosestNavigatableElement: (target: HTMLElement) => Element | null;
|
|
113
113
|
getActiveElement: (scope: HTMLElement, activeId?: string) => HTMLElement;
|
|
114
|
-
getClosestScope: (target: HTMLElement) => Element;
|
|
115
|
-
getHeaderElement: (scope: HTMLElement) => Element;
|
|
116
|
-
getBodyElement: (scope: HTMLElement) => Element;
|
|
114
|
+
getClosestScope: (target: HTMLElement) => Element | null;
|
|
115
|
+
getHeaderElement: (scope: HTMLElement) => Element | null;
|
|
116
|
+
getBodyElement: (scope: HTMLElement) => Element | null;
|
|
117
117
|
getFocusableElements: (scope: HTMLElement, options?: {
|
|
118
118
|
focusable: boolean;
|
|
119
119
|
}) => Element[];
|
|
@@ -125,7 +125,7 @@ export declare const tableKeyboardNavigationTools: {
|
|
|
125
125
|
}) => (element: HTMLElement) => boolean;
|
|
126
126
|
focusElement: (options: {
|
|
127
127
|
elementForFocus: HTMLElement;
|
|
128
|
-
prevElement?: HTMLElement;
|
|
128
|
+
prevElement?: HTMLElement | undefined;
|
|
129
129
|
contextStateRef: {
|
|
130
130
|
current?: TableKeyboardNavigationContextType;
|
|
131
131
|
};
|
|
@@ -4,7 +4,7 @@ import { FOCUSABLE_ELEMENTS, KEYBOARD_NAV_DATA_BODY, KEYBOARD_NAV_DATA_HEADER, K
|
|
|
4
4
|
*/
|
|
5
5
|
export var generateNavigatableId = function (navigationId, idPrefix, type) {
|
|
6
6
|
if (type === void 0) { type = 'cell'; }
|
|
7
|
-
return idPrefix
|
|
7
|
+
return "".concat(idPrefix, "_").concat(navigationId, "_").concat(type);
|
|
8
8
|
};
|
|
9
9
|
/**
|
|
10
10
|
* @hidden
|
|
@@ -40,39 +40,39 @@ export var isNavigatable = function (element) {
|
|
|
40
40
|
*/
|
|
41
41
|
export var getNavigatableElement = function (scope, options) {
|
|
42
42
|
if (options === void 0) { options = { level: 0 }; }
|
|
43
|
-
return scope.querySelector("["
|
|
43
|
+
return scope.querySelector("[".concat(KEYBOARD_NAV_DATA_LEVEL, "='").concat(options.level, "']"));
|
|
44
44
|
};
|
|
45
45
|
/**
|
|
46
46
|
* @hidden
|
|
47
47
|
*/
|
|
48
48
|
export var getClosestNavigatableElement = function (target) {
|
|
49
49
|
return (target.parentElement &&
|
|
50
|
-
target.parentElement.closest("["
|
|
50
|
+
target.parentElement.closest("[".concat(KEYBOARD_NAV_DATA_LEVEL, "]")));
|
|
51
51
|
};
|
|
52
52
|
/**
|
|
53
53
|
* @hidden
|
|
54
54
|
*/
|
|
55
55
|
export var getActiveElement = function (scope, activeId) {
|
|
56
|
-
return scope.querySelector("["
|
|
56
|
+
return scope.querySelector("[".concat(KEYBOARD_NAV_DATA_ID, "='").concat(activeId, "']"));
|
|
57
57
|
};
|
|
58
58
|
/**
|
|
59
59
|
* @hidden
|
|
60
60
|
*/
|
|
61
61
|
export var getClosestScope = function (target) {
|
|
62
62
|
return (target.parentElement &&
|
|
63
|
-
target.parentElement.closest("["
|
|
63
|
+
target.parentElement.closest("[".concat(KEYBOARD_NAV_DATA_SCOPE, "]")));
|
|
64
64
|
};
|
|
65
65
|
/**
|
|
66
66
|
* @hidden
|
|
67
67
|
*/
|
|
68
68
|
export var getHeaderElement = function (scope) {
|
|
69
|
-
return scope.querySelector("["
|
|
69
|
+
return scope.querySelector("[".concat(KEYBOARD_NAV_DATA_HEADER, "]"));
|
|
70
70
|
};
|
|
71
71
|
/**
|
|
72
72
|
* @hidden
|
|
73
73
|
*/
|
|
74
74
|
export var getBodyElement = function (scope) {
|
|
75
|
-
return scope.querySelector("["
|
|
75
|
+
return scope.querySelector("[".concat(KEYBOARD_NAV_DATA_BODY, "]"));
|
|
76
76
|
};
|
|
77
77
|
/**
|
|
78
78
|
* @hidden
|
|
@@ -90,7 +90,7 @@ export var getNavigatableElements = function (scope, options) {
|
|
|
90
90
|
if (!scope) {
|
|
91
91
|
return [];
|
|
92
92
|
}
|
|
93
|
-
var selector = FOCUSABLE_ELEMENTS.map(function (el) { return el +
|
|
93
|
+
var selector = FOCUSABLE_ELEMENTS.map(function (el) { return el + "[".concat(KEYBOARD_NAV_DATA_LEVEL, "='").concat(options.level, "']"); }).join(',');
|
|
94
94
|
return Array.from(scope.querySelectorAll(selector));
|
|
95
95
|
};
|
|
96
96
|
/**
|
|
@@ -98,7 +98,7 @@ export var getNavigatableElements = function (scope, options) {
|
|
|
98
98
|
*/
|
|
99
99
|
export var filterNavigatableElements = function (options) {
|
|
100
100
|
if (options === void 0) { options = { level: 0 }; }
|
|
101
|
-
var selector = FOCUSABLE_ELEMENTS.map(function (sel) { return sel +
|
|
101
|
+
var selector = FOCUSABLE_ELEMENTS.map(function (sel) { return sel + "[".concat(KEYBOARD_NAV_DATA_LEVEL, "='").concat(options.level, "']"); }).join(',');
|
|
102
102
|
return function (element) { return element.matches(selector); };
|
|
103
103
|
};
|
|
104
104
|
/**
|
|
@@ -183,7 +183,7 @@ export var getNextNavigationIndex = function (navigationStateRef) {
|
|
|
183
183
|
* @hidden
|
|
184
184
|
*/
|
|
185
185
|
export var getFilterColumnId = function (columnId) {
|
|
186
|
-
return columnId ? ""
|
|
186
|
+
return columnId ? "".concat(columnId).concat(KEYBOARD_NAV_FILTER_COL_SUFFIX) : '';
|
|
187
187
|
};
|
|
188
188
|
/**
|
|
189
189
|
* @hidden
|
|
@@ -5,7 +5,7 @@ export var packageMetadata = {
|
|
|
5
5
|
name: '@progress/kendo-react-data-tools',
|
|
6
6
|
productName: 'KendoReact',
|
|
7
7
|
productCodes: ['KENDOUIREACT', 'KENDOUICOMPLETE'],
|
|
8
|
-
publishDate:
|
|
8
|
+
publishDate: 1654761994,
|
|
9
9
|
version: '',
|
|
10
10
|
licensingDocsUrl: 'https://www.telerik.com/kendo-react-ui/my-license/?utm_medium=product&utm_source=kendoreact&utm_campaign=kendo-ui-react-purchase-license-keys-warning'
|
|
11
11
|
};
|
package/dist/es/pager/Pager.d.ts
CHANGED
|
@@ -97,7 +97,7 @@ export declare class Pager extends React.Component<PagerProps> {
|
|
|
97
97
|
buttonCount: PropTypes.Requireable<number>;
|
|
98
98
|
info: PropTypes.Requireable<boolean>;
|
|
99
99
|
type: PropTypes.Requireable<string>;
|
|
100
|
-
pageSizes: PropTypes.Requireable<number[]>;
|
|
100
|
+
pageSizes: PropTypes.Requireable<(number | null | undefined)[]>;
|
|
101
101
|
previousNext: PropTypes.Requireable<boolean>;
|
|
102
102
|
onPageChange: PropTypes.Requireable<(...args: any[]) => any>;
|
|
103
103
|
messagesMap: PropTypes.Requireable<(...args: any[]) => any>;
|
|
@@ -128,6 +128,7 @@ export declare class Pager extends React.Component<PagerProps> {
|
|
|
128
128
|
* @hidden
|
|
129
129
|
*/
|
|
130
130
|
render(): JSX.Element;
|
|
131
|
+
private onPageChange;
|
|
131
132
|
private renderButton;
|
|
132
133
|
private get totalPages();
|
|
133
134
|
private changePage;
|
package/dist/es/pager/Pager.js
CHANGED
|
@@ -13,6 +13,17 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
13
13
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
14
14
|
};
|
|
15
15
|
})();
|
|
16
|
+
var __assign = (this && this.__assign) || function () {
|
|
17
|
+
__assign = Object.assign || function(t) {
|
|
18
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
19
|
+
s = arguments[i];
|
|
20
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
21
|
+
t[p] = s[p];
|
|
22
|
+
}
|
|
23
|
+
return t;
|
|
24
|
+
};
|
|
25
|
+
return __assign.apply(this, arguments);
|
|
26
|
+
};
|
|
16
27
|
import * as React from 'react';
|
|
17
28
|
import * as PropTypes from 'prop-types';
|
|
18
29
|
import { PagerNumericButtons } from './PagerNumericButtons';
|
|
@@ -36,6 +47,12 @@ var Pager = /** @class */ (function (_super) {
|
|
|
36
47
|
function Pager(props) {
|
|
37
48
|
var _this = _super.call(this, props) || this;
|
|
38
49
|
_this._element = null;
|
|
50
|
+
_this.onPageChange = function (eventData, syntheticEvent) {
|
|
51
|
+
var event = __assign({ target: _this, syntheticEvent: syntheticEvent, nativeEvent: syntheticEvent.nativeEvent }, eventData);
|
|
52
|
+
if (_this.props.onPageChange) {
|
|
53
|
+
_this.props.onPageChange.call(undefined, event);
|
|
54
|
+
}
|
|
55
|
+
};
|
|
39
56
|
_this.changePage = function (page, event) {
|
|
40
57
|
if (_this.props.onPageChange && page > 0 && page <= _this.totalPages) {
|
|
41
58
|
_this.props.onPageChange({
|
|
@@ -120,7 +137,7 @@ var Pager = /** @class */ (function (_super) {
|
|
|
120
137
|
next = this.renderButton(currentPage + 1, 'k-link k-pager-nav' + (currentPage >= this.totalPages ? ' k-disabled' : ''), localizationService.toLanguageString(nextPageMessage.messageKey, nextPageMessage.defaultMessage), 'k-icon k-i-arrow-60-right');
|
|
121
138
|
last = this.renderButton(this.totalPages, 'k-link k-pager-nav k-pager-last' + (currentPage >= this.totalPages ? ' k-disabled' : ''), localizationService.toLanguageString(lastPageMessage.messageKey, lastPageMessage.defaultMessage), 'k-icon k-i-arrow-end-right');
|
|
122
139
|
}
|
|
123
|
-
var pagerPageSizes = pageSizes && (React.createElement(PagerPageSizes, { pageChange: this.
|
|
140
|
+
var pagerPageSizes = pageSizes && (React.createElement(PagerPageSizes, { pageChange: this.onPageChange, pageSize: take, pageSizes: pageSizes, messagesMap: messagesMap }));
|
|
124
141
|
var info = this.props.info && (React.createElement("div", { className: "k-pager-info k-label" }, intlService
|
|
125
142
|
.format(localizationService.toLanguageString(infoMessage.messageKey, infoMessage.defaultMessage), [
|
|
126
143
|
Math.min(skip + 1, total),
|
|
@@ -51,10 +51,10 @@ var PagerInput = /** @class */ (function (_super) {
|
|
|
51
51
|
return (React.createElement("span", { className: "k-pager-input k-label" },
|
|
52
52
|
localizationService.toLanguageString(pageMessage.messageKey, pageMessage.defaultMessage),
|
|
53
53
|
React.createElement("span", { className: 'k-textbox k-input k-input-md k-rounded-md k-input-solid' },
|
|
54
|
-
React.createElement("input", { className: "k-input-inner", value: this.value(), onBlur: function () { return _this.forceUpdate(); }, onChange: this.onChange })), localizationService.toLanguageString(ofMessage.messageKey, ofMessage.defaultMessage)
|
|
54
|
+
React.createElement("input", { className: "k-input-inner", value: this.value(), onBlur: function () { return _this.forceUpdate(); }, onChange: this.onChange })), "".concat(localizationService.toLanguageString(ofMessage.messageKey, ofMessage.defaultMessage), " ").concat(intlService
|
|
55
55
|
.format(localizationService.toLanguageString(totalPagesMessage.messageKey, totalPagesMessage.defaultMessage), [
|
|
56
56
|
this.props.totalPages
|
|
57
|
-
])));
|
|
57
|
+
]))));
|
|
58
58
|
};
|
|
59
59
|
return PagerInput;
|
|
60
60
|
}(React.Component));
|
|
@@ -7,7 +7,7 @@ export interface PagerPageSizesProps {
|
|
|
7
7
|
pageChange?: (event: {
|
|
8
8
|
skip: number;
|
|
9
9
|
take: number;
|
|
10
|
-
}, e: React.SyntheticEvent<any>) =>
|
|
10
|
+
}, e: React.SyntheticEvent<any>) => void;
|
|
11
11
|
pageSizes: number[];
|
|
12
12
|
messagesMap?: (messageKey: string) => ({
|
|
13
13
|
messageKey: string;
|
|
@@ -3,9 +3,9 @@ import { TableSelectableSettings } from './TableSelectableSettings';
|
|
|
3
3
|
/** @hidden */
|
|
4
4
|
export declare const closestTagName: (target: HTMLElement | null, tagName: 'TD' | 'TR' | 'TABLE') => HTMLElement | null;
|
|
5
5
|
/** @hidden */
|
|
6
|
-
export declare const getRowIndex: (element: HTMLTableRowElement) => number;
|
|
6
|
+
export declare const getRowIndex: (element: HTMLTableRowElement) => number | undefined;
|
|
7
7
|
/** @hidden */
|
|
8
|
-
export declare const getColumnIndex: (element: HTMLTableCellElement) => number;
|
|
8
|
+
export declare const getColumnIndex: (element: HTMLTableCellElement) => number | undefined;
|
|
9
9
|
/**
|
|
10
10
|
* @hidden
|
|
11
11
|
*
|
|
@@ -21,7 +21,7 @@ export declare const setSelectedState: (options: {
|
|
|
21
21
|
};
|
|
22
22
|
dataItemKey: string;
|
|
23
23
|
selectedField: string;
|
|
24
|
-
subItemsField?: string;
|
|
24
|
+
subItemsField?: string | undefined;
|
|
25
25
|
}) => any[];
|
|
26
26
|
/**
|
|
27
27
|
* Get selected state from the component KeyDown event.
|
|
@@ -9,10 +9,14 @@ var __assign = (this && this.__assign) || function () {
|
|
|
9
9
|
};
|
|
10
10
|
return __assign.apply(this, arguments);
|
|
11
11
|
};
|
|
12
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
13
|
-
for (var i = 0,
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
13
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
14
|
+
if (ar || !(i in from)) {
|
|
15
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
16
|
+
ar[i] = from[i];
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
16
20
|
};
|
|
17
21
|
import { extendDataItem, getter, Keys, mapTree, hasRelativeStackingContext } from '@progress/kendo-react-common';
|
|
18
22
|
import { TABLE_COL_INDEX_ATTRIBUTE, TABLE_ROW_INDEX_ATTRIBUTE } from './constants';
|
|
@@ -28,7 +32,7 @@ var getCellSelection = function (currentSelection, selectedColumn) {
|
|
|
28
32
|
return currentSelection.filter(function (columnIndex) { return columnIndex === selectedColumn; });
|
|
29
33
|
}
|
|
30
34
|
else {
|
|
31
|
-
return __spreadArray(__spreadArray([], currentSelection), [selectedColumn]);
|
|
35
|
+
return __spreadArray(__spreadArray([], currentSelection, true), [selectedColumn], false);
|
|
32
36
|
}
|
|
33
37
|
}
|
|
34
38
|
};
|
|
@@ -158,7 +162,7 @@ export var getSelectedState = function (options) {
|
|
|
158
162
|
var selectedDataItems = dataItems.slice(startRowIndex, endRowIndex + 1);
|
|
159
163
|
selectedDataItems.forEach(function (currentItem) {
|
|
160
164
|
var itemId = idGetter(currentItem);
|
|
161
|
-
selectionState[itemId] = cell ? __spreadArray([], selectedColumns_1) : true;
|
|
165
|
+
selectionState[itemId] = cell ? __spreadArray([], selectedColumns_1, true) : true;
|
|
162
166
|
});
|
|
163
167
|
}
|
|
164
168
|
else {
|
|
@@ -187,7 +191,7 @@ export var getSelectedState = function (options) {
|
|
|
187
191
|
var selectedDataItems = dataItems.slice(currentStartRowIndex, currentEndRowIndex + 1);
|
|
188
192
|
selectedDataItems.forEach(function (currentItem) {
|
|
189
193
|
var itemId = idGetter(currentItem);
|
|
190
|
-
selectionState[itemId] = cell ? __spreadArray([], selectedColumns_2) : true;
|
|
194
|
+
selectionState[itemId] = cell ? __spreadArray([], selectedColumns_2, true) : true;
|
|
191
195
|
});
|
|
192
196
|
}
|
|
193
197
|
}
|
|
@@ -9,20 +9,24 @@ var __assign = (this && this.__assign) || function () {
|
|
|
9
9
|
};
|
|
10
10
|
return __assign.apply(this, arguments);
|
|
11
11
|
};
|
|
12
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
13
|
-
for (var i = 0,
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
13
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
14
|
+
if (ar || !(i in from)) {
|
|
15
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
16
|
+
ar[i] = from[i];
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
16
20
|
};
|
|
17
21
|
import { orderBy as kendoDataQueryOrderBy, filterBy as kendoDataQueryFilterBy } from '@progress/kendo-data-query';
|
|
18
22
|
// Gets and sets the children. Returns the children or the re-created item with the new children.
|
|
19
23
|
function children(item, subItemsField, subItems) {
|
|
20
24
|
var _a;
|
|
21
25
|
if (subItems) {
|
|
22
|
-
return __assign(__assign({}, item), (_a = {}, _a[subItemsField] = subItems.length ? __spreadArray([], subItems) : undefined, _a));
|
|
26
|
+
return __assign(__assign({}, item), (_a = {}, _a[subItemsField] = subItems.length ? __spreadArray([], subItems, true) : undefined, _a));
|
|
23
27
|
}
|
|
24
28
|
else {
|
|
25
|
-
return item && item[subItemsField] ? __spreadArray([], item[subItemsField]) : [];
|
|
29
|
+
return item && item[subItemsField] ? __spreadArray([], item[subItemsField], true) : [];
|
|
26
30
|
}
|
|
27
31
|
}
|
|
28
32
|
function sortChildren(dataItem, sort, subItemsField) {
|
|
@@ -74,7 +78,7 @@ function filterChildren(dataItem, filters, subItemsField) {
|
|
|
74
78
|
*/
|
|
75
79
|
export function filterBy(data, descriptors, subItemsField) {
|
|
76
80
|
var _a;
|
|
77
|
-
var filtered = (_a = {}, _a[subItemsField] = __spreadArray([], data), _a);
|
|
81
|
+
var filtered = (_a = {}, _a[subItemsField] = __spreadArray([], data, true), _a);
|
|
78
82
|
filtered = filterChildren(filtered, descriptors, subItemsField);
|
|
79
83
|
return filtered[subItemsField] || [];
|
|
80
84
|
}
|
|
@@ -6,7 +6,7 @@ var GROUP_SUBITEMS_COLLECTION = 'items';
|
|
|
6
6
|
*/
|
|
7
7
|
var setGroupId = function (group, depth, parentValue) {
|
|
8
8
|
if (group.items) {
|
|
9
|
-
group[GROUP_ID_FIELD] = ""
|
|
9
|
+
group[GROUP_ID_FIELD] = "".concat(parentValue).concat(parentValue && '_').concat(group.value).concat(group.field);
|
|
10
10
|
if (depth > 1) {
|
|
11
11
|
group.items.forEach(function (item) { return setGroupId(item, depth - 1, group[GROUP_ID_FIELD]); });
|
|
12
12
|
}
|