@progress/kendo-react-grid 5.10.0-dev.202301111905 → 5.10.0-dev.202301131814
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-grid.js +1 -1
- package/dist/es/Grid.js +6 -3
- package/dist/es/GridToolbar.js +3 -1
- package/dist/es/drag/CommonDragLogic.d.ts +2 -1
- package/dist/es/drag/CommonDragLogic.js +20 -9
- package/dist/es/drag/GroupingIndicator.js +8 -8
- package/dist/es/footer/Footer.js +3 -1
- package/dist/es/header/FilterRow.js +1 -1
- package/dist/es/header/GroupPanel.js +4 -3
- package/dist/es/header/Header.js +3 -1
- package/dist/es/header/HeaderRow.js +1 -0
- package/dist/es/interfaces/events.d.ts +4 -0
- package/dist/es/package-metadata.js +1 -1
- package/dist/npm/Grid.js +6 -3
- package/dist/npm/GridToolbar.js +3 -1
- package/dist/npm/drag/CommonDragLogic.d.ts +2 -1
- package/dist/npm/drag/CommonDragLogic.js +20 -9
- package/dist/npm/drag/GroupingIndicator.js +7 -7
- package/dist/npm/footer/Footer.js +3 -1
- package/dist/npm/header/FilterRow.js +1 -1
- package/dist/npm/header/GroupPanel.js +4 -3
- package/dist/npm/header/Header.js +3 -1
- package/dist/npm/header/HeaderRow.js +1 -0
- package/dist/npm/interfaces/events.d.ts +4 -0
- package/dist/npm/package-metadata.js +1 -1
- package/dist/systemjs/kendo-react-grid.js +1 -1
- package/package.json +18 -18
package/dist/es/Grid.js
CHANGED
|
@@ -677,7 +677,8 @@ var Grid = /** @class */ (function (_super) {
|
|
|
677
677
|
Grid.prototype.columnReorder = function (prev, next, nativeEvent) {
|
|
678
678
|
var _a;
|
|
679
679
|
var _this = this;
|
|
680
|
-
var
|
|
680
|
+
var column = this._columns[prev];
|
|
681
|
+
var depth = column.depth;
|
|
681
682
|
var end = function (index) {
|
|
682
683
|
do {
|
|
683
684
|
index++;
|
|
@@ -691,11 +692,13 @@ var Grid = /** @class */ (function (_super) {
|
|
|
691
692
|
var eventColumnProps = this.columns;
|
|
692
693
|
this.forceUpdate();
|
|
693
694
|
if (this.props.onColumnReorder) {
|
|
694
|
-
|
|
695
|
+
var reorderEvent = {
|
|
695
696
|
target: this,
|
|
696
697
|
columns: eventColumnProps,
|
|
698
|
+
columnId: column.id,
|
|
697
699
|
nativeEvent: nativeEvent
|
|
698
|
-
}
|
|
700
|
+
};
|
|
701
|
+
this.props.onColumnReorder.call(undefined, reorderEvent);
|
|
699
702
|
}
|
|
700
703
|
};
|
|
701
704
|
Grid.prototype.groupReorder = function (prevIndex, nextIndex, nativeEvent) {
|
package/dist/es/GridToolbar.js
CHANGED
|
@@ -63,7 +63,9 @@ var GridToolbar = /** @class */ (function (_super) {
|
|
|
63
63
|
*/
|
|
64
64
|
GridToolbar.prototype.render = function () {
|
|
65
65
|
var _a;
|
|
66
|
-
return (React.createElement("div", { className: classNames('k-toolbar k-grid-toolbar', (_a = {
|
|
66
|
+
return (React.createElement("div", { className: classNames('k-toolbar k-grid-toolbar', (_a = {
|
|
67
|
+
'k-toolbar-md': !this.props.size
|
|
68
|
+
},
|
|
67
69
|
_a["k-toolbar-".concat(kendoThemeMaps.sizeMap[this.props.size] || this.props.size)] = this.props.size,
|
|
68
70
|
_a), this.props.className) }, this.props.children));
|
|
69
71
|
};
|
|
@@ -27,11 +27,12 @@ export declare class CommonDragLogic {
|
|
|
27
27
|
private get dragElementClue();
|
|
28
28
|
private get dropElementClue();
|
|
29
29
|
constructor(columnReorder: handler, groupReorder: handler, columnToGroup: handler);
|
|
30
|
-
refGroupPanelDiv: (e:
|
|
30
|
+
refGroupPanelDiv: (e: any) => void;
|
|
31
31
|
pressHandler: (event: any, element: HTMLTableRowElement | HTMLDivElement) => void;
|
|
32
32
|
dragHandler: (event: any, element: HTMLTableRowElement | HTMLDivElement) => void;
|
|
33
33
|
releaseHandler: (event: any) => void;
|
|
34
34
|
private getColumnIndex;
|
|
35
|
+
private isTargetGroupingContainer;
|
|
35
36
|
private getGroupIndex;
|
|
36
37
|
private isValid;
|
|
37
38
|
private updateDragElementClue;
|
|
@@ -17,7 +17,7 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
17
17
|
this.currentGroup = -1;
|
|
18
18
|
this.groupPanelDivElement = null;
|
|
19
19
|
this.refGroupPanelDiv = function (e) {
|
|
20
|
-
_this.groupPanelDivElement = e;
|
|
20
|
+
_this.groupPanelDivElement = e.children ? e.children[0] : e;
|
|
21
21
|
};
|
|
22
22
|
this.pressHandler = function (event, element) {
|
|
23
23
|
var startColumn = _this.getColumnIndex(event, element);
|
|
@@ -38,10 +38,12 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
40
|
_this.currentColumn = _this.getColumnIndex(event, element);
|
|
41
|
-
_this.
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
41
|
+
var groupPanelChildren = _this.groupPanelDivElement && _this.groupPanelDivElement.children;
|
|
42
|
+
_this.currentGroup = _this.isTargetGroupingContainer(event)
|
|
43
|
+
? groupPanelChildren && groupPanelChildren.length
|
|
44
|
+
? groupPanelChildren.length
|
|
45
|
+
: 0
|
|
46
|
+
: _this.getGroupIndex(event);
|
|
45
47
|
var invalidIndex = !_this.isValid();
|
|
46
48
|
if (invalidIndex) {
|
|
47
49
|
_this.currentColumn = -1;
|
|
@@ -49,7 +51,9 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
49
51
|
}
|
|
50
52
|
var targetElement = (_this.currentColumn >= 0) ?
|
|
51
53
|
element.children[_this.columns[_this.currentColumn].index] :
|
|
52
|
-
_this.
|
|
54
|
+
_this.isTargetGroupingContainer(event)
|
|
55
|
+
? event.originalEvent.target
|
|
56
|
+
: _this.groupPanelDivElement && _this.groupPanelDivElement.children[_this.currentGroup];
|
|
53
57
|
_this.updateDragElementClue(event, element, targetElement, invalidIndex);
|
|
54
58
|
_this.updateDropElementClue(event, element, targetElement, invalidIndex);
|
|
55
59
|
};
|
|
@@ -133,6 +137,10 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
133
137
|
}
|
|
134
138
|
return -1;
|
|
135
139
|
};
|
|
140
|
+
CommonDragLogic.prototype.isTargetGroupingContainer = function (event) {
|
|
141
|
+
var target = event.originalEvent.target;
|
|
142
|
+
return target.className.indexOf('k-grouping-drop-container') !== -1;
|
|
143
|
+
};
|
|
136
144
|
CommonDragLogic.prototype.getGroupIndex = function (event) {
|
|
137
145
|
return getIndex(event, this.groupPanelDivElement);
|
|
138
146
|
};
|
|
@@ -179,16 +187,19 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
179
187
|
return;
|
|
180
188
|
}
|
|
181
189
|
var rect = targetElement.getBoundingClientRect();
|
|
190
|
+
var groupElement = targetElement.closest('.k-grouping-header');
|
|
191
|
+
var rectParent = (groupElement || targetElement).getBoundingClientRect();
|
|
182
192
|
var left = rect.left + event.pageX - event.clientX - 6;
|
|
183
|
-
if (this.
|
|
193
|
+
if (!this.isTargetGroupingContainer(event) && (this.currentColumn > this.startColumn
|
|
194
|
+
|| this.currentGroup > this.startGroup && this.startGroup !== -1)) {
|
|
184
195
|
left += rect.width;
|
|
185
196
|
}
|
|
186
|
-
var top =
|
|
197
|
+
var top = rectParent.top + event.pageY - event.clientY;
|
|
187
198
|
this.dropElementClue.setState({
|
|
188
199
|
visible: true,
|
|
189
200
|
top: top,
|
|
190
201
|
left: left,
|
|
191
|
-
height: (this.currentColumn >= 0) ? element.clientHeight :
|
|
202
|
+
height: (this.currentColumn >= 0) ? element.clientHeight : rectParent.height
|
|
192
203
|
});
|
|
193
204
|
};
|
|
194
205
|
return CommonDragLogic;
|
|
@@ -15,10 +15,9 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
15
15
|
})();
|
|
16
16
|
import * as React from 'react';
|
|
17
17
|
import { Draggable, IconWrap } from '@progress/kendo-react-common';
|
|
18
|
-
import { Button } from '@progress/kendo-react-buttons';
|
|
19
18
|
import { ungroupColumn, messages } from '../messages';
|
|
20
19
|
import { provideLocalizationService, registerForLocalization } from '@progress/kendo-react-intl';
|
|
21
|
-
import { sortAscSmallIcon, sortDescSmallIcon,
|
|
20
|
+
import { sortAscSmallIcon, sortDescSmallIcon, xCircleIcon } from '@progress/kendo-svg-icons';
|
|
22
21
|
/**
|
|
23
22
|
* @hidden
|
|
24
23
|
*/
|
|
@@ -74,12 +73,13 @@ var GroupingIndicator = /** @class */ (function (_super) {
|
|
|
74
73
|
var localizationService = provideLocalizationService(this);
|
|
75
74
|
var dir = this.props.dir;
|
|
76
75
|
return (React.createElement(Draggable, { onPress: this.onPress, onDrag: this.onDrag, onRelease: this.onRelease, ref: function (component) { _this.draggable = component; } },
|
|
77
|
-
React.createElement("div", { className: "k-
|
|
78
|
-
React.createElement("
|
|
79
|
-
React.createElement(
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
React.createElement(
|
|
76
|
+
React.createElement("div", { className: "k-chip k-chip-md k-chip-solid k-chip-solid-base k-rounded-md", role: "button", style: { touchAction: 'none' } },
|
|
77
|
+
React.createElement("span", { onClick: this.sortChange },
|
|
78
|
+
React.createElement(IconWrap, { name: 'sort-' + dir + '-small', icon: dir === 'asc' ? sortAscSmallIcon : sortDescSmallIcon })),
|
|
79
|
+
React.createElement("span", { className: 'k-chip-content' }, this.props.title),
|
|
80
|
+
React.createElement("span", { className: "k-chip-actions" },
|
|
81
|
+
React.createElement("span", { className: "k-chip-action k-chip-remove-action", onClick: this.groupRemove, "aria-label": localizationService.toLanguageString(ungroupColumn, messages[ungroupColumn]) },
|
|
82
|
+
React.createElement(IconWrap, { name: 'x-circle', icon: xCircleIcon }))))));
|
|
83
83
|
};
|
|
84
84
|
return GroupingIndicator;
|
|
85
85
|
}(React.Component));
|
package/dist/es/footer/Footer.js
CHANGED
|
@@ -57,7 +57,9 @@ var Footer = /** @class */ (function (_super) {
|
|
|
57
57
|
}
|
|
58
58
|
return (React.createElement("div", { className: "k-grid-footer", role: "presentation" },
|
|
59
59
|
React.createElement("div", { ref: function (div) { _this.footerWrap = div; }, className: "k-grid-footer-wrap", style: this.scrollbarWidth ? {} : { borderWidth: 0 }, role: "presentation" },
|
|
60
|
-
React.createElement("table", { ref: function (table) { _this.table = table; }, className: classNames('k-table k-grid-footer-table', (_a = {
|
|
60
|
+
React.createElement("table", { ref: function (table) { _this.table = table; }, className: classNames('k-table k-grid-footer-table', (_a = {
|
|
61
|
+
'k-grid-md': !this.props.size
|
|
62
|
+
},
|
|
61
63
|
_a["k-table-".concat(kendoThemeMaps.sizeMap[this.props.size] || this.props.size)] = this.props.size,
|
|
62
64
|
_a), this.props.className), role: "presentation" },
|
|
63
65
|
React.createElement("colgroup", { ref: function (e) { _this.props.columnResize.colGroupFooter = e; }, role: "presentation" }, this.props.cols),
|
|
@@ -119,7 +119,7 @@ var FilterRow = /** @class */ (function (_super) {
|
|
|
119
119
|
? { left: column.left, right: column.right }
|
|
120
120
|
: { left: column.right, right: column.left }
|
|
121
121
|
: {};
|
|
122
|
-
return (React.createElement(HeaderThElement, __assign({ key: key, columnId: navigationTools.getFilterColumnId(column.id), navigatable: column.navigatable, style: style, className: classNames('k-
|
|
122
|
+
return (React.createElement(HeaderThElement, __assign({ key: key, columnId: navigationTools.getFilterColumnId(column.id), navigatable: column.navigatable, style: style, className: classNames('k-table-th', _this.headerCellClassName(column.field, column.locked) || undefined), role: "columnheader" }, ariaAttrs), filterCellProps && (column.filterCell ?
|
|
123
123
|
React.createElement(column.filterCell, __assign({}, filterCellProps)) :
|
|
124
124
|
React.createElement(GridFilterCell, __assign({ size: _this.props.size }, filterCellProps)))));
|
|
125
125
|
});
|
|
@@ -45,9 +45,10 @@ var GroupPanel = /** @class */ (function (_super) {
|
|
|
45
45
|
}, onSortChange: function (event, dir) {
|
|
46
46
|
_this.onGroupSortChange(event, index, groupDesc, dir);
|
|
47
47
|
}, onPress: _this.props.pressHandler, onDrag: _this.props.dragHandler, onRelease: _this.props.releaseHandler })); });
|
|
48
|
-
return (React.createElement("div", { ref: this.props.refCallback, className: "k-grouping-header
|
|
49
|
-
groups
|
|
50
|
-
|
|
48
|
+
return (React.createElement("div", { ref: this.props.refCallback, className: "k-grouping-header", role: "toolbar", "aria-label": intl(this).toLanguageString(groupPanelAriaLabel, messages[groupPanelAriaLabel]) },
|
|
49
|
+
!!groups.length
|
|
50
|
+
&& React.createElement("div", { className: "k-chip-list k-chip-list-md" }, groups),
|
|
51
|
+
React.createElement("div", { className: "k-grouping-drop-container" },
|
|
51
52
|
!groups.length && intl(this).toLanguageString(messageKey, messages[messageKey]),
|
|
52
53
|
"\u00A0")));
|
|
53
54
|
};
|
package/dist/es/header/Header.js
CHANGED
|
@@ -97,7 +97,9 @@ var Header = /** @class */ (function (_super) {
|
|
|
97
97
|
}
|
|
98
98
|
return (React.createElement("div", { ref: this.props.elemRef, className: classNames('k-grid-header', { 'k-grid-draggable-header': this.props.draggable }), role: "presentation" },
|
|
99
99
|
React.createElement("div", { ref: function (div) { _this.headerWrap = div; }, className: "k-grid-header-wrap", style: this.scrollbarWidth ? {} : { borderWidth: 0 }, onScroll: this.onScroll, role: "presentation" },
|
|
100
|
-
React.createElement("table", { ref: function (table) { _this.table = table; }, className: classNames('k-table k-grid-header-table', (_a = {
|
|
100
|
+
React.createElement("table", { ref: function (table) { _this.table = table; }, className: classNames('k-table k-grid-header-table', (_a = {
|
|
101
|
+
'k-grid-md': !this.props.size
|
|
102
|
+
},
|
|
101
103
|
_a["k-table-".concat(kendoThemeMaps.sizeMap[this.props.size] || this.props.size)] = this.props.size,
|
|
102
104
|
_a), this.props.className), role: "presentation" },
|
|
103
105
|
React.createElement("colgroup", { ref: function (e) { _this.props.columnResize.colGroupHeader = e; } }, this.props.cols),
|
|
@@ -75,6 +75,7 @@ var HeaderRow = /** @class */ (function (_super) {
|
|
|
75
75
|
var className = classNames({
|
|
76
76
|
'k-first': column.kFirst,
|
|
77
77
|
'k-filterable': Boolean(columnMenu),
|
|
78
|
+
'k-table-th': true,
|
|
78
79
|
'k-header': true,
|
|
79
80
|
'k-grid-header-sticky': column.locked,
|
|
80
81
|
'k-sorted': _this.props.sort && _this.props.sort.some(function (descriptor) { return descriptor.field === column.field; })
|
|
@@ -5,7 +5,7 @@ export var packageMetadata = {
|
|
|
5
5
|
name: '@progress/kendo-react-grid',
|
|
6
6
|
productName: 'KendoReact',
|
|
7
7
|
productCodes: ['KENDOUIREACT', 'KENDOUICOMPLETE'],
|
|
8
|
-
publishDate:
|
|
8
|
+
publishDate: 1673632533,
|
|
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/npm/Grid.js
CHANGED
|
@@ -680,7 +680,8 @@ var Grid = /** @class */ (function (_super) {
|
|
|
680
680
|
Grid.prototype.columnReorder = function (prev, next, nativeEvent) {
|
|
681
681
|
var _a;
|
|
682
682
|
var _this = this;
|
|
683
|
-
var
|
|
683
|
+
var column = this._columns[prev];
|
|
684
|
+
var depth = column.depth;
|
|
684
685
|
var end = function (index) {
|
|
685
686
|
do {
|
|
686
687
|
index++;
|
|
@@ -694,11 +695,13 @@ var Grid = /** @class */ (function (_super) {
|
|
|
694
695
|
var eventColumnProps = this.columns;
|
|
695
696
|
this.forceUpdate();
|
|
696
697
|
if (this.props.onColumnReorder) {
|
|
697
|
-
|
|
698
|
+
var reorderEvent = {
|
|
698
699
|
target: this,
|
|
699
700
|
columns: eventColumnProps,
|
|
701
|
+
columnId: column.id,
|
|
700
702
|
nativeEvent: nativeEvent
|
|
701
|
-
}
|
|
703
|
+
};
|
|
704
|
+
this.props.onColumnReorder.call(undefined, reorderEvent);
|
|
702
705
|
}
|
|
703
706
|
};
|
|
704
707
|
Grid.prototype.groupReorder = function (prevIndex, nextIndex, nativeEvent) {
|
package/dist/npm/GridToolbar.js
CHANGED
|
@@ -66,7 +66,9 @@ var GridToolbar = /** @class */ (function (_super) {
|
|
|
66
66
|
*/
|
|
67
67
|
GridToolbar.prototype.render = function () {
|
|
68
68
|
var _a;
|
|
69
|
-
return (React.createElement("div", { className: (0, kendo_react_common_1.classNames)('k-toolbar k-grid-toolbar', (_a = {
|
|
69
|
+
return (React.createElement("div", { className: (0, kendo_react_common_1.classNames)('k-toolbar k-grid-toolbar', (_a = {
|
|
70
|
+
'k-toolbar-md': !this.props.size
|
|
71
|
+
},
|
|
70
72
|
_a["k-toolbar-".concat(kendo_react_common_1.kendoThemeMaps.sizeMap[this.props.size] || this.props.size)] = this.props.size,
|
|
71
73
|
_a), this.props.className) }, this.props.children));
|
|
72
74
|
};
|
|
@@ -27,11 +27,12 @@ export declare class CommonDragLogic {
|
|
|
27
27
|
private get dragElementClue();
|
|
28
28
|
private get dropElementClue();
|
|
29
29
|
constructor(columnReorder: handler, groupReorder: handler, columnToGroup: handler);
|
|
30
|
-
refGroupPanelDiv: (e:
|
|
30
|
+
refGroupPanelDiv: (e: any) => void;
|
|
31
31
|
pressHandler: (event: any, element: HTMLTableRowElement | HTMLDivElement) => void;
|
|
32
32
|
dragHandler: (event: any, element: HTMLTableRowElement | HTMLDivElement) => void;
|
|
33
33
|
releaseHandler: (event: any) => void;
|
|
34
34
|
private getColumnIndex;
|
|
35
|
+
private isTargetGroupingContainer;
|
|
35
36
|
private getGroupIndex;
|
|
36
37
|
private isValid;
|
|
37
38
|
private updateDragElementClue;
|
|
@@ -20,7 +20,7 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
20
20
|
this.currentGroup = -1;
|
|
21
21
|
this.groupPanelDivElement = null;
|
|
22
22
|
this.refGroupPanelDiv = function (e) {
|
|
23
|
-
_this.groupPanelDivElement = e;
|
|
23
|
+
_this.groupPanelDivElement = e.children ? e.children[0] : e;
|
|
24
24
|
};
|
|
25
25
|
this.pressHandler = function (event, element) {
|
|
26
26
|
var startColumn = _this.getColumnIndex(event, element);
|
|
@@ -41,10 +41,12 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
_this.currentColumn = _this.getColumnIndex(event, element);
|
|
44
|
-
_this.
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
var groupPanelChildren = _this.groupPanelDivElement && _this.groupPanelDivElement.children;
|
|
45
|
+
_this.currentGroup = _this.isTargetGroupingContainer(event)
|
|
46
|
+
? groupPanelChildren && groupPanelChildren.length
|
|
47
|
+
? groupPanelChildren.length
|
|
48
|
+
: 0
|
|
49
|
+
: _this.getGroupIndex(event);
|
|
48
50
|
var invalidIndex = !_this.isValid();
|
|
49
51
|
if (invalidIndex) {
|
|
50
52
|
_this.currentColumn = -1;
|
|
@@ -52,7 +54,9 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
52
54
|
}
|
|
53
55
|
var targetElement = (_this.currentColumn >= 0) ?
|
|
54
56
|
element.children[_this.columns[_this.currentColumn].index] :
|
|
55
|
-
_this.
|
|
57
|
+
_this.isTargetGroupingContainer(event)
|
|
58
|
+
? event.originalEvent.target
|
|
59
|
+
: _this.groupPanelDivElement && _this.groupPanelDivElement.children[_this.currentGroup];
|
|
56
60
|
_this.updateDragElementClue(event, element, targetElement, invalidIndex);
|
|
57
61
|
_this.updateDropElementClue(event, element, targetElement, invalidIndex);
|
|
58
62
|
};
|
|
@@ -136,6 +140,10 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
136
140
|
}
|
|
137
141
|
return -1;
|
|
138
142
|
};
|
|
143
|
+
CommonDragLogic.prototype.isTargetGroupingContainer = function (event) {
|
|
144
|
+
var target = event.originalEvent.target;
|
|
145
|
+
return target.className.indexOf('k-grouping-drop-container') !== -1;
|
|
146
|
+
};
|
|
139
147
|
CommonDragLogic.prototype.getGroupIndex = function (event) {
|
|
140
148
|
return (0, kendo_react_data_tools_1.getIndex)(event, this.groupPanelDivElement);
|
|
141
149
|
};
|
|
@@ -182,16 +190,19 @@ var CommonDragLogic = /** @class */ (function () {
|
|
|
182
190
|
return;
|
|
183
191
|
}
|
|
184
192
|
var rect = targetElement.getBoundingClientRect();
|
|
193
|
+
var groupElement = targetElement.closest('.k-grouping-header');
|
|
194
|
+
var rectParent = (groupElement || targetElement).getBoundingClientRect();
|
|
185
195
|
var left = rect.left + event.pageX - event.clientX - 6;
|
|
186
|
-
if (this.
|
|
196
|
+
if (!this.isTargetGroupingContainer(event) && (this.currentColumn > this.startColumn
|
|
197
|
+
|| this.currentGroup > this.startGroup && this.startGroup !== -1)) {
|
|
187
198
|
left += rect.width;
|
|
188
199
|
}
|
|
189
|
-
var top =
|
|
200
|
+
var top = rectParent.top + event.pageY - event.clientY;
|
|
190
201
|
this.dropElementClue.setState({
|
|
191
202
|
visible: true,
|
|
192
203
|
top: top,
|
|
193
204
|
left: left,
|
|
194
|
-
height: (this.currentColumn >= 0) ? element.clientHeight :
|
|
205
|
+
height: (this.currentColumn >= 0) ? element.clientHeight : rectParent.height
|
|
195
206
|
});
|
|
196
207
|
};
|
|
197
208
|
return CommonDragLogic;
|
|
@@ -18,7 +18,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.GroupingIndicator = void 0;
|
|
19
19
|
var React = require("react");
|
|
20
20
|
var kendo_react_common_1 = require("@progress/kendo-react-common");
|
|
21
|
-
var kendo_react_buttons_1 = require("@progress/kendo-react-buttons");
|
|
22
21
|
var messages_1 = require("../messages");
|
|
23
22
|
var kendo_react_intl_1 = require("@progress/kendo-react-intl");
|
|
24
23
|
var kendo_svg_icons_1 = require("@progress/kendo-svg-icons");
|
|
@@ -77,12 +76,13 @@ var GroupingIndicator = /** @class */ (function (_super) {
|
|
|
77
76
|
var localizationService = (0, kendo_react_intl_1.provideLocalizationService)(this);
|
|
78
77
|
var dir = this.props.dir;
|
|
79
78
|
return (React.createElement(kendo_react_common_1.Draggable, { onPress: this.onPress, onDrag: this.onDrag, onRelease: this.onRelease, ref: function (component) { _this.draggable = component; } },
|
|
80
|
-
React.createElement("div", { className: "k-
|
|
81
|
-
React.createElement("
|
|
82
|
-
React.createElement(
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
React.createElement(
|
|
79
|
+
React.createElement("div", { className: "k-chip k-chip-md k-chip-solid k-chip-solid-base k-rounded-md", role: "button", style: { touchAction: 'none' } },
|
|
80
|
+
React.createElement("span", { onClick: this.sortChange },
|
|
81
|
+
React.createElement(kendo_react_common_1.IconWrap, { name: 'sort-' + dir + '-small', icon: dir === 'asc' ? kendo_svg_icons_1.sortAscSmallIcon : kendo_svg_icons_1.sortDescSmallIcon })),
|
|
82
|
+
React.createElement("span", { className: 'k-chip-content' }, this.props.title),
|
|
83
|
+
React.createElement("span", { className: "k-chip-actions" },
|
|
84
|
+
React.createElement("span", { className: "k-chip-action k-chip-remove-action", onClick: this.groupRemove, "aria-label": localizationService.toLanguageString(messages_1.ungroupColumn, messages_1.messages[messages_1.ungroupColumn]) },
|
|
85
|
+
React.createElement(kendo_react_common_1.IconWrap, { name: 'x-circle', icon: kendo_svg_icons_1.xCircleIcon }))))));
|
|
86
86
|
};
|
|
87
87
|
return GroupingIndicator;
|
|
88
88
|
}(React.Component));
|
|
@@ -60,7 +60,9 @@ var Footer = /** @class */ (function (_super) {
|
|
|
60
60
|
}
|
|
61
61
|
return (React.createElement("div", { className: "k-grid-footer", role: "presentation" },
|
|
62
62
|
React.createElement("div", { ref: function (div) { _this.footerWrap = div; }, className: "k-grid-footer-wrap", style: this.scrollbarWidth ? {} : { borderWidth: 0 }, role: "presentation" },
|
|
63
|
-
React.createElement("table", { ref: function (table) { _this.table = table; }, className: (0, kendo_react_common_2.classNames)('k-table k-grid-footer-table', (_a = {
|
|
63
|
+
React.createElement("table", { ref: function (table) { _this.table = table; }, className: (0, kendo_react_common_2.classNames)('k-table k-grid-footer-table', (_a = {
|
|
64
|
+
'k-grid-md': !this.props.size
|
|
65
|
+
},
|
|
64
66
|
_a["k-table-".concat(kendo_react_common_2.kendoThemeMaps.sizeMap[this.props.size] || this.props.size)] = this.props.size,
|
|
65
67
|
_a), this.props.className), role: "presentation" },
|
|
66
68
|
React.createElement("colgroup", { ref: function (e) { _this.props.columnResize.colGroupFooter = e; }, role: "presentation" }, this.props.cols),
|
|
@@ -122,7 +122,7 @@ var FilterRow = /** @class */ (function (_super) {
|
|
|
122
122
|
? { left: column.left, right: column.right }
|
|
123
123
|
: { left: column.right, right: column.left }
|
|
124
124
|
: {};
|
|
125
|
-
return (React.createElement(kendo_react_data_tools_1.HeaderThElement, __assign({ key: key, columnId: kendo_react_data_tools_1.tableKeyboardNavigationTools.getFilterColumnId(column.id), navigatable: column.navigatable, style: style, className: (0, kendo_react_common_1.classNames)('k-
|
|
125
|
+
return (React.createElement(kendo_react_data_tools_1.HeaderThElement, __assign({ key: key, columnId: kendo_react_data_tools_1.tableKeyboardNavigationTools.getFilterColumnId(column.id), navigatable: column.navigatable, style: style, className: (0, kendo_react_common_1.classNames)('k-table-th', _this.headerCellClassName(column.field, column.locked) || undefined), role: "columnheader" }, ariaAttrs), filterCellProps && (column.filterCell ?
|
|
126
126
|
React.createElement(column.filterCell, __assign({}, filterCellProps)) :
|
|
127
127
|
React.createElement(GridFilterCell_1.GridFilterCell, __assign({ size: _this.props.size }, filterCellProps)))));
|
|
128
128
|
});
|
|
@@ -48,9 +48,10 @@ var GroupPanel = /** @class */ (function (_super) {
|
|
|
48
48
|
}, onSortChange: function (event, dir) {
|
|
49
49
|
_this.onGroupSortChange(event, index, groupDesc, dir);
|
|
50
50
|
}, onPress: _this.props.pressHandler, onDrag: _this.props.dragHandler, onRelease: _this.props.releaseHandler })); });
|
|
51
|
-
return (React.createElement("div", { ref: this.props.refCallback, className: "k-grouping-header
|
|
52
|
-
groups
|
|
53
|
-
|
|
51
|
+
return (React.createElement("div", { ref: this.props.refCallback, className: "k-grouping-header", role: "toolbar", "aria-label": (0, kendo_react_intl_1.provideLocalizationService)(this).toLanguageString(messages_1.groupPanelAriaLabel, messages_1.messages[messages_1.groupPanelAriaLabel]) },
|
|
52
|
+
!!groups.length
|
|
53
|
+
&& React.createElement("div", { className: "k-chip-list k-chip-list-md" }, groups),
|
|
54
|
+
React.createElement("div", { className: "k-grouping-drop-container" },
|
|
54
55
|
!groups.length && (0, kendo_react_intl_1.provideLocalizationService)(this).toLanguageString(messages_1.groupPanelEmpty, messages_1.messages[messages_1.groupPanelEmpty]),
|
|
55
56
|
"\u00A0")));
|
|
56
57
|
};
|
|
@@ -100,7 +100,9 @@ var Header = /** @class */ (function (_super) {
|
|
|
100
100
|
}
|
|
101
101
|
return (React.createElement("div", { ref: this.props.elemRef, className: (0, kendo_react_common_1.classNames)('k-grid-header', { 'k-grid-draggable-header': this.props.draggable }), role: "presentation" },
|
|
102
102
|
React.createElement("div", { ref: function (div) { _this.headerWrap = div; }, className: "k-grid-header-wrap", style: this.scrollbarWidth ? {} : { borderWidth: 0 }, onScroll: this.onScroll, role: "presentation" },
|
|
103
|
-
React.createElement("table", { ref: function (table) { _this.table = table; }, className: (0, kendo_react_common_1.classNames)('k-table k-grid-header-table', (_a = {
|
|
103
|
+
React.createElement("table", { ref: function (table) { _this.table = table; }, className: (0, kendo_react_common_1.classNames)('k-table k-grid-header-table', (_a = {
|
|
104
|
+
'k-grid-md': !this.props.size
|
|
105
|
+
},
|
|
104
106
|
_a["k-table-".concat(kendo_react_common_1.kendoThemeMaps.sizeMap[this.props.size] || this.props.size)] = this.props.size,
|
|
105
107
|
_a), this.props.className), role: "presentation" },
|
|
106
108
|
React.createElement("colgroup", { ref: function (e) { _this.props.columnResize.colGroupHeader = e; } }, this.props.cols),
|
|
@@ -78,6 +78,7 @@ var HeaderRow = /** @class */ (function (_super) {
|
|
|
78
78
|
var className = (0, kendo_react_common_1.classNames)({
|
|
79
79
|
'k-first': column.kFirst,
|
|
80
80
|
'k-filterable': Boolean(columnMenu),
|
|
81
|
+
'k-table-th': true,
|
|
81
82
|
'k-header': true,
|
|
82
83
|
'k-grid-header-sticky': column.locked,
|
|
83
84
|
'k-sorted': _this.props.sort && _this.props.sort.some(function (descriptor) { return descriptor.field === column.field; })
|
|
@@ -8,7 +8,7 @@ exports.packageMetadata = {
|
|
|
8
8
|
name: '@progress/kendo-react-grid',
|
|
9
9
|
productName: 'KendoReact',
|
|
10
10
|
productCodes: ['KENDOUIREACT', 'KENDOUICOMPLETE'],
|
|
11
|
-
publishDate:
|
|
11
|
+
publishDate: 1673632533,
|
|
12
12
|
version: '',
|
|
13
13
|
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'
|
|
14
14
|
};
|