@progress/kendo-vue-data-tools 3.7.4-dev.202212300853 → 3.7.4-dev.202301120847

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (110) hide show
  1. package/dist/cdn/js/kendo-vue-data-tools.js +1 -1
  2. package/dist/es/cells/FilterCell.js +35 -21
  3. package/dist/es/columnmenu/ColumnMenu.js +7 -4
  4. package/dist/es/columnmenu/ColumnMenuCheckboxFilter.js +12 -5
  5. package/dist/es/columnmenu/ColumnMenuFilter.js +9 -4
  6. package/dist/es/columnmenu/ColumnMenuItem.d.ts +9 -0
  7. package/dist/es/columnmenu/ColumnMenuItem.js +12 -1
  8. package/dist/es/columnmenu/ColumnMenuSort.js +17 -8
  9. package/dist/es/drag/ColumnDraggable.js +6 -2
  10. package/dist/es/drag/CommonDragLogic.d.ts +1 -0
  11. package/dist/es/drag/CommonDragLogic.js +21 -10
  12. package/dist/es/filter/Expression.js +17 -8
  13. package/dist/es/filter/GroupToolbar.js +33 -8
  14. package/dist/es/header/FilterRow.d.ts +1 -0
  15. package/dist/es/header/FilterRow.js +6 -4
  16. package/dist/es/header/Header.d.ts +1 -0
  17. package/dist/es/header/Header.js +12 -2
  18. package/dist/es/header/HeaderRow.d.ts +1 -0
  19. package/dist/es/header/HeaderRow.js +12 -5
  20. package/dist/es/header/HeaderTdElement.d.ts +46 -0
  21. package/dist/es/header/HeaderTdElement.js +92 -0
  22. package/dist/es/header/HeaderThElement.d.ts +8 -1
  23. package/dist/es/header/HeaderThElement.js +10 -2
  24. package/dist/es/header/main.d.ts +1 -0
  25. package/dist/es/header/main.js +1 -0
  26. package/dist/es/interfaces/FilterCellProps.d.ts +12 -0
  27. package/dist/es/package-metadata.js +1 -1
  28. package/dist/es/pager/Pager.d.ts +13 -1
  29. package/dist/es/pager/Pager.js +66 -28
  30. package/dist/es/pager/PagerInput.d.ts +9 -1
  31. package/dist/es/pager/PagerInput.js +16 -2
  32. package/dist/es/pager/PagerNavigationButton.d.ts +13 -0
  33. package/dist/es/pager/PagerNavigationButton.js +30 -20
  34. package/dist/es/pager/PagerNumericButtons.d.ts +5 -1
  35. package/dist/es/pager/PagerNumericButtons.js +61 -27
  36. package/dist/es/pager/PagerPageSizes.d.ts +1 -0
  37. package/dist/es/pager/PagerPageSizes.js +3 -0
  38. package/dist/esm/cells/FilterCell.js +35 -21
  39. package/dist/esm/columnmenu/ColumnMenu.js +7 -4
  40. package/dist/esm/columnmenu/ColumnMenuCheckboxFilter.js +12 -5
  41. package/dist/esm/columnmenu/ColumnMenuFilter.js +9 -4
  42. package/dist/esm/columnmenu/ColumnMenuItem.d.ts +9 -0
  43. package/dist/esm/columnmenu/ColumnMenuItem.js +12 -1
  44. package/dist/esm/columnmenu/ColumnMenuSort.js +17 -8
  45. package/dist/esm/drag/ColumnDraggable.js +6 -2
  46. package/dist/esm/drag/CommonDragLogic.d.ts +1 -0
  47. package/dist/esm/drag/CommonDragLogic.js +21 -10
  48. package/dist/esm/filter/Expression.js +17 -8
  49. package/dist/esm/filter/GroupToolbar.js +33 -8
  50. package/dist/esm/header/FilterRow.d.ts +1 -0
  51. package/dist/esm/header/FilterRow.js +6 -4
  52. package/dist/esm/header/Header.d.ts +1 -0
  53. package/dist/esm/header/Header.js +12 -2
  54. package/dist/esm/header/HeaderRow.d.ts +1 -0
  55. package/dist/esm/header/HeaderRow.js +12 -5
  56. package/dist/esm/header/HeaderTdElement.d.ts +46 -0
  57. package/dist/esm/header/HeaderTdElement.js +92 -0
  58. package/dist/esm/header/HeaderThElement.d.ts +8 -1
  59. package/dist/esm/header/HeaderThElement.js +10 -2
  60. package/dist/esm/header/main.d.ts +1 -0
  61. package/dist/esm/header/main.js +1 -0
  62. package/dist/esm/interfaces/FilterCellProps.d.ts +12 -0
  63. package/dist/esm/package-metadata.js +1 -1
  64. package/dist/esm/pager/Pager.d.ts +13 -1
  65. package/dist/esm/pager/Pager.js +66 -28
  66. package/dist/esm/pager/PagerInput.d.ts +9 -1
  67. package/dist/esm/pager/PagerInput.js +16 -2
  68. package/dist/esm/pager/PagerNavigationButton.d.ts +13 -0
  69. package/dist/esm/pager/PagerNavigationButton.js +30 -20
  70. package/dist/esm/pager/PagerNumericButtons.d.ts +5 -1
  71. package/dist/esm/pager/PagerNumericButtons.js +61 -27
  72. package/dist/esm/pager/PagerPageSizes.d.ts +1 -0
  73. package/dist/esm/pager/PagerPageSizes.js +3 -0
  74. package/dist/npm/cells/FilterCell.js +34 -20
  75. package/dist/npm/columnmenu/ColumnMenu.js +7 -4
  76. package/dist/npm/columnmenu/ColumnMenuCheckboxFilter.js +12 -5
  77. package/dist/npm/columnmenu/ColumnMenuFilter.js +9 -4
  78. package/dist/npm/columnmenu/ColumnMenuItem.d.ts +9 -0
  79. package/dist/npm/columnmenu/ColumnMenuItem.js +12 -1
  80. package/dist/npm/columnmenu/ColumnMenuSort.js +17 -8
  81. package/dist/npm/drag/ColumnDraggable.js +6 -2
  82. package/dist/npm/drag/CommonDragLogic.d.ts +1 -0
  83. package/dist/npm/drag/CommonDragLogic.js +21 -10
  84. package/dist/npm/filter/Expression.js +17 -8
  85. package/dist/npm/filter/GroupToolbar.js +33 -8
  86. package/dist/npm/header/FilterRow.d.ts +1 -0
  87. package/dist/npm/header/FilterRow.js +6 -4
  88. package/dist/npm/header/Header.d.ts +1 -0
  89. package/dist/npm/header/Header.js +11 -1
  90. package/dist/npm/header/HeaderRow.d.ts +1 -0
  91. package/dist/npm/header/HeaderRow.js +12 -5
  92. package/dist/npm/header/HeaderTdElement.d.ts +46 -0
  93. package/dist/npm/header/HeaderTdElement.js +99 -0
  94. package/dist/npm/header/HeaderThElement.d.ts +8 -1
  95. package/dist/npm/header/HeaderThElement.js +10 -2
  96. package/dist/npm/header/main.d.ts +1 -0
  97. package/dist/npm/header/main.js +1 -0
  98. package/dist/npm/interfaces/FilterCellProps.d.ts +12 -0
  99. package/dist/npm/package-metadata.js +1 -1
  100. package/dist/npm/pager/Pager.d.ts +13 -1
  101. package/dist/npm/pager/Pager.js +65 -27
  102. package/dist/npm/pager/PagerInput.d.ts +9 -1
  103. package/dist/npm/pager/PagerInput.js +16 -2
  104. package/dist/npm/pager/PagerNavigationButton.d.ts +13 -0
  105. package/dist/npm/pager/PagerNavigationButton.js +30 -20
  106. package/dist/npm/pager/PagerNumericButtons.d.ts +5 -1
  107. package/dist/npm/pager/PagerNumericButtons.js +61 -27
  108. package/dist/npm/pager/PagerPageSizes.d.ts +1 -0
  109. package/dist/npm/pager/PagerPageSizes.js +3 -0
  110. package/package.json +12 -11
@@ -18,6 +18,7 @@ var kendo_vue_dateinputs_1 = require("@progress/kendo-vue-dateinputs");
18
18
  var kendo_vue_intl_1 = require("@progress/kendo-vue-intl");
19
19
  var filterCommon_1 = require("../filterCommon");
20
20
  var kendo_vue_common_1 = require("@progress/kendo-vue-common");
21
+ var kendo_svg_icons_1 = require("@progress/kendo-svg-icons");
21
22
  /**
22
23
  * @hidden
23
24
  */
@@ -40,7 +41,8 @@ var FilterCellVue2 = {
40
41
  booleanValues: Array,
41
42
  onChange: Function,
42
43
  render: [String, Function, Object],
43
- ariaLabel: String
44
+ ariaLabel: String,
45
+ size: String
44
46
  },
45
47
  inject: {
46
48
  kendoLocalizationService: {
@@ -91,6 +93,7 @@ var FilterCellVue2 = {
91
93
  render: function render(createElement) {
92
94
  var _this = this;
93
95
  var h = gh || createElement;
96
+ var size = this.$props.size;
94
97
  var ls = (0, kendo_vue_intl_1.provideLocalizationService)(this);
95
98
  var selectedOperator = this.$props.operators.find(function (item) {
96
99
  return item.operator === _this.$props.operator;
@@ -109,6 +112,7 @@ var FilterCellVue2 = {
109
112
  value: selectedOperator,
110
113
  attrs: this.v3 ? undefined : {
111
114
  value: selectedOperator,
115
+ size: size,
112
116
  iconClassName: "k-i-filter k-button-icon",
113
117
  "data-items": this.$props.operators,
114
118
  textField: "text",
@@ -118,6 +122,7 @@ var FilterCellVue2 = {
118
122
  },
119
123
  "aria-label": this.ariaLabel || ls.toLanguageString(main_1.filterDropDownOperatorAriaLabel, main_1.messages[main_1.filterDropDownOperatorAriaLabel])
120
124
  },
125
+ size: size,
121
126
  "class": "k-dropdown-operator",
122
127
  iconClassName: "k-i-filter k-button-icon",
123
128
  "data-items": this.$props.operators,
@@ -137,12 +142,14 @@ var FilterCellVue2 = {
137
142
  return (
138
143
  // @ts-ignore
139
144
  h(kendo_vue_inputs_1.NumericTextBox, {
140
- value: value,
145
+ size: size,
141
146
  attrs: this.v3 ? undefined : {
147
+ size: size,
142
148
  value: value,
143
149
  title: this.$props.title,
144
150
  "aria-label": this.ariaLabel || ls.toLanguageString(main_1.filterNumericFilterAriaLabel, main_1.messages[main_1.filterNumericFilterAriaLabel])
145
151
  },
152
+ value: value,
146
153
  onChange: function onChange(e) {
147
154
  _this.inputChange(e.value, e.event);
148
155
  },
@@ -159,12 +166,14 @@ var FilterCellVue2 = {
159
166
  return (
160
167
  // @ts-ignore
161
168
  h(kendo_vue_dateinputs_1.DatePicker, {
162
- value: value,
169
+ size: size,
163
170
  attrs: this.v3 ? undefined : {
171
+ size: size,
164
172
  value: value,
165
173
  title: this.$props.title,
166
174
  "aria-label": this.ariaLabel || ls.toLanguageString(main_1.filterDateFilterAriaLabel, main_1.messages[main_1.filterDateFilterAriaLabel])
167
175
  },
176
+ value: value,
168
177
  onChange: function onChange(e) {
169
178
  _this.inputChange(e.value, e);
170
179
  },
@@ -186,10 +195,9 @@ var FilterCellVue2 = {
186
195
  on: this.v3 ? undefined : {
187
196
  "change": this.boolDropdownChange
188
197
  },
189
- value: booleanValues.find(function (item) {
190
- return item.operator === (value !== null ? value : '');
191
- }),
198
+ size: size,
192
199
  attrs: this.v3 ? undefined : {
200
+ size: size,
193
201
  value: booleanValues.find(function (item) {
194
202
  return item.operator === (value !== null ? value : '');
195
203
  }),
@@ -198,6 +206,9 @@ var FilterCellVue2 = {
198
206
  title: this.$props.title,
199
207
  "aria-label": this.ariaLabel || ls.toLanguageString(main_1.filterEnumFilterDropdownAriaLabel, main_1.messages[main_1.filterEnumFilterDropdownAriaLabel])
200
208
  },
209
+ value: booleanValues.find(function (item) {
210
+ return item.operator === (value !== null ? value : '');
211
+ }),
201
212
  "data-items": booleanValues,
202
213
  textField: "text",
203
214
  title: this.$props.title,
@@ -205,14 +216,15 @@ var FilterCellVue2 = {
205
216
  })
206
217
  );
207
218
  default:
208
- return h("span", {
209
- "class": "k-textbox k-input k-input-md k-rounded-md k-input-solid"
210
- }, [h("input", {
211
- "class": "k-input-inner",
212
- value: this.v3 ? value || '' : null,
213
- domProps: this.v3 ? undefined : {
214
- "value": value || ''
219
+ return h(kendo_vue_inputs_1.Input, {
220
+ size: size,
221
+ attrs: this.v3 ? undefined : {
222
+ size: size,
223
+ value: value || '',
224
+ title: this.$props.title,
225
+ "aria-label": this.ariaLabel || ls.toLanguageString(main_1.filterTextFilterAriaLabel, main_1.messages[main_1.filterTextFilterAriaLabel])
215
226
  },
227
+ value: value || '',
216
228
  onInput: function onInput(e) {
217
229
  _this.inputChange(e.target.value, e);
218
230
  },
@@ -222,28 +234,30 @@ var FilterCellVue2 = {
222
234
  }
223
235
  },
224
236
  title: this.$props.title,
225
- attrs: this.v3 ? undefined : {
226
- title: this.$props.title,
227
- "aria-label": this.ariaLabel || ls.toLanguageString(main_1.filterTextFilterAriaLabel, main_1.messages[main_1.filterTextFilterAriaLabel])
228
- },
229
237
  "aria-label": this.ariaLabel || ls.toLanguageString(main_1.filterTextFilterAriaLabel, main_1.messages[main_1.filterTextFilterAriaLabel])
230
- })]);
238
+ });
231
239
  }
232
240
  };
233
241
  var defaultRendering = h("div", {
234
242
  "class": "k-filtercell"
235
- }, [h("span", [filterComponent.call(this, this.$props.filterType, this.$props.value), h("div", {
243
+ }, [h("div", {
244
+ "class": "k-filtercell-wrapper"
245
+ }, [filterComponent.call(this, this.$props.filterType, this.$props.value), h("div", {
236
246
  "class": "k-filtercell-operator"
237
247
  }, [renderOperatorEditor.call(this),
238
248
  // @ts-ignore function children
239
249
  h(kendo_vue_buttons_1.Button, {
240
- type: "button",
250
+ size: size,
241
251
  attrs: this.v3 ? undefined : {
252
+ size: size,
242
253
  type: "button",
243
254
  icon: 'filter-clear',
255
+ svgIcon: kendo_svg_icons_1.filterClearIcon,
244
256
  title: ls.toLanguageString(main_1.columnMenuFilterClearButton, main_1.messages[main_1.columnMenuFilterClearButton])
245
257
  },
258
+ type: "button",
246
259
  icon: 'filter-clear',
260
+ svgIcon: kendo_svg_icons_1.filterClearIcon,
247
261
  "class": {
248
262
  /* button is always visible if there is either value or operator */
249
263
  'k-disabled': !(!(this.$props.value === null || this.$props.value === '') || this.$props.operator)
@@ -12,6 +12,7 @@ var isV3 = allVue.version && allVue.version[0] === '3';
12
12
  var inject = allVue.inject;
13
13
  var kendo_vue_common_1 = require("@progress/kendo-vue-common");
14
14
  var kendo_vue_popup_1 = require("@progress/kendo-vue-popup");
15
+ var kendo_svg_icons_1 = require("@progress/kendo-svg-icons");
15
16
  var ColumnMenuContent_1 = require("./ColumnMenuContent");
16
17
  var utils_1 = require("../navigation/utils");
17
18
  var kendo_vue_intl_1 = require("@progress/kendo-vue-intl");
@@ -92,8 +93,8 @@ var ColumnMenuVue2 = {
92
93
  handleFocus: function handleFocus(_) {
93
94
  clearTimeout(this.blurTimeout);
94
95
  },
95
- anchorClick: function anchorClick() {
96
- var that = this;
96
+ anchorClick: function anchorClick(e) {
97
+ e.preventDefault();
97
98
  this.show = !this.show;
98
99
  },
99
100
  closeMenu: function closeMenu() {
@@ -142,8 +143,10 @@ var ColumnMenuVue2 = {
142
143
  }, [h(kendo_vue_common_1.Icon, {
143
144
  name: 'more-vertical',
144
145
  attrs: this.v3 ? undefined : {
145
- name: 'more-vertical'
146
- }
146
+ name: 'more-vertical',
147
+ icon: kendo_svg_icons_1.moreVerticalIcon
148
+ },
149
+ icon: kendo_svg_icons_1.moreVerticalIcon
147
150
  })]),
148
151
  // @ts-ignore function children
149
152
  h(kendo_vue_popup_1.Popup, {
@@ -35,6 +35,7 @@ var kendo_vue_buttons_1 = require("@progress/kendo-vue-buttons");
35
35
  var ColumnMenuItem_1 = require("./ColumnMenuItem");
36
36
  var ColumnMenuItemGroup_1 = require("./ColumnMenuItemGroup");
37
37
  var ColumnMenuItemContent_1 = require("./ColumnMenuItemContent");
38
+ var kendo_svg_icons_1 = require("@progress/kendo-svg-icons");
38
39
  var kendo_vue_inputs_1 = require("@progress/kendo-vue-inputs");
39
40
  var kendo_vue_intl_1 = require("@progress/kendo-vue-intl");
40
41
  var main_1 = require("../messages/main");
@@ -153,8 +154,10 @@ var ColumnMenuCheckboxFilterVue2 = {
153
154
  }, [h(kendo_vue_common_1.Icon, {
154
155
  name: 'search',
155
156
  attrs: this.v3 ? undefined : {
156
- name: 'search'
157
+ name: 'search',
158
+ icon: kendo_svg_icons_1.searchIcon
157
159
  },
160
+ icon: kendo_svg_icons_1.searchIcon,
158
161
  "class": "k-input-icon"
159
162
  }), h("input", {
160
163
  ref: 'searchBox',
@@ -220,9 +223,11 @@ var ColumnMenuCheckboxFilterVue2 = {
220
223
  title: localizationService.toLanguageString(main_1.columnMenuFilterTitle, main_1.messages[main_1.columnMenuFilterTitle]),
221
224
  attrs: _this2.v3 ? undefined : {
222
225
  title: localizationService.toLanguageString(main_1.columnMenuFilterTitle, main_1.messages[main_1.columnMenuFilterTitle]),
223
- iconClass: 'k-i-filter'
226
+ icon: 'filter',
227
+ svgIcon: kendo_svg_icons_1.filterIcon
224
228
  },
225
- iconClass: 'k-i-filter',
229
+ icon: 'filter',
230
+ svgIcon: kendo_svg_icons_1.filterIcon,
226
231
  onClick: _this2.onFilterExpand,
227
232
  on: _this2.v3 ? undefined : {
228
233
  "click": _this2.onFilterExpand
@@ -381,9 +386,11 @@ var ColumnMenuCheckboxFilterVue2 = {
381
386
  title: localizationService.toLanguageString(main_1.columnMenuFilterTitle, main_1.messages[main_1.columnMenuFilterTitle]),
382
387
  attrs: _this2.v3 ? undefined : {
383
388
  title: localizationService.toLanguageString(main_1.columnMenuFilterTitle, main_1.messages[main_1.columnMenuFilterTitle]),
384
- iconClass: 'k-i-filter'
389
+ icon: 'filter',
390
+ svgIcon: kendo_svg_icons_1.filterIcon
385
391
  },
386
- iconClass: 'k-i-filter',
392
+ icon: 'filter',
393
+ svgIcon: kendo_svg_icons_1.filterIcon,
387
394
  onClick: _this2.onFilterExpand,
388
395
  on: _this2.v3 ? undefined : {
389
396
  "click": _this2.onFilterExpand
@@ -43,6 +43,7 @@ var main_1 = require("../messages/main");
43
43
  var ColumnMenuFilterCell_1 = require("./ColumnMenuFilterCell");
44
44
  var ColumnMenuFilterOperators_1 = require("./ColumnMenuFilterOperators");
45
45
  var kendo_vue_dropdowns_1 = require("@progress/kendo-vue-dropdowns");
46
+ var kendo_svg_icons_1 = require("@progress/kendo-svg-icons");
46
47
  /**
47
48
  * @hidden
48
49
  */
@@ -360,9 +361,11 @@ var ColumnMenuFilterVue2 = {
360
361
  title: localizationService.toLanguageString(main_1.columnMenuFilterTitle, main_1.messages[main_1.columnMenuFilterTitle]),
361
362
  attrs: _this2.v3 ? undefined : {
362
363
  title: localizationService.toLanguageString(main_1.columnMenuFilterTitle, main_1.messages[main_1.columnMenuFilterTitle]),
363
- iconClass: 'k-i-filter'
364
+ icon: 'filter',
365
+ svgIcon: kendo_svg_icons_1.filterIcon
364
366
  },
365
- iconClass: 'k-i-filter',
367
+ icon: 'filter',
368
+ svgIcon: kendo_svg_icons_1.filterIcon,
366
369
  onMenuitemclick: _this2.onFilterExpand,
367
370
  on: _this2.v3 ? undefined : {
368
371
  "menuitemclick": _this2.onFilterExpand
@@ -649,9 +652,11 @@ var ColumnMenuFilterVue2 = {
649
652
  title: localizationService.toLanguageString(main_1.columnMenuFilterTitle, main_1.messages[main_1.columnMenuFilterTitle]),
650
653
  attrs: _this2.v3 ? undefined : {
651
654
  title: localizationService.toLanguageString(main_1.columnMenuFilterTitle, main_1.messages[main_1.columnMenuFilterTitle]),
652
- iconClass: 'k-i-filter'
655
+ icon: 'filter',
656
+ svgIcon: kendo_svg_icons_1.filterIcon
653
657
  },
654
- iconClass: 'k-i-filter',
658
+ icon: 'filter',
659
+ svgIcon: kendo_svg_icons_1.filterIcon,
655
660
  onMenuitemclick: _this2.onFilterExpand,
656
661
  on: _this2.v3 ? undefined : {
657
662
  "menuitemclick": _this2.onFilterExpand
@@ -3,6 +3,7 @@ declare type DefaultData<V> = object | ((this: V) => {});
3
3
  declare type DefaultMethods<V> = {
4
4
  [key: string]: (this: V, ...args: any[]) => any;
5
5
  };
6
+ import { SVGIcon } from '@progress/kendo-svg-icons';
6
7
  /**
7
8
  * The props of the ColumnMenuItem component.
8
9
  */
@@ -19,6 +20,14 @@ export interface ColumnMenuItemProps {
19
20
  * The class of the icon rendered next to the title.
20
21
  */
21
22
  iconClass: string;
23
+ /**
24
+ * Defines the name for the icon.
25
+ */
26
+ icon?: string;
27
+ /**
28
+ * Defines the svg icon in a Kendo UI for Vue theme.
29
+ */
30
+ svgIcon?: SVGIcon;
22
31
  /**
23
32
  * The selected state of the component.
24
33
  */
@@ -17,6 +17,8 @@ var ColumnMenuItemVue2 = {
17
17
  props: {
18
18
  title: String,
19
19
  iconClass: String,
20
+ icon: String,
21
+ svgIcon: Object,
20
22
  selected: Boolean
21
23
  },
22
24
  methods: {
@@ -42,7 +44,9 @@ var ColumnMenuItemVue2 = {
42
44
  var _a = this.$props,
43
45
  title = _a.title,
44
46
  iconClass = _a.iconClass,
45
- selected = _a.selected;
47
+ selected = _a.selected,
48
+ icon = _a.icon,
49
+ svgIcon = _a.svgIcon;
46
50
  return h("div", {
47
51
  tabindex: 0,
48
52
  attrs: this.v3 ? undefined : {
@@ -57,6 +61,13 @@ var ColumnMenuItemVue2 = {
57
61
  "class": "k-columnmenu-item ".concat(selected ? 'k-selected' : '')
58
62
  }, [iconClass && h(kendo_vue_common_1.Icon, {
59
63
  "class": iconClass
64
+ }), (icon || svgIcon) && h(kendo_vue_common_1.Icon, {
65
+ name: icon,
66
+ attrs: this.v3 ? undefined : {
67
+ name: icon,
68
+ svg: svgIcon
69
+ },
70
+ svg: svgIcon
60
71
  }), title]);
61
72
  }
62
73
  };
@@ -16,6 +16,7 @@ var SortSettings_1 = require("../interfaces/SortSettings");
16
16
  var kendo_vue_intl_1 = require("@progress/kendo-vue-intl");
17
17
  var main_1 = require("../messages/main");
18
18
  var kendo_vue_common_1 = require("@progress/kendo-vue-common");
19
+ var kendo_svg_icons_1 = require("@progress/kendo-svg-icons");
19
20
  /**
20
21
  * @hidden
21
22
  */
@@ -173,10 +174,12 @@ var ColumnMenuSortVue2 = {
173
174
  title: localizationService.toLanguageString(main_1.columnMenuSortAscending, main_1.messages[main_1.columnMenuSortAscending]),
174
175
  attrs: _this.v3 ? undefined : {
175
176
  title: localizationService.toLanguageString(main_1.columnMenuSortAscending, main_1.messages[main_1.columnMenuSortAscending]),
176
- iconClass: 'k-i-sort-asc-sm',
177
+ icon: 'sort-asc-small',
178
+ scgIcon: kendo_svg_icons_1.sortAscSmallIcon,
177
179
  selected: sortedAsc(currentSortIndex, sort)
178
180
  },
179
- iconClass: 'k-i-sort-asc-sm',
181
+ icon: 'sort-asc-small',
182
+ scgIcon: kendo_svg_icons_1.sortAscSmallIcon,
180
183
  selected: sortedAsc(currentSortIndex, sort),
181
184
  onMenuitemclick: _this.onAscClick,
182
185
  on: _this.v3 ? undefined : {
@@ -188,10 +191,12 @@ var ColumnMenuSortVue2 = {
188
191
  title: localizationService.toLanguageString(main_1.columnMenuSortDescending, main_1.messages[main_1.columnMenuSortDescending]),
189
192
  attrs: _this.v3 ? undefined : {
190
193
  title: localizationService.toLanguageString(main_1.columnMenuSortDescending, main_1.messages[main_1.columnMenuSortDescending]),
191
- iconClass: 'k-i-sort-desc-sm',
194
+ icon: 'sort-desc-small',
195
+ svgIcon: kendo_svg_icons_1.sortDescSmallIcon,
192
196
  selected: sortedDesc(currentSortIndex, sort)
193
197
  },
194
- iconClass: 'k-i-sort-desc-sm',
198
+ icon: 'sort-desc-small',
199
+ svgIcon: kendo_svg_icons_1.sortDescSmallIcon,
195
200
  selected: sortedDesc(currentSortIndex, sort),
196
201
  onMenuitemclick: _this.onDescClick,
197
202
  on: _this.v3 ? undefined : {
@@ -202,10 +207,12 @@ var ColumnMenuSortVue2 = {
202
207
  title: localizationService.toLanguageString(main_1.columnMenuSortAscending, main_1.messages[main_1.columnMenuSortAscending]),
203
208
  attrs: _this.v3 ? undefined : {
204
209
  title: localizationService.toLanguageString(main_1.columnMenuSortAscending, main_1.messages[main_1.columnMenuSortAscending]),
205
- iconClass: 'k-i-sort-asc-sm',
210
+ icon: 'sort-asc-small',
211
+ scgIcon: kendo_svg_icons_1.sortAscSmallIcon,
206
212
  selected: sortedAsc(currentSortIndex, sort)
207
213
  },
208
- iconClass: 'k-i-sort-asc-sm',
214
+ icon: 'sort-asc-small',
215
+ scgIcon: kendo_svg_icons_1.sortAscSmallIcon,
209
216
  selected: sortedAsc(currentSortIndex, sort),
210
217
  onMenuitemclick: _this.onAscClick,
211
218
  on: _this.v3 ? undefined : {
@@ -215,10 +222,12 @@ var ColumnMenuSortVue2 = {
215
222
  title: localizationService.toLanguageString(main_1.columnMenuSortDescending, main_1.messages[main_1.columnMenuSortDescending]),
216
223
  attrs: _this.v3 ? undefined : {
217
224
  title: localizationService.toLanguageString(main_1.columnMenuSortDescending, main_1.messages[main_1.columnMenuSortDescending]),
218
- iconClass: 'k-i-sort-desc-sm',
225
+ icon: 'sort-desc-small',
226
+ svgIcon: kendo_svg_icons_1.sortDescSmallIcon,
219
227
  selected: sortedDesc(currentSortIndex, sort)
220
228
  },
221
- iconClass: 'k-i-sort-desc-sm',
229
+ icon: 'sort-desc-small',
230
+ svgIcon: kendo_svg_icons_1.sortDescSmallIcon,
222
231
  selected: sortedDesc(currentSortIndex, sort),
223
232
  onMenuitemclick: _this.onDescClick,
224
233
  on: _this.v3 ? undefined : {
@@ -63,8 +63,12 @@ var ColumnDraggableVue2 = {
63
63
  onRelease: this.onRelease,
64
64
  ref: 'draggable'
65
65
  }, this.v3 ? function () {
66
- return [h("tr", [defaultSlot])];
67
- } : [h("tr", [defaultSlot])])
66
+ return [h("tr", {
67
+ "class": 'k-table-row'
68
+ }, [defaultSlot])];
69
+ } : [h("tr", {
70
+ "class": 'k-table-row'
71
+ }, [defaultSlot])])
68
72
  );
69
73
  }
70
74
  };
@@ -28,6 +28,7 @@ export declare class CommonDragLogic {
28
28
  dragHandler: (event: any, element: HTMLElement) => void;
29
29
  releaseHandler: (event: any) => void;
30
30
  private getColumnIndex;
31
+ private isTargetGroupingContainer;
31
32
  private getGroupIndex;
32
33
  private isValid;
33
34
  private updateDragElementClue;
@@ -19,7 +19,7 @@ var CommonDragLogic = /** @class */ (function () {
19
19
  this.currentGroup = -1;
20
20
  this.groupPanelDivElement = null;
21
21
  this.refGroupPanelDiv = function (e) {
22
- _this.groupPanelDivElement = e;
22
+ _this.groupPanelDivElement = e.children ? e.children[0] : e;
23
23
  };
24
24
  this.refDropElementClue = function (e) {
25
25
  _this.dropElementClue = e;
@@ -55,10 +55,12 @@ var CommonDragLogic = /** @class */ (function () {
55
55
  return;
56
56
  }
57
57
  _this.currentColumn = _this.getColumnIndex(event, element);
58
- _this.currentGroup = _this.getGroupIndex(event);
59
- if (_this.groupPanelDivElement && _this.startGroup >= 0) {
60
- _this.currentGroup = Math.min(_this.currentGroup, _this.groupPanelDivElement.children.length - 2);
61
- }
58
+ var groupPanelChildren = _this.groupPanelDivElement.children;
59
+ _this.currentGroup = _this.isTargetGroupingContainer(event)
60
+ ? groupPanelChildren && groupPanelChildren.length
61
+ ? groupPanelChildren.length - 1
62
+ : 0
63
+ : _this.getGroupIndex(event);
62
64
  var invalidIndex = !_this.isValid();
63
65
  if (invalidIndex) {
64
66
  _this.currentColumn = -1;
@@ -66,7 +68,9 @@ var CommonDragLogic = /** @class */ (function () {
66
68
  }
67
69
  var targetElement = (_this.currentColumn >= 0) ?
68
70
  element.children[_this.columns[_this.currentColumn].index] :
69
- _this.groupPanelDivElement && _this.groupPanelDivElement.children[_this.currentGroup];
71
+ _this.isTargetGroupingContainer(event)
72
+ ? event.originalEvent.target
73
+ : _this.groupPanelDivElement && _this.groupPanelDivElement.children[_this.currentGroup];
70
74
  _this.updateDragElementClue(event, element, targetElement, invalidIndex);
71
75
  _this.updateDropElementClue(event, element, targetElement, invalidIndex);
72
76
  };
@@ -121,6 +125,10 @@ var CommonDragLogic = /** @class */ (function () {
121
125
  }
122
126
  return -1;
123
127
  };
128
+ CommonDragLogic.prototype.isTargetGroupingContainer = function (event) {
129
+ var target = event.originalEvent.target;
130
+ return target.className.indexOf('k-grouping-drop-container') !== -1;
131
+ };
124
132
  CommonDragLogic.prototype.getGroupIndex = function (event) {
125
133
  return (0, main_1.getIndex)(event, this.groupPanelDivElement);
126
134
  };
@@ -154,7 +162,7 @@ var CommonDragLogic = /** @class */ (function () {
154
162
  this.dragElementClue.top = (event.pageY + 10);
155
163
  this.dragElementClue.left = event.pageX;
156
164
  this.dragElementClue.innerText = innerText;
157
- this.dragElementClue.status = (invalidIndex || !targetElement) ? 'k-i-cancel' : 'k-i-add';
165
+ this.dragElementClue.status = (invalidIndex || !targetElement) ? 'k-i-cancel' : 'k-i-plus';
158
166
  };
159
167
  CommonDragLogic.prototype.updateDropElementClue = function (event, element, targetElement, invalidIndex) {
160
168
  if (!this.dropElementClue) {
@@ -165,15 +173,18 @@ var CommonDragLogic = /** @class */ (function () {
165
173
  return;
166
174
  }
167
175
  var rect = targetElement.getBoundingClientRect();
176
+ var groupElement = targetElement.closest('.k-grouping-header');
177
+ var rectParent = (groupElement || targetElement).getBoundingClientRect();
168
178
  var left = rect.left + event.pageX - event.clientX - 6;
169
- if (this.currentColumn > this.startColumn || this.currentGroup > this.startGroup && this.startGroup !== -1) {
179
+ if (!this.isTargetGroupingContainer(event) && (this.currentColumn > this.startColumn
180
+ || this.currentGroup > this.startGroup && this.startGroup !== -1)) {
170
181
  left += rect.width;
171
182
  }
172
- var top = rect.top + event.pageY - event.clientY;
183
+ var top = rectParent.top + event.pageY - event.clientY;
173
184
  this.dropElementClue.visible = true;
174
185
  this.dropElementClue.top = top;
175
186
  this.dropElementClue.left = left;
176
- this.dropElementClue.height = (this.currentColumn >= 0) ? element.clientHeight : rect.height;
187
+ this.dropElementClue.height = (this.currentColumn >= 0) ? element.clientHeight : rectParent.height;
177
188
  };
178
189
  return CommonDragLogic;
179
190
  }());
@@ -35,6 +35,7 @@ var kendo_vue_common_1 = require("@progress/kendo-vue-common");
35
35
  var kendo_vue_buttons_1 = require("@progress/kendo-vue-buttons");
36
36
  var kendo_vue_dropdowns_1 = require("@progress/kendo-vue-dropdowns");
37
37
  var kendo_vue_intl_1 = require("@progress/kendo-vue-intl");
38
+ var kendo_svg_icons_1 = require("@progress/kendo-svg-icons");
38
39
  var operators_1 = require("./operators");
39
40
  var main_1 = require("../messages/main");
40
41
  var TextFilter_1 = require("./filters/TextFilter");
@@ -279,11 +280,13 @@ var ExpressionVue2 = {
279
280
  title: locService.toLanguageString(main_1.filterClose, main_1.messages[main_1.filterClose]),
280
281
  attrs: _this.v3 ? undefined : {
281
282
  title: locService.toLanguageString(main_1.filterClose, main_1.messages[main_1.filterClose]),
282
- icon: "close",
283
+ icon: "x",
284
+ svgIcon: kendo_svg_icons_1.xIcon,
283
285
  look: "flat",
284
286
  type: "button"
285
287
  },
286
- icon: "close",
288
+ icon: "x",
289
+ svgIcon: kendo_svg_icons_1.xIcon,
287
290
  look: "flat",
288
291
  type: "button",
289
292
  onClick: _this.onFilterRemove,
@@ -295,11 +298,13 @@ var ExpressionVue2 = {
295
298
  title: locService.toLanguageString(main_1.filterClose, main_1.messages[main_1.filterClose]),
296
299
  attrs: _this.v3 ? undefined : {
297
300
  title: locService.toLanguageString(main_1.filterClose, main_1.messages[main_1.filterClose]),
298
- icon: "close",
301
+ icon: "x",
302
+ svgIcon: kendo_svg_icons_1.xIcon,
299
303
  look: "flat",
300
304
  type: "button"
301
305
  },
302
- icon: "close",
306
+ icon: "x",
307
+ svgIcon: kendo_svg_icons_1.xIcon,
303
308
  look: "flat",
304
309
  type: "button",
305
310
  onClick: _this.onFilterRemove,
@@ -402,11 +407,13 @@ var ExpressionVue2 = {
402
407
  title: locService.toLanguageString(main_1.filterClose, main_1.messages[main_1.filterClose]),
403
408
  attrs: _this.v3 ? undefined : {
404
409
  title: locService.toLanguageString(main_1.filterClose, main_1.messages[main_1.filterClose]),
405
- icon: "close",
410
+ icon: "x",
411
+ svgIcon: kendo_svg_icons_1.xIcon,
406
412
  look: "flat",
407
413
  type: "button"
408
414
  },
409
- icon: "close",
415
+ icon: "x",
416
+ svgIcon: kendo_svg_icons_1.xIcon,
410
417
  look: "flat",
411
418
  type: "button",
412
419
  onClick: _this.onFilterRemove,
@@ -418,11 +425,13 @@ var ExpressionVue2 = {
418
425
  title: locService.toLanguageString(main_1.filterClose, main_1.messages[main_1.filterClose]),
419
426
  attrs: _this.v3 ? undefined : {
420
427
  title: locService.toLanguageString(main_1.filterClose, main_1.messages[main_1.filterClose]),
421
- icon: "close",
428
+ icon: "x",
429
+ svgIcon: kendo_svg_icons_1.xIcon,
422
430
  look: "flat",
423
431
  type: "button"
424
432
  },
425
- icon: "close",
433
+ icon: "x",
434
+ svgIcon: kendo_svg_icons_1.xIcon,
426
435
  look: "flat",
427
436
  type: "button",
428
437
  onClick: _this.onFilterRemove,