@progress/kendo-vue-data-tools 3.7.4-dev.202212020747 → 3.7.4-dev.202301091431

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 (123) hide show
  1. package/README.md +1 -1
  2. package/dist/cdn/js/kendo-vue-data-tools.js +1 -1
  3. package/dist/es/cells/FilterCell.js +35 -21
  4. package/dist/es/columnmenu/ColumnMenu.js +9 -3
  5. package/dist/es/columnmenu/ColumnMenuCheckboxFilter.js +10 -3
  6. package/dist/es/columnmenu/ColumnMenuItem.js +3 -3
  7. package/dist/es/columnmenu/ColumnMenuSort.js +8 -8
  8. package/dist/es/drag/ColumnDraggable.js +6 -2
  9. package/dist/es/drag/DragClue.js +6 -2
  10. package/dist/es/filter/Expression.js +17 -8
  11. package/dist/es/filter/Filter.js +20 -4
  12. package/dist/es/filter/GroupFilters.js +10 -2
  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 +9 -6
  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 +2 -0
  19. package/dist/es/header/HeaderRow.js +78 -8
  20. package/dist/es/header/HeaderSelectionCell.d.ts +1 -0
  21. package/dist/es/header/HeaderSelectionCell.js +43 -13
  22. package/dist/es/header/HeaderTdElement.d.ts +46 -0
  23. package/dist/es/header/HeaderTdElement.js +92 -0
  24. package/dist/es/header/HeaderThElement.d.ts +8 -1
  25. package/dist/es/header/HeaderThElement.js +10 -2
  26. package/dist/es/header/main.d.ts +1 -0
  27. package/dist/es/header/main.js +1 -0
  28. package/dist/es/interfaces/FilterCellProps.d.ts +12 -0
  29. package/dist/es/messages/main.d.ts +5 -0
  30. package/dist/es/messages/main.js +5 -0
  31. package/dist/es/package-metadata.js +1 -1
  32. package/dist/es/pager/Pager.d.ts +13 -1
  33. package/dist/es/pager/Pager.js +66 -28
  34. package/dist/es/pager/PagerInput.d.ts +9 -1
  35. package/dist/es/pager/PagerInput.js +16 -2
  36. package/dist/es/pager/PagerNavigationButton.d.ts +13 -0
  37. package/dist/es/pager/PagerNavigationButton.js +31 -22
  38. package/dist/es/pager/PagerNumericButtons.d.ts +5 -1
  39. package/dist/es/pager/PagerNumericButtons.js +61 -27
  40. package/dist/es/pager/PagerPageSizes.d.ts +1 -0
  41. package/dist/es/pager/PagerPageSizes.js +3 -0
  42. package/dist/es/selection/utils.js +6 -8
  43. package/dist/esm/cells/FilterCell.js +35 -21
  44. package/dist/esm/columnmenu/ColumnMenu.js +9 -3
  45. package/dist/esm/columnmenu/ColumnMenuCheckboxFilter.js +10 -3
  46. package/dist/esm/columnmenu/ColumnMenuItem.js +3 -3
  47. package/dist/esm/columnmenu/ColumnMenuSort.js +8 -8
  48. package/dist/esm/drag/ColumnDraggable.js +6 -2
  49. package/dist/esm/drag/DragClue.js +6 -2
  50. package/dist/esm/filter/Expression.js +17 -8
  51. package/dist/esm/filter/Filter.js +20 -4
  52. package/dist/esm/filter/GroupFilters.js +10 -2
  53. package/dist/esm/filter/GroupToolbar.js +33 -8
  54. package/dist/esm/header/FilterRow.d.ts +1 -0
  55. package/dist/esm/header/FilterRow.js +9 -6
  56. package/dist/esm/header/Header.d.ts +1 -0
  57. package/dist/esm/header/Header.js +12 -2
  58. package/dist/esm/header/HeaderRow.d.ts +2 -0
  59. package/dist/esm/header/HeaderRow.js +78 -8
  60. package/dist/esm/header/HeaderSelectionCell.d.ts +1 -0
  61. package/dist/esm/header/HeaderSelectionCell.js +43 -13
  62. package/dist/esm/header/HeaderTdElement.d.ts +46 -0
  63. package/dist/esm/header/HeaderTdElement.js +92 -0
  64. package/dist/esm/header/HeaderThElement.d.ts +8 -1
  65. package/dist/esm/header/HeaderThElement.js +10 -2
  66. package/dist/esm/header/main.d.ts +1 -0
  67. package/dist/esm/header/main.js +1 -0
  68. package/dist/esm/interfaces/FilterCellProps.d.ts +12 -0
  69. package/dist/esm/messages/main.d.ts +5 -0
  70. package/dist/esm/messages/main.js +5 -0
  71. package/dist/esm/package-metadata.js +1 -1
  72. package/dist/esm/pager/Pager.d.ts +13 -1
  73. package/dist/esm/pager/Pager.js +66 -28
  74. package/dist/esm/pager/PagerInput.d.ts +9 -1
  75. package/dist/esm/pager/PagerInput.js +16 -2
  76. package/dist/esm/pager/PagerNavigationButton.d.ts +13 -0
  77. package/dist/esm/pager/PagerNavigationButton.js +31 -22
  78. package/dist/esm/pager/PagerNumericButtons.d.ts +5 -1
  79. package/dist/esm/pager/PagerNumericButtons.js +61 -27
  80. package/dist/esm/pager/PagerPageSizes.d.ts +1 -0
  81. package/dist/esm/pager/PagerPageSizes.js +3 -0
  82. package/dist/esm/selection/utils.js +6 -8
  83. package/dist/npm/cells/FilterCell.js +34 -20
  84. package/dist/npm/columnmenu/ColumnMenu.js +8 -2
  85. package/dist/npm/columnmenu/ColumnMenuCheckboxFilter.js +9 -2
  86. package/dist/npm/columnmenu/ColumnMenuItem.js +2 -2
  87. package/dist/npm/columnmenu/ColumnMenuSort.js +8 -8
  88. package/dist/npm/drag/ColumnDraggable.js +6 -2
  89. package/dist/npm/drag/DragClue.js +6 -2
  90. package/dist/npm/filter/Expression.js +17 -8
  91. package/dist/npm/filter/Filter.js +20 -4
  92. package/dist/npm/filter/GroupFilters.js +10 -2
  93. package/dist/npm/filter/GroupToolbar.js +33 -8
  94. package/dist/npm/header/FilterRow.d.ts +1 -0
  95. package/dist/npm/header/FilterRow.js +9 -6
  96. package/dist/npm/header/Header.d.ts +1 -0
  97. package/dist/npm/header/Header.js +11 -1
  98. package/dist/npm/header/HeaderRow.d.ts +2 -0
  99. package/dist/npm/header/HeaderRow.js +77 -7
  100. package/dist/npm/header/HeaderSelectionCell.d.ts +1 -0
  101. package/dist/npm/header/HeaderSelectionCell.js +42 -12
  102. package/dist/npm/header/HeaderTdElement.d.ts +46 -0
  103. package/dist/npm/header/HeaderTdElement.js +99 -0
  104. package/dist/npm/header/HeaderThElement.d.ts +8 -1
  105. package/dist/npm/header/HeaderThElement.js +10 -2
  106. package/dist/npm/header/main.d.ts +1 -0
  107. package/dist/npm/header/main.js +1 -0
  108. package/dist/npm/interfaces/FilterCellProps.d.ts +12 -0
  109. package/dist/npm/messages/main.d.ts +5 -0
  110. package/dist/npm/messages/main.js +6 -1
  111. package/dist/npm/package-metadata.js +1 -1
  112. package/dist/npm/pager/Pager.d.ts +13 -1
  113. package/dist/npm/pager/Pager.js +65 -27
  114. package/dist/npm/pager/PagerInput.d.ts +9 -1
  115. package/dist/npm/pager/PagerInput.js +16 -2
  116. package/dist/npm/pager/PagerNavigationButton.d.ts +13 -0
  117. package/dist/npm/pager/PagerNavigationButton.js +31 -22
  118. package/dist/npm/pager/PagerNumericButtons.d.ts +5 -1
  119. package/dist/npm/pager/PagerNumericButtons.js +61 -27
  120. package/dist/npm/pager/PagerPageSizes.d.ts +1 -0
  121. package/dist/npm/pager/PagerPageSizes.js +3 -0
  122. package/dist/npm/selection/utils.js +5 -7
  123. package/package.json +12 -11
@@ -7,11 +7,12 @@ var inject = allVue.inject;
7
7
  import { Button } from '@progress/kendo-vue-buttons';
8
8
  import { messages, columnMenuFilterClearButton as filterClearButton, columnMenuFilterChooseOperator as filterChooseOperator, filterTextFilterAriaLabel, filterEnumFilterDropdownAriaLabel, filterDateFilterAriaLabel, filterNumericFilterAriaLabel, filterDropDownOperatorAriaLabel } from '../messages/main';
9
9
  import { DropDownList } from '@progress/kendo-vue-dropdowns';
10
- import { NumericTextBox } from '@progress/kendo-vue-inputs';
10
+ import { NumericTextBox, Input } from '@progress/kendo-vue-inputs';
11
11
  import { DatePicker } from '@progress/kendo-vue-dateinputs';
12
12
  import { provideLocalizationService } from '@progress/kendo-vue-intl';
13
13
  import { cellBoolDropdownChange, cellInputChange, cellOperatorChange } from '../filterCommon';
14
14
  import { templateRendering, getListeners, getTemplate } from '@progress/kendo-vue-common';
15
+ import { filterClearIcon } from '@progress/kendo-svg-icons';
15
16
  /**
16
17
  * @hidden
17
18
  */
@@ -34,7 +35,8 @@ var FilterCellVue2 = {
34
35
  booleanValues: Array,
35
36
  onChange: Function,
36
37
  render: [String, Function, Object],
37
- ariaLabel: String
38
+ ariaLabel: String,
39
+ size: String
38
40
  },
39
41
  inject: {
40
42
  kendoLocalizationService: {
@@ -85,6 +87,7 @@ var FilterCellVue2 = {
85
87
  render: function render(createElement) {
86
88
  var _this = this;
87
89
  var h = gh || createElement;
90
+ var size = this.$props.size;
88
91
  var ls = provideLocalizationService(this);
89
92
  var selectedOperator = this.$props.operators.find(function (item) {
90
93
  return item.operator === _this.$props.operator;
@@ -103,6 +106,7 @@ var FilterCellVue2 = {
103
106
  value: selectedOperator,
104
107
  attrs: this.v3 ? undefined : {
105
108
  value: selectedOperator,
109
+ size: size,
106
110
  iconClassName: "k-i-filter k-button-icon",
107
111
  "data-items": this.$props.operators,
108
112
  textField: "text",
@@ -112,6 +116,7 @@ var FilterCellVue2 = {
112
116
  },
113
117
  "aria-label": this.ariaLabel || ls.toLanguageString(filterDropDownOperatorAriaLabel, messages[filterDropDownOperatorAriaLabel])
114
118
  },
119
+ size: size,
115
120
  "class": "k-dropdown-operator",
116
121
  iconClassName: "k-i-filter k-button-icon",
117
122
  "data-items": this.$props.operators,
@@ -131,12 +136,14 @@ var FilterCellVue2 = {
131
136
  return (
132
137
  // @ts-ignore
133
138
  h(NumericTextBox, {
134
- value: value,
139
+ size: size,
135
140
  attrs: this.v3 ? undefined : {
141
+ size: size,
136
142
  value: value,
137
143
  title: this.$props.title,
138
144
  "aria-label": this.ariaLabel || ls.toLanguageString(filterNumericFilterAriaLabel, messages[filterNumericFilterAriaLabel])
139
145
  },
146
+ value: value,
140
147
  onChange: function onChange(e) {
141
148
  _this.inputChange(e.value, e.event);
142
149
  },
@@ -153,12 +160,14 @@ var FilterCellVue2 = {
153
160
  return (
154
161
  // @ts-ignore
155
162
  h(DatePicker, {
156
- value: value,
163
+ size: size,
157
164
  attrs: this.v3 ? undefined : {
165
+ size: size,
158
166
  value: value,
159
167
  title: this.$props.title,
160
168
  "aria-label": this.ariaLabel || ls.toLanguageString(filterDateFilterAriaLabel, messages[filterDateFilterAriaLabel])
161
169
  },
170
+ value: value,
162
171
  onChange: function onChange(e) {
163
172
  _this.inputChange(e.value, e);
164
173
  },
@@ -180,10 +189,9 @@ var FilterCellVue2 = {
180
189
  on: this.v3 ? undefined : {
181
190
  "change": this.boolDropdownChange
182
191
  },
183
- value: booleanValues.find(function (item) {
184
- return item.operator === (value !== null ? value : '');
185
- }),
192
+ size: size,
186
193
  attrs: this.v3 ? undefined : {
194
+ size: size,
187
195
  value: booleanValues.find(function (item) {
188
196
  return item.operator === (value !== null ? value : '');
189
197
  }),
@@ -192,6 +200,9 @@ var FilterCellVue2 = {
192
200
  title: this.$props.title,
193
201
  "aria-label": this.ariaLabel || ls.toLanguageString(filterEnumFilterDropdownAriaLabel, messages[filterEnumFilterDropdownAriaLabel])
194
202
  },
203
+ value: booleanValues.find(function (item) {
204
+ return item.operator === (value !== null ? value : '');
205
+ }),
195
206
  "data-items": booleanValues,
196
207
  textField: "text",
197
208
  title: this.$props.title,
@@ -199,14 +210,15 @@ var FilterCellVue2 = {
199
210
  })
200
211
  );
201
212
  default:
202
- return h("span", {
203
- "class": "k-textbox k-input k-input-md k-rounded-md k-input-solid"
204
- }, [h("input", {
205
- "class": "k-input-inner",
206
- value: this.v3 ? value || '' : null,
207
- domProps: this.v3 ? undefined : {
208
- "value": value || ''
213
+ return h(Input, {
214
+ size: size,
215
+ attrs: this.v3 ? undefined : {
216
+ size: size,
217
+ value: value || '',
218
+ title: this.$props.title,
219
+ "aria-label": this.ariaLabel || ls.toLanguageString(filterTextFilterAriaLabel, messages[filterTextFilterAriaLabel])
209
220
  },
221
+ value: value || '',
210
222
  onInput: function onInput(e) {
211
223
  _this.inputChange(e.target.value, e);
212
224
  },
@@ -216,28 +228,30 @@ var FilterCellVue2 = {
216
228
  }
217
229
  },
218
230
  title: this.$props.title,
219
- attrs: this.v3 ? undefined : {
220
- title: this.$props.title,
221
- "aria-label": this.ariaLabel || ls.toLanguageString(filterTextFilterAriaLabel, messages[filterTextFilterAriaLabel])
222
- },
223
231
  "aria-label": this.ariaLabel || ls.toLanguageString(filterTextFilterAriaLabel, messages[filterTextFilterAriaLabel])
224
- })]);
232
+ });
225
233
  }
226
234
  };
227
235
  var defaultRendering = h("div", {
228
236
  "class": "k-filtercell"
229
- }, [h("span", [filterComponent.call(this, this.$props.filterType, this.$props.value), h("div", {
237
+ }, [h("div", {
238
+ "class": "k-filtercell-wrapper"
239
+ }, [filterComponent.call(this, this.$props.filterType, this.$props.value), h("div", {
230
240
  "class": "k-filtercell-operator"
231
241
  }, [renderOperatorEditor.call(this),
232
242
  // @ts-ignore function children
233
243
  h(Button, {
234
- type: "button",
244
+ size: size,
235
245
  attrs: this.v3 ? undefined : {
246
+ size: size,
236
247
  type: "button",
237
248
  icon: 'filter-clear',
249
+ svgIcon: filterClearIcon,
238
250
  title: ls.toLanguageString(filterClearButton, messages[filterClearButton])
239
251
  },
252
+ type: "button",
240
253
  icon: 'filter-clear',
254
+ svgIcon: filterClearIcon,
241
255
  "class": {
242
256
  /* button is always visible if there is either value or operator */
243
257
  'k-disabled': !(!(this.$props.value === null || this.$props.value === '') || this.$props.operator)
@@ -4,8 +4,9 @@ var allVue = Vue;
4
4
  var gh = allVue.h;
5
5
  var isV3 = allVue.version && allVue.version[0] === '3';
6
6
  var inject = allVue.inject;
7
- import { guid, setRef } from '@progress/kendo-vue-common';
7
+ import { guid, Icon, setRef } from '@progress/kendo-vue-common';
8
8
  import { Popup } from '@progress/kendo-vue-popup';
9
+ import { moreVerticalIcon } from '@progress/kendo-svg-icons';
9
10
  import { ColumnMenuContent } from './ColumnMenuContent';
10
11
  import { tableKeyboardNavigationTools } from '../navigation/utils';
11
12
  import { provideLocalizationService } from '@progress/kendo-vue-intl';
@@ -133,8 +134,13 @@ var ColumnMenuVue2 = {
133
134
  on: this.v3 ? undefined : {
134
135
  "click": this.anchorClick
135
136
  }
136
- }, [h("span", {
137
- "class": 'k-icon k-i-more-vertical'
137
+ }, [h(Icon, {
138
+ name: 'more-vertical',
139
+ attrs: this.v3 ? undefined : {
140
+ name: 'more-vertical',
141
+ icon: moreVerticalIcon
142
+ },
143
+ icon: moreVerticalIcon
138
144
  })]),
139
145
  // @ts-ignore function children
140
146
  h(Popup, {
@@ -29,11 +29,12 @@ import { Button } from '@progress/kendo-vue-buttons';
29
29
  import { ColumnMenuItem } from './ColumnMenuItem';
30
30
  import { ColumnMenuItemGroup } from './ColumnMenuItemGroup';
31
31
  import { ColumnMenuItemContent } from './ColumnMenuItemContent';
32
+ import { searchIcon } from '@progress/kendo-svg-icons';
32
33
  import { Checkbox } from '@progress/kendo-vue-inputs';
33
34
  import { provideLocalizationService } from '@progress/kendo-vue-intl';
34
35
  import { messages, columnMenuFilterClearButton as filterClearButton, columnMenuFilterSubmitButton as filterSubmitButton, columnMenuFilterTitle as filterTitle, searchPlaceholder, filterCheckAll } from '../messages/main';
35
36
  import { filterBy } from '@progress/kendo-data-query';
36
- import { clone, getListeners, getTemplate, templateRendering, getNestedValue } from '@progress/kendo-vue-common';
37
+ import { clone, getListeners, getTemplate, templateRendering, getNestedValue, Icon } from '@progress/kendo-vue-common';
37
38
  /**
38
39
  * @hidden
39
40
  */
@@ -144,8 +145,14 @@ var ColumnMenuCheckboxFilterVue2 = {
144
145
  "class": "k-list-filter"
145
146
  }, [h("span", {
146
147
  "class": "k-textbox k-input k-input-md k-rounded-md k-input-solid"
147
- }, [h("span", {
148
- "class": "k-input-icon k-icon k-i-search"
148
+ }, [h(Icon, {
149
+ name: 'search',
150
+ attrs: this.v3 ? undefined : {
151
+ name: 'search',
152
+ icon: searchIcon
153
+ },
154
+ icon: searchIcon,
155
+ "class": "k-input-icon"
149
156
  }), h("input", {
150
157
  ref: 'searchBox',
151
158
  placeholder: localizationService.toLanguageString(searchPlaceholder, messages[searchPlaceholder]),
@@ -3,7 +3,7 @@ import * as Vue from 'vue';
3
3
  var allVue = Vue;
4
4
  var gh = allVue.h;
5
5
  var isV3 = allVue.version && allVue.version[0] === '3';
6
- import { Keys } from '@progress/kendo-vue-common';
6
+ import { Icon, Keys } from '@progress/kendo-vue-common';
7
7
  /**
8
8
  * @hidden
9
9
  */
@@ -49,8 +49,8 @@ var ColumnMenuItemVue2 = {
49
49
  },
50
50
  onClick: this.onClick,
51
51
  "class": "k-columnmenu-item ".concat(selected ? 'k-selected' : '')
52
- }, [iconClass && h("span", {
53
- "class": "k-icon ".concat(iconClass)
52
+ }, [iconClass && h(Icon, {
53
+ "class": iconClass
54
54
  }), title]);
55
55
  }
56
56
  };
@@ -166,10 +166,10 @@ var ColumnMenuSortVue2 = {
166
166
  title: localizationService.toLanguageString(sortAscending, messages[sortAscending]),
167
167
  attrs: _this.v3 ? undefined : {
168
168
  title: localizationService.toLanguageString(sortAscending, messages[sortAscending]),
169
- iconClass: 'k-i-sort-asc-sm',
169
+ iconClass: 'k-i-sort-asc-small',
170
170
  selected: sortedAsc(currentSortIndex, sort)
171
171
  },
172
- iconClass: 'k-i-sort-asc-sm',
172
+ iconClass: 'k-i-sort-asc-small',
173
173
  selected: sortedAsc(currentSortIndex, sort),
174
174
  onMenuitemclick: _this.onAscClick,
175
175
  on: _this.v3 ? undefined : {
@@ -181,10 +181,10 @@ var ColumnMenuSortVue2 = {
181
181
  title: localizationService.toLanguageString(sortDescending, messages[sortDescending]),
182
182
  attrs: _this.v3 ? undefined : {
183
183
  title: localizationService.toLanguageString(sortDescending, messages[sortDescending]),
184
- iconClass: 'k-i-sort-desc-sm',
184
+ iconClass: 'k-i-sort-desc-small',
185
185
  selected: sortedDesc(currentSortIndex, sort)
186
186
  },
187
- iconClass: 'k-i-sort-desc-sm',
187
+ iconClass: 'k-i-sort-desc-small',
188
188
  selected: sortedDesc(currentSortIndex, sort),
189
189
  onMenuitemclick: _this.onDescClick,
190
190
  on: _this.v3 ? undefined : {
@@ -195,10 +195,10 @@ var ColumnMenuSortVue2 = {
195
195
  title: localizationService.toLanguageString(sortAscending, messages[sortAscending]),
196
196
  attrs: _this.v3 ? undefined : {
197
197
  title: localizationService.toLanguageString(sortAscending, messages[sortAscending]),
198
- iconClass: 'k-i-sort-asc-sm',
198
+ iconClass: 'k-i-sort-asc-small',
199
199
  selected: sortedAsc(currentSortIndex, sort)
200
200
  },
201
- iconClass: 'k-i-sort-asc-sm',
201
+ iconClass: 'k-i-sort-asc-small',
202
202
  selected: sortedAsc(currentSortIndex, sort),
203
203
  onMenuitemclick: _this.onAscClick,
204
204
  on: _this.v3 ? undefined : {
@@ -208,10 +208,10 @@ var ColumnMenuSortVue2 = {
208
208
  title: localizationService.toLanguageString(sortDescending, messages[sortDescending]),
209
209
  attrs: _this.v3 ? undefined : {
210
210
  title: localizationService.toLanguageString(sortDescending, messages[sortDescending]),
211
- iconClass: 'k-i-sort-desc-sm',
211
+ iconClass: 'k-i-sort-desc-small',
212
212
  selected: sortedDesc(currentSortIndex, sort)
213
213
  },
214
- iconClass: 'k-i-sort-desc-sm',
214
+ iconClass: 'k-i-sort-desc-small',
215
215
  selected: sortedDesc(currentSortIndex, sort),
216
216
  onMenuitemclick: _this.onDescClick,
217
217
  on: _this.v3 ? undefined : {
@@ -57,8 +57,12 @@ var ColumnDraggableVue2 = {
57
57
  onRelease: this.onRelease,
58
58
  ref: 'draggable'
59
59
  }, this.v3 ? function () {
60
- return [h("tr", [defaultSlot])];
61
- } : [h("tr", [defaultSlot])])
60
+ return [h("tr", {
61
+ "class": 'k-table-row'
62
+ }, [defaultSlot])];
63
+ } : [h("tr", {
64
+ "class": 'k-table-row'
65
+ }, [defaultSlot])])
62
66
  );
63
67
  }
64
68
  };
@@ -3,6 +3,7 @@ import * as Vue from 'vue';
3
3
  var allVue = Vue;
4
4
  var gh = allVue.h;
5
5
  var isV3 = allVue.version && allVue.version[0] === '3';
6
+ import { Icon } from '@progress/kendo-vue-common';
6
7
  /**
7
8
  * @hidden
8
9
  */
@@ -38,8 +39,11 @@ var DragClueVue2 = {
38
39
  }
39
40
  }, [h("span", {
40
41
  "class": 'k-icon k-drag-status ' + this.status + ' k-icon-with-modifier'
41
- }, [h("span", {
42
- "class": "k-icon k-icon-modifier"
42
+ }, [h(Icon, {
43
+ name: "modifier",
44
+ attrs: this.v3 ? undefined : {
45
+ name: "modifier"
46
+ }
43
47
  })]), this.innerText]);
44
48
  }
45
49
  };
@@ -29,6 +29,7 @@ import { getTemplate } from '@progress/kendo-vue-common';
29
29
  import { Button, Toolbar, ToolbarItem } from '@progress/kendo-vue-buttons';
30
30
  import { DropDownList } from '@progress/kendo-vue-dropdowns';
31
31
  import { provideLocalizationService } from '@progress/kendo-vue-intl';
32
+ import { xIcon } from '@progress/kendo-svg-icons';
32
33
  import { unaryOperator, stringOperator } from './operators';
33
34
  import { messages, filterClose, filterExpressionDropdownAriaLabel, filterExpressionOperatorDropdownAriaLabel } from '../messages/main';
34
35
  import { TextFilter } from './filters/TextFilter';
@@ -273,11 +274,13 @@ var ExpressionVue2 = {
273
274
  title: locService.toLanguageString(filterClose, messages[filterClose]),
274
275
  attrs: _this.v3 ? undefined : {
275
276
  title: locService.toLanguageString(filterClose, messages[filterClose]),
276
- icon: "close",
277
+ icon: "x",
278
+ svgIcon: xIcon,
277
279
  look: "flat",
278
280
  type: "button"
279
281
  },
280
- icon: "close",
282
+ icon: "x",
283
+ svgIcon: xIcon,
281
284
  look: "flat",
282
285
  type: "button",
283
286
  onClick: _this.onFilterRemove,
@@ -289,11 +292,13 @@ var ExpressionVue2 = {
289
292
  title: locService.toLanguageString(filterClose, messages[filterClose]),
290
293
  attrs: _this.v3 ? undefined : {
291
294
  title: locService.toLanguageString(filterClose, messages[filterClose]),
292
- icon: "close",
295
+ icon: "x",
296
+ svgIcon: xIcon,
293
297
  look: "flat",
294
298
  type: "button"
295
299
  },
296
- icon: "close",
300
+ icon: "x",
301
+ svgIcon: xIcon,
297
302
  look: "flat",
298
303
  type: "button",
299
304
  onClick: _this.onFilterRemove,
@@ -396,11 +401,13 @@ var ExpressionVue2 = {
396
401
  title: locService.toLanguageString(filterClose, messages[filterClose]),
397
402
  attrs: _this.v3 ? undefined : {
398
403
  title: locService.toLanguageString(filterClose, messages[filterClose]),
399
- icon: "close",
404
+ icon: "x",
405
+ svgIcon: xIcon,
400
406
  look: "flat",
401
407
  type: "button"
402
408
  },
403
- icon: "close",
409
+ icon: "x",
410
+ svgIcon: xIcon,
404
411
  look: "flat",
405
412
  type: "button",
406
413
  onClick: _this.onFilterRemove,
@@ -412,11 +419,13 @@ var ExpressionVue2 = {
412
419
  title: locService.toLanguageString(filterClose, messages[filterClose]),
413
420
  attrs: _this.v3 ? undefined : {
414
421
  title: locService.toLanguageString(filterClose, messages[filterClose]),
415
- icon: "close",
422
+ icon: "x",
423
+ svgIcon: xIcon,
416
424
  look: "flat",
417
425
  type: "button"
418
426
  },
419
- icon: "close",
427
+ icon: "x",
428
+ svgIcon: xIcon,
420
429
  look: "flat",
421
430
  type: "button",
422
431
  onClick: _this.onFilterRemove,
@@ -19,6 +19,8 @@ import { GroupFilter } from './GroupFilters';
19
19
  import { GroupToolbar } from './GroupToolbar';
20
20
  import { validatePackage, templateRendering, getListeners } from '@progress/kendo-vue-common';
21
21
  import { packageMetadata } from '../package-metadata';
22
+ import { provideLocalizationService } from '@progress/kendo-vue-intl';
23
+ import { filterAriaLabel, messages } from '../messages/main';
22
24
  /**
23
25
  * @hidden
24
26
  */
@@ -45,6 +47,11 @@ var FilterVue2 = {
45
47
  value: Object,
46
48
  defaultGroupFilter: Object
47
49
  },
50
+ inject: {
51
+ kendoLocalizationService: {
52
+ default: null
53
+ }
54
+ },
48
55
  created: function created() {
49
56
  validatePackage(packageMetadata);
50
57
  },
@@ -67,6 +74,7 @@ var FilterVue2 = {
67
74
  }
68
75
  },
69
76
  render: function render(createElement) {
77
+ var locService = provideLocalizationService(this);
70
78
  var h = gh || createElement;
71
79
  var fields = this.$props.fields.map(function (field) {
72
80
  return __assign(__assign({}, field), {
@@ -76,13 +84,22 @@ var FilterVue2 = {
76
84
  return h("div", {
77
85
  "class": 'k-widget k-filter'
78
86
  }, [h("ul", {
79
- "class": "k-filter-container"
87
+ "class": "k-filter-container",
88
+ role: "tree",
89
+ attrs: this.v3 ? undefined : {
90
+ role: "tree",
91
+ ariaLabel: locService.toLanguageString(filterAriaLabel, messages[filterAriaLabel])
92
+ },
93
+ ariaLabel: locService.toLanguageString(filterAriaLabel, messages[filterAriaLabel])
80
94
  }, [h("li", {
81
- "class": "k-filter-group-main"
95
+ "class": "k-filter-group-main",
96
+ role: "treeitem",
97
+ attrs: this.v3 ? undefined : {
98
+ role: "treeitem"
99
+ }
82
100
  }, [
83
101
  // @ts-ignore function children
84
102
  h(GroupToolbar, {
85
- "class": "k-filter-group-main",
86
103
  filter: this.computedValue,
87
104
  attrs: this.v3 ? undefined : {
88
105
  filter: this.computedValue,
@@ -106,7 +123,6 @@ var FilterVue2 = {
106
123
  }),
107
124
  // @ts-ignore function children
108
125
  h(GroupFilter, {
109
- "class": "k-filter-group-main",
110
126
  filter: this.computedValue,
111
127
  attrs: this.v3 ? undefined : {
112
128
  filter: this.computedValue,
@@ -61,11 +61,19 @@ var GroupFilterVue2 = {
61
61
  filter = _a.filter,
62
62
  filterRender = _a.filterRender;
63
63
  return filter.filters.length > 0 ? h("ul", {
64
- "class": "k-filter-lines"
64
+ "class": "k-filter-lines",
65
+ role: "group",
66
+ attrs: this.v3 ? undefined : {
67
+ role: "group"
68
+ }
65
69
  }, [filter.filters.map(function (f, idx) {
66
70
  return h("li", {
67
71
  key: idx,
68
- "class": "k-filter-item"
72
+ "class": "k-filter-item",
73
+ role: "treeitem",
74
+ attrs: this.v3 ? undefined : {
75
+ role: "treeitem"
76
+ }
69
77
  }, [isCompositeFilterDescriptor(f) ? [
70
78
  // @ts-ignore
71
79
  h(GroupToolbar, {
@@ -28,6 +28,7 @@ import { Button, Toolbar, ToolbarItem, ButtonGroup } from '@progress/kendo-vue-b
28
28
  import { provideLocalizationService } from '@progress/kendo-vue-intl';
29
29
  import { stringOperator } from './operators';
30
30
  import { messages, filterAndLogic, filterOrLogic, filterAddExpression, filterAddGroup, filterClose } from '../messages/main';
31
+ import { filterAddExpressionIcon, filterAddGroupIcon, xIcon } from '@progress/kendo-svg-icons';
31
32
  /**
32
33
  * @hidden
33
34
  */
@@ -225,9 +226,11 @@ var GroupToolbarVue2 = {
225
226
  attrs: _this.v3 ? undefined : {
226
227
  title: locService.toLanguageString(filterAddExpression, messages[filterAddExpression]),
227
228
  icon: "filter-add-expression",
229
+ svgIcon: filterAddExpressionIcon,
228
230
  type: "button"
229
231
  },
230
232
  icon: "filter-add-expression",
233
+ svgIcon: filterAddExpressionIcon,
231
234
  type: "button",
232
235
  onClick: _this.onAddExpression,
233
236
  on: _this.v3 ? undefined : {
@@ -239,9 +242,11 @@ var GroupToolbarVue2 = {
239
242
  attrs: _this.v3 ? undefined : {
240
243
  title: locService.toLanguageString(filterAddExpression, messages[filterAddExpression]),
241
244
  icon: "filter-add-expression",
245
+ svgIcon: filterAddExpressionIcon,
242
246
  type: "button"
243
247
  },
244
248
  icon: "filter-add-expression",
249
+ svgIcon: filterAddExpressionIcon,
245
250
  type: "button",
246
251
  onClick: _this.onAddExpression,
247
252
  on: _this.v3 ? undefined : {
@@ -257,9 +262,11 @@ var GroupToolbarVue2 = {
257
262
  attrs: _this.v3 ? undefined : {
258
263
  title: locService.toLanguageString(filterAddGroup, messages[filterAddGroup]),
259
264
  icon: "filter-add-group",
265
+ svgIcon: filterAddGroupIcon,
260
266
  type: "button"
261
267
  },
262
268
  icon: "filter-add-group",
269
+ svgIcon: filterAddGroupIcon,
263
270
  type: "button",
264
271
  onClick: _this.onAddGroup,
265
272
  on: _this.v3 ? undefined : {
@@ -271,9 +278,11 @@ var GroupToolbarVue2 = {
271
278
  attrs: _this.v3 ? undefined : {
272
279
  title: locService.toLanguageString(filterAddGroup, messages[filterAddGroup]),
273
280
  icon: "filter-add-group",
281
+ svgIcon: filterAddGroupIcon,
274
282
  type: "button"
275
283
  },
276
284
  icon: "filter-add-group",
285
+ svgIcon: filterAddGroupIcon,
277
286
  type: "button",
278
287
  onClick: _this.onAddGroup,
279
288
  on: _this.v3 ? undefined : {
@@ -288,11 +297,13 @@ var GroupToolbarVue2 = {
288
297
  title: locService.toLanguageString(filterClose, messages[filterClose]),
289
298
  attrs: _this.v3 ? undefined : {
290
299
  title: locService.toLanguageString(filterClose, messages[filterClose]),
291
- icon: "close",
300
+ icon: "x",
301
+ svgIcon: xIcon,
292
302
  look: "flat",
293
303
  type: "button"
294
304
  },
295
- icon: "close",
305
+ icon: "x",
306
+ svgIcon: xIcon,
296
307
  look: "flat",
297
308
  type: "button",
298
309
  onClick: _this.onGroupRemove,
@@ -304,11 +315,13 @@ var GroupToolbarVue2 = {
304
315
  title: locService.toLanguageString(filterClose, messages[filterClose]),
305
316
  attrs: _this.v3 ? undefined : {
306
317
  title: locService.toLanguageString(filterClose, messages[filterClose]),
307
- icon: "close",
318
+ icon: "x",
319
+ svgIcon: xIcon,
308
320
  look: "flat",
309
321
  type: "button"
310
322
  },
311
- icon: "close",
323
+ icon: "x",
324
+ svgIcon: xIcon,
312
325
  look: "flat",
313
326
  type: "button",
314
327
  onClick: _this.onGroupRemove,
@@ -448,9 +461,11 @@ var GroupToolbarVue2 = {
448
461
  attrs: _this.v3 ? undefined : {
449
462
  title: locService.toLanguageString(filterAddExpression, messages[filterAddExpression]),
450
463
  icon: "filter-add-expression",
464
+ svgIcon: filterAddExpressionIcon,
451
465
  type: "button"
452
466
  },
453
467
  icon: "filter-add-expression",
468
+ svgIcon: filterAddExpressionIcon,
454
469
  type: "button",
455
470
  onClick: _this.onAddExpression,
456
471
  on: _this.v3 ? undefined : {
@@ -462,9 +477,11 @@ var GroupToolbarVue2 = {
462
477
  attrs: _this.v3 ? undefined : {
463
478
  title: locService.toLanguageString(filterAddExpression, messages[filterAddExpression]),
464
479
  icon: "filter-add-expression",
480
+ svgIcon: filterAddExpressionIcon,
465
481
  type: "button"
466
482
  },
467
483
  icon: "filter-add-expression",
484
+ svgIcon: filterAddExpressionIcon,
468
485
  type: "button",
469
486
  onClick: _this.onAddExpression,
470
487
  on: _this.v3 ? undefined : {
@@ -476,9 +493,11 @@ var GroupToolbarVue2 = {
476
493
  attrs: _this.v3 ? undefined : {
477
494
  title: locService.toLanguageString(filterAddGroup, messages[filterAddGroup]),
478
495
  icon: "filter-add-group",
496
+ svgIcon: filterAddGroupIcon,
479
497
  type: "button"
480
498
  },
481
499
  icon: "filter-add-group",
500
+ svgIcon: filterAddGroupIcon,
482
501
  type: "button",
483
502
  onClick: _this.onAddGroup,
484
503
  on: _this.v3 ? undefined : {
@@ -490,9 +509,11 @@ var GroupToolbarVue2 = {
490
509
  attrs: _this.v3 ? undefined : {
491
510
  title: locService.toLanguageString(filterAddGroup, messages[filterAddGroup]),
492
511
  icon: "filter-add-group",
512
+ svgIcon: filterAddGroupIcon,
493
513
  type: "button"
494
514
  },
495
515
  icon: "filter-add-group",
516
+ svgIcon: filterAddGroupIcon,
496
517
  type: "button",
497
518
  onClick: _this.onAddGroup,
498
519
  on: _this.v3 ? undefined : {
@@ -503,11 +524,13 @@ var GroupToolbarVue2 = {
503
524
  title: locService.toLanguageString(filterClose, messages[filterClose]),
504
525
  attrs: _this.v3 ? undefined : {
505
526
  title: locService.toLanguageString(filterClose, messages[filterClose]),
506
- icon: "close",
527
+ icon: "x",
528
+ svgIcon: xIcon,
507
529
  look: "flat",
508
530
  type: "button"
509
531
  },
510
- icon: "close",
532
+ icon: "x",
533
+ svgIcon: xIcon,
511
534
  look: "flat",
512
535
  type: "button",
513
536
  onClick: _this.onGroupRemove,
@@ -519,11 +542,13 @@ var GroupToolbarVue2 = {
519
542
  title: locService.toLanguageString(filterClose, messages[filterClose]),
520
543
  attrs: _this.v3 ? undefined : {
521
544
  title: locService.toLanguageString(filterClose, messages[filterClose]),
522
- icon: "close",
545
+ icon: "x",
546
+ svgIcon: xIcon,
523
547
  look: "flat",
524
548
  type: "button"
525
549
  },
526
- icon: "close",
550
+ icon: "x",
551
+ svgIcon: xIcon,
527
552
  look: "flat",
528
553
  type: "button",
529
554
  onClick: _this.onGroupRemove,
@@ -18,6 +18,7 @@ export interface FilterRowProps {
18
18
  cellRender?: any;
19
19
  isRtl?: boolean;
20
20
  ariaRowIndex?: number;
21
+ size?: string;
21
22
  }
22
23
  /**
23
24
  * @hidden