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

package/dist/esm/cells/FilterCell.js

@@ -7,11 +7,12 @@ var inject = allVue.inject;
 import { Button } from '@progress/kendo-vue-buttons';
 import { messages, columnMenuFilterClearButton as filterClearButton, columnMenuFilterChooseOperator as filterChooseOperator, filterTextFilterAriaLabel, filterEnumFilterDropdownAriaLabel, filterDateFilterAriaLabel, filterNumericFilterAriaLabel, filterDropDownOperatorAriaLabel } from '../messages/main.js';
 import { DropDownList } from '@progress/kendo-vue-dropdowns';
-import { NumericTextBox } from '@progress/kendo-vue-inputs';
+import { NumericTextBox, Input } from '@progress/kendo-vue-inputs';
 import { DatePicker } from '@progress/kendo-vue-dateinputs';
 import { provideLocalizationService } from '@progress/kendo-vue-intl';
 import { cellBoolDropdownChange, cellInputChange, cellOperatorChange } from '../filterCommon.js';
 import { templateRendering, getListeners, getTemplate } from '@progress/kendo-vue-common';
+import { filterClearIcon } from '@progress/kendo-svg-icons';
 /**
  * @hidden
  */
@@ -34,7 +35,8 @@ var FilterCellVue2 = {
     booleanValues: Array,
     onChange: Function,
     render: [String, Function, Object],
-    ariaLabel: String
+    ariaLabel: String,
+    size: String
   },
   inject: {
     kendoLocalizationService: {
@@ -85,6 +87,7 @@ var FilterCellVue2 = {
   render: function render(createElement) {
     var _this = this;
     var h = gh || createElement;
+    var size = this.$props.size;
     var ls = provideLocalizationService(this);
     var selectedOperator = this.$props.operators.find(function (item) {
       return item.operator === _this.$props.operator;
@@ -103,6 +106,7 @@ var FilterCellVue2 = {
           value: selectedOperator,
           attrs: this.v3 ? undefined : {
             value: selectedOperator,
+            size: size,
             iconClassName: "k-i-filter k-button-icon",
             "data-items": this.$props.operators,
             textField: "text",
@@ -112,6 +116,7 @@ var FilterCellVue2 = {
             },
             "aria-label": this.ariaLabel || ls.toLanguageString(filterDropDownOperatorAriaLabel, messages[filterDropDownOperatorAriaLabel])
           },
+          size: size,
           "class": "k-dropdown-operator",
           iconClassName: "k-i-filter k-button-icon",
           "data-items": this.$props.operators,
@@ -131,12 +136,14 @@ var FilterCellVue2 = {
           return (
             // @ts-ignore
             h(NumericTextBox, {
-              value: value,
+              size: size,
               attrs: this.v3 ? undefined : {
+                size: size,
                 value: value,
                 title: this.$props.title,
                 "aria-label": this.ariaLabel || ls.toLanguageString(filterNumericFilterAriaLabel, messages[filterNumericFilterAriaLabel])
               },
+              value: value,
               onChange: function onChange(e) {
                 _this.inputChange(e.value, e.event);
               },
@@ -153,12 +160,14 @@ var FilterCellVue2 = {
           return (
             // @ts-ignore
             h(DatePicker, {
-              value: value,
+              size: size,
               attrs: this.v3 ? undefined : {
+                size: size,
                 value: value,
                 title: this.$props.title,
                 "aria-label": this.ariaLabel || ls.toLanguageString(filterDateFilterAriaLabel, messages[filterDateFilterAriaLabel])
               },
+              value: value,
               onChange: function onChange(e) {
                 _this.inputChange(e.value, e);
               },
@@ -180,10 +189,9 @@ var FilterCellVue2 = {
               on: this.v3 ? undefined : {
                 "change": this.boolDropdownChange
               },
-              value: booleanValues.find(function (item) {
-                return item.operator === (value !== null ? value : '');
-              }),
+              size: size,
               attrs: this.v3 ? undefined : {
+                size: size,
                 value: booleanValues.find(function (item) {
                   return item.operator === (value !== null ? value : '');
                 }),
@@ -192,6 +200,9 @@ var FilterCellVue2 = {
                 title: this.$props.title,
                 "aria-label": this.ariaLabel || ls.toLanguageString(filterEnumFilterDropdownAriaLabel, messages[filterEnumFilterDropdownAriaLabel])
               },
+              value: booleanValues.find(function (item) {
+                return item.operator === (value !== null ? value : '');
+              }),
               "data-items": booleanValues,
               textField: "text",
               title: this.$props.title,
@@ -199,14 +210,15 @@ var FilterCellVue2 = {
             })
           );
         default:
-          return h("span", {
-            "class": "k-textbox k-input k-input-md k-rounded-md k-input-solid"
-          }, [h("input", {
-            "class": "k-input-inner",
-            value: this.v3 ? value || '' : null,
-            domProps: this.v3 ? undefined : {
-              "value": value || ''
+          return h(Input, {
+            size: size,
+            attrs: this.v3 ? undefined : {
+              size: size,
+              value: value || '',
+              title: this.$props.title,
+              "aria-label": this.ariaLabel || ls.toLanguageString(filterTextFilterAriaLabel, messages[filterTextFilterAriaLabel])
             },
+            value: value || '',
             onInput: function onInput(e) {
               _this.inputChange(e.target.value, e);
             },
@@ -216,28 +228,30 @@ var FilterCellVue2 = {
               }
             },
             title: this.$props.title,
-            attrs: this.v3 ? undefined : {
-              title: this.$props.title,
-              "aria-label": this.ariaLabel || ls.toLanguageString(filterTextFilterAriaLabel, messages[filterTextFilterAriaLabel])
-            },
             "aria-label": this.ariaLabel || ls.toLanguageString(filterTextFilterAriaLabel, messages[filterTextFilterAriaLabel])
-          })]);
+          });
       }
     };
     var defaultRendering = h("div", {
       "class": "k-filtercell"
-    }, [h("span", [filterComponent.call(this, this.$props.filterType, this.$props.value), h("div", {
+    }, [h("div", {
+      "class": "k-filtercell-wrapper"
+    }, [filterComponent.call(this, this.$props.filterType, this.$props.value), h("div", {
       "class": "k-filtercell-operator"
     }, [renderOperatorEditor.call(this),
     // @ts-ignore function children 
     h(Button, {
-      type: "button",
+      size: size,
       attrs: this.v3 ? undefined : {
+        size: size,
         type: "button",
         icon: 'filter-clear',
+        svgIcon: filterClearIcon,
         title: ls.toLanguageString(filterClearButton, messages[filterClearButton])
       },
+      type: "button",
       icon: 'filter-clear',
+      svgIcon: filterClearIcon,
       "class": {
         /* button is always visible if there is either value or operator */
         'k-disabled': !(!(this.$props.value === null || this.$props.value === '') || this.$props.operator)

package/dist/esm/columnmenu/ColumnMenu.js

@@ -6,6 +6,7 @@ var isV3 = allVue.version && allVue.version[0] === '3';
 var inject = allVue.inject;
 import { guid, Icon, setRef } from '@progress/kendo-vue-common';
 import { Popup } from '@progress/kendo-vue-popup';
+import { moreVerticalIcon } from '@progress/kendo-svg-icons';
 import { ColumnMenuContent } from './ColumnMenuContent.js';
 import { tableKeyboardNavigationTools } from '../navigation/utils.js';
 import { provideLocalizationService } from '@progress/kendo-vue-intl';
@@ -86,8 +87,8 @@ var ColumnMenuVue2 = {
     handleFocus: function handleFocus(_) {
       clearTimeout(this.blurTimeout);
     },
-    anchorClick: function anchorClick() {
-      var that = this;
+    anchorClick: function anchorClick(e) {
+      e.preventDefault();
       this.show = !this.show;
     },
     closeMenu: function closeMenu() {
@@ -136,8 +137,10 @@ var ColumnMenuVue2 = {
     }, [h(Icon, {
       name: 'more-vertical',
       attrs: this.v3 ? undefined : {
-        name: 'more-vertical'
-      }
+        name: 'more-vertical',
+        icon: moreVerticalIcon
+      },
+      icon: moreVerticalIcon
     })]),
     // @ts-ignore function children
     h(Popup, {

package/dist/esm/columnmenu/ColumnMenuCheckboxFilter.js

@@ -29,6 +29,7 @@ import { Button } from '@progress/kendo-vue-buttons';
 import { ColumnMenuItem } from './ColumnMenuItem.js';
 import { ColumnMenuItemGroup } from './ColumnMenuItemGroup.js';
 import { ColumnMenuItemContent } from './ColumnMenuItemContent.js';
+import { filterIcon, searchIcon } from '@progress/kendo-svg-icons';
 import { Checkbox } from '@progress/kendo-vue-inputs';
 import { provideLocalizationService } from '@progress/kendo-vue-intl';
 import { messages, columnMenuFilterClearButton as filterClearButton, columnMenuFilterSubmitButton as filterSubmitButton, columnMenuFilterTitle as filterTitle, searchPlaceholder, filterCheckAll } from '../messages/main.js';
@@ -147,8 +148,10 @@ var ColumnMenuCheckboxFilterVue2 = {
       }, [h(Icon, {
         name: 'search',
         attrs: this.v3 ? undefined : {
-          name: 'search'
+          name: 'search',
+          icon: searchIcon
         },
+        icon: searchIcon,
         "class": "k-input-icon"
       }), h("input", {
         ref: 'searchBox',
@@ -214,9 +217,11 @@ var ColumnMenuCheckboxFilterVue2 = {
           title: localizationService.toLanguageString(filterTitle, messages[filterTitle]),
           attrs: _this2.v3 ? undefined : {
             title: localizationService.toLanguageString(filterTitle, messages[filterTitle]),
-            iconClass: 'k-i-filter'
+            icon: 'filter',
+            svgIcon: filterIcon
           },
-          iconClass: 'k-i-filter',
+          icon: 'filter',
+          svgIcon: filterIcon,
           onClick: _this2.onFilterExpand,
           on: _this2.v3 ? undefined : {
             "click": _this2.onFilterExpand
@@ -375,9 +380,11 @@ var ColumnMenuCheckboxFilterVue2 = {
         title: localizationService.toLanguageString(filterTitle, messages[filterTitle]),
         attrs: _this2.v3 ? undefined : {
           title: localizationService.toLanguageString(filterTitle, messages[filterTitle]),
-          iconClass: 'k-i-filter'
+          icon: 'filter',
+          svgIcon: filterIcon
         },
-        iconClass: 'k-i-filter',
+        icon: 'filter',
+        svgIcon: filterIcon,
         onClick: _this2.onFilterExpand,
         on: _this2.v3 ? undefined : {
           "click": _this2.onFilterExpand

package/dist/esm/columnmenu/ColumnMenuFilter.js

@@ -37,6 +37,7 @@ import { messages, columnMenuFilterClearButton, columnMenuFilterSubmitButton, co
 import { ColumnMenuFilterCell } from './ColumnMenuFilterCell.js';
 import { ColumnMenuFilterOperators } from './ColumnMenuFilterOperators.js';
 import { DropDownList } from '@progress/kendo-vue-dropdowns';
+import { filterIcon } from '@progress/kendo-svg-icons';
 /**
  * @hidden
  */
@@ -352,9 +353,11 @@ var ColumnMenuFilterVue2 = {
           title: localizationService.toLanguageString(columnMenuFilterTitle, messages[columnMenuFilterTitle]),
           attrs: _this2.v3 ? undefined : {
             title: localizationService.toLanguageString(columnMenuFilterTitle, messages[columnMenuFilterTitle]),
-            iconClass: 'k-i-filter'
+            icon: 'filter',
+            svgIcon: filterIcon
           },
-          iconClass: 'k-i-filter',
+          icon: 'filter',
+          svgIcon: filterIcon,
           onMenuitemclick: _this2.onFilterExpand,
           on: _this2.v3 ? undefined : {
             "menuitemclick": _this2.onFilterExpand
@@ -641,9 +644,11 @@ var ColumnMenuFilterVue2 = {
         title: localizationService.toLanguageString(columnMenuFilterTitle, messages[columnMenuFilterTitle]),
         attrs: _this2.v3 ? undefined : {
           title: localizationService.toLanguageString(columnMenuFilterTitle, messages[columnMenuFilterTitle]),
-          iconClass: 'k-i-filter'
+          icon: 'filter',
+          svgIcon: filterIcon
         },
-        iconClass: 'k-i-filter',
+        icon: 'filter',
+        svgIcon: filterIcon,
         onMenuitemclick: _this2.onFilterExpand,
         on: _this2.v3 ? undefined : {
           "menuitemclick": _this2.onFilterExpand

package/dist/esm/columnmenu/ColumnMenuItem.d.ts

@@ -3,6 +3,7 @@ declare type DefaultData<V> = object | ((this: V) => {});
 declare type DefaultMethods<V> = {
     [key: string]: (this: V, ...args: any[]) => any;
 };
+import { SVGIcon } from '@progress/kendo-svg-icons';
 /**
  * The props of the ColumnMenuItem component.
  */
@@ -19,6 +20,14 @@ export interface ColumnMenuItemProps {
      * The class of the icon rendered next to the title.
      */
     iconClass: string;
+    /**
+     * Defines the name for the icon.
+     */
+    icon?: string;
+    /**
+     * Defines the svg icon in a Kendo UI for Vue theme.
+     */
+    svgIcon?: SVGIcon;
     /**
      * The selected state of the component.
      */

package/dist/esm/columnmenu/ColumnMenuItem.js

@@ -11,6 +11,8 @@ var ColumnMenuItemVue2 = {
   props: {
     title: String,
     iconClass: String,
+    icon: String,
+    svgIcon: Object,
     selected: Boolean
   },
   methods: {
@@ -36,7 +38,9 @@ var ColumnMenuItemVue2 = {
     var _a = this.$props,
       title = _a.title,
       iconClass = _a.iconClass,
-      selected = _a.selected;
+      selected = _a.selected,
+      icon = _a.icon,
+      svgIcon = _a.svgIcon;
     return h("div", {
       tabindex: 0,
       attrs: this.v3 ? undefined : {
@@ -51,6 +55,13 @@ var ColumnMenuItemVue2 = {
       "class": "k-columnmenu-item ".concat(selected ? 'k-selected' : '')
     }, [iconClass && h(Icon, {
       "class": iconClass
+    }), (icon || svgIcon) && h(Icon, {
+      name: icon,
+      attrs: this.v3 ? undefined : {
+        name: icon,
+        svg: svgIcon
+      },
+      svg: svgIcon
     }), title]);
   }
 };

package/dist/esm/columnmenu/ColumnMenuSort.js

@@ -10,6 +10,7 @@ import { normalize } from '../interfaces/SortSettings.js';
 import { provideLocalizationService } from '@progress/kendo-vue-intl';
 import { messages, columnMenuSortAscending as sortAscending, columnMenuSortDescending as sortDescending } from '../messages/main.js';
 import { hasListener } from '@progress/kendo-vue-common';
+import { sortAscSmallIcon, sortDescSmallIcon } from '@progress/kendo-svg-icons';
 /**
  * @hidden
  */
@@ -166,10 +167,12 @@ var ColumnMenuSortVue2 = {
           title: localizationService.toLanguageString(sortAscending, messages[sortAscending]),
           attrs: _this.v3 ? undefined : {
             title: localizationService.toLanguageString(sortAscending, messages[sortAscending]),
-            iconClass: 'k-i-sort-asc-sm',
+            icon: 'sort-asc-small',
+            scgIcon: sortAscSmallIcon,
             selected: sortedAsc(currentSortIndex, sort)
           },
-          iconClass: 'k-i-sort-asc-sm',
+          icon: 'sort-asc-small',
+          scgIcon: sortAscSmallIcon,
           selected: sortedAsc(currentSortIndex, sort),
           onMenuitemclick: _this.onAscClick,
           on: _this.v3 ? undefined : {
@@ -181,10 +184,12 @@ var ColumnMenuSortVue2 = {
           title: localizationService.toLanguageString(sortDescending, messages[sortDescending]),
           attrs: _this.v3 ? undefined : {
             title: localizationService.toLanguageString(sortDescending, messages[sortDescending]),
-            iconClass: 'k-i-sort-desc-sm',
+            icon: 'sort-desc-small',
+            svgIcon: sortDescSmallIcon,
             selected: sortedDesc(currentSortIndex, sort)
           },
-          iconClass: 'k-i-sort-desc-sm',
+          icon: 'sort-desc-small',
+          svgIcon: sortDescSmallIcon,
           selected: sortedDesc(currentSortIndex, sort),
           onMenuitemclick: _this.onDescClick,
           on: _this.v3 ? undefined : {
@@ -195,10 +200,12 @@ var ColumnMenuSortVue2 = {
         title: localizationService.toLanguageString(sortAscending, messages[sortAscending]),
         attrs: _this.v3 ? undefined : {
           title: localizationService.toLanguageString(sortAscending, messages[sortAscending]),
-          iconClass: 'k-i-sort-asc-sm',
+          icon: 'sort-asc-small',
+          scgIcon: sortAscSmallIcon,
           selected: sortedAsc(currentSortIndex, sort)
         },
-        iconClass: 'k-i-sort-asc-sm',
+        icon: 'sort-asc-small',
+        scgIcon: sortAscSmallIcon,
         selected: sortedAsc(currentSortIndex, sort),
         onMenuitemclick: _this.onAscClick,
         on: _this.v3 ? undefined : {
@@ -208,10 +215,12 @@ var ColumnMenuSortVue2 = {
         title: localizationService.toLanguageString(sortDescending, messages[sortDescending]),
         attrs: _this.v3 ? undefined : {
           title: localizationService.toLanguageString(sortDescending, messages[sortDescending]),
-          iconClass: 'k-i-sort-desc-sm',
+          icon: 'sort-desc-small',
+          svgIcon: sortDescSmallIcon,
           selected: sortedDesc(currentSortIndex, sort)
         },
-        iconClass: 'k-i-sort-desc-sm',
+        icon: 'sort-desc-small',
+        svgIcon: sortDescSmallIcon,
         selected: sortedDesc(currentSortIndex, sort),
         onMenuitemclick: _this.onDescClick,
         on: _this.v3 ? undefined : {

package/dist/esm/drag/ColumnDraggable.js

@@ -57,8 +57,12 @@ var ColumnDraggableVue2 = {
         onRelease: this.onRelease,
         ref: 'draggable'
       }, this.v3 ? function () {
-        return [h("tr", [defaultSlot])];
-      } : [h("tr", [defaultSlot])])
+        return [h("tr", {
+          "class": 'k-table-row'
+        }, [defaultSlot])];
+      } : [h("tr", {
+        "class": 'k-table-row'
+      }, [defaultSlot])])
     );
   }
 };

package/dist/esm/drag/CommonDragLogic.d.ts

@@ -28,6 +28,7 @@ export declare class CommonDragLogic {
     dragHandler: (event: any, element: HTMLElement) => void;
     releaseHandler: (event: any) => void;
     private getColumnIndex;
+    private isTargetGroupingContainer;
     private getGroupIndex;
     private isValid;
     private updateDragElementClue;

package/dist/esm/drag/CommonDragLogic.js

@@ -16,7 +16,7 @@ var CommonDragLogic = /** @class */ (function () {
         this.currentGroup = -1;
         this.groupPanelDivElement = null;
         this.refGroupPanelDiv = function (e) {
-            _this.groupPanelDivElement = e;
+            _this.groupPanelDivElement = e.children ? e.children[0] : e;
         };
         this.refDropElementClue = function (e) {
             _this.dropElementClue = e;
@@ -52,10 +52,12 @@ var CommonDragLogic = /** @class */ (function () {
                 return;
             }
             _this.currentColumn = _this.getColumnIndex(event, element);
-            _this.currentGroup = _this.getGroupIndex(event);
-            if (_this.groupPanelDivElement && _this.startGroup >= 0) {
-                _this.currentGroup = Math.min(_this.currentGroup, _this.groupPanelDivElement.children.length - 2);
-            }
+            var groupPanelChildren = _this.groupPanelDivElement.children;
+            _this.currentGroup = _this.isTargetGroupingContainer(event)
+                ? groupPanelChildren && groupPanelChildren.length
+                    ? groupPanelChildren.length - 1
+                    : 0
+                : _this.getGroupIndex(event);
             var invalidIndex = !_this.isValid();
             if (invalidIndex) {
                 _this.currentColumn = -1;
@@ -63,7 +65,9 @@ var CommonDragLogic = /** @class */ (function () {
             }
             var targetElement = (_this.currentColumn >= 0) ?
                 element.children[_this.columns[_this.currentColumn].index] :
-                _this.groupPanelDivElement && _this.groupPanelDivElement.children[_this.currentGroup];
+                _this.isTargetGroupingContainer(event)
+                    ? event.originalEvent.target
+                    : _this.groupPanelDivElement && _this.groupPanelDivElement.children[_this.currentGroup];
             _this.updateDragElementClue(event, element, targetElement, invalidIndex);
             _this.updateDropElementClue(event, element, targetElement, invalidIndex);
         };
@@ -118,6 +122,10 @@ var CommonDragLogic = /** @class */ (function () {
         }
         return -1;
     };
+    CommonDragLogic.prototype.isTargetGroupingContainer = function (event) {
+        var target = event.originalEvent.target;
+        return target.className.indexOf('k-grouping-drop-container') !== -1;
+    };
     CommonDragLogic.prototype.getGroupIndex = function (event) {
         return getIndex(event, this.groupPanelDivElement);
     };
@@ -151,7 +159,7 @@ var CommonDragLogic = /** @class */ (function () {
         this.dragElementClue.top = (event.pageY + 10);
         this.dragElementClue.left = event.pageX;
         this.dragElementClue.innerText = innerText;
-        this.dragElementClue.status = (invalidIndex || !targetElement) ? 'k-i-cancel' : 'k-i-add';
+        this.dragElementClue.status = (invalidIndex || !targetElement) ? 'k-i-cancel' : 'k-i-plus';
     };
     CommonDragLogic.prototype.updateDropElementClue = function (event, element, targetElement, invalidIndex) {
         if (!this.dropElementClue) {
@@ -162,15 +170,18 @@ var CommonDragLogic = /** @class */ (function () {
             return;
         }
         var rect = targetElement.getBoundingClientRect();
+        var groupElement = targetElement.closest('.k-grouping-header');
+        var rectParent = (groupElement || targetElement).getBoundingClientRect();
         var left = rect.left + event.pageX - event.clientX - 6;
-        if (this.currentColumn > this.startColumn || this.currentGroup > this.startGroup && this.startGroup !== -1) {
+        if (!this.isTargetGroupingContainer(event) && (this.currentColumn > this.startColumn
+            || this.currentGroup > this.startGroup && this.startGroup !== -1)) {
             left += rect.width;
         }
-        var top = rect.top + event.pageY - event.clientY;
+        var top = rectParent.top + event.pageY - event.clientY;
         this.dropElementClue.visible = true;
         this.dropElementClue.top = top;
         this.dropElementClue.left = left;
-        this.dropElementClue.height = (this.currentColumn >= 0) ? element.clientHeight : rect.height;
+        this.dropElementClue.height = (this.currentColumn >= 0) ? element.clientHeight : rectParent.height;
     };
     return CommonDragLogic;
 }());

package/dist/esm/filter/Expression.js

@@ -29,6 +29,7 @@ import { getTemplate } from '@progress/kendo-vue-common';
 import { Button, Toolbar, ToolbarItem } from '@progress/kendo-vue-buttons';
 import { DropDownList } from '@progress/kendo-vue-dropdowns';
 import { provideLocalizationService } from '@progress/kendo-vue-intl';
+import { xIcon } from '@progress/kendo-svg-icons';
 import { unaryOperator, stringOperator } from './operators.js';
 import { messages, filterClose, filterExpressionDropdownAriaLabel, filterExpressionOperatorDropdownAriaLabel } from '../messages/main.js';
 import { TextFilter } from './filters/TextFilter.js';
@@ -273,11 +274,13 @@ var ExpressionVue2 = {
           title: locService.toLanguageString(filterClose, messages[filterClose]),
           attrs: _this.v3 ? undefined : {
             title: locService.toLanguageString(filterClose, messages[filterClose]),
-            icon: "close",
+            icon: "x",
+            svgIcon: xIcon,
             look: "flat",
             type: "button"
           },
-          icon: "close",
+          icon: "x",
+          svgIcon: xIcon,
           look: "flat",
           type: "button",
           onClick: _this.onFilterRemove,
@@ -289,11 +292,13 @@ var ExpressionVue2 = {
         title: locService.toLanguageString(filterClose, messages[filterClose]),
         attrs: _this.v3 ? undefined : {
           title: locService.toLanguageString(filterClose, messages[filterClose]),
-          icon: "close",
+          icon: "x",
+          svgIcon: xIcon,
           look: "flat",
           type: "button"
         },
-        icon: "close",
+        icon: "x",
+        svgIcon: xIcon,
         look: "flat",
         type: "button",
         onClick: _this.onFilterRemove,
@@ -396,11 +401,13 @@ var ExpressionVue2 = {
         title: locService.toLanguageString(filterClose, messages[filterClose]),
         attrs: _this.v3 ? undefined : {
           title: locService.toLanguageString(filterClose, messages[filterClose]),
-          icon: "close",
+          icon: "x",
+          svgIcon: xIcon,
           look: "flat",
           type: "button"
         },
-        icon: "close",
+        icon: "x",
+        svgIcon: xIcon,
         look: "flat",
         type: "button",
         onClick: _this.onFilterRemove,
@@ -412,11 +419,13 @@ var ExpressionVue2 = {
       title: locService.toLanguageString(filterClose, messages[filterClose]),
       attrs: _this.v3 ? undefined : {
         title: locService.toLanguageString(filterClose, messages[filterClose]),
-        icon: "close",
+        icon: "x",
+        svgIcon: xIcon,
         look: "flat",
         type: "button"
       },
-      icon: "close",
+      icon: "x",
+      svgIcon: xIcon,
       look: "flat",
       type: "button",
       onClick: _this.onFilterRemove,