@@ -13,10 +13,6 @@ import Menu from '@js/ui/menu';
1313import Overlay from '@js/ui/overlay/ui.overlay' ;
1414import { selectView } from '@js/ui/shared/accessibility' ;
1515import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m_columns_controller' ;
16- import Calendar from '@ts/ui/calendar/calendar' ;
17- import DateRangeBox from '@ts/ui/date_range_box/m_date_range_box' ;
18- import RangeSlider from '@ts/ui/m_range_slider' ;
19- import TagBox from '@ts/ui/m_tag_box' ;
2016import type MenuInternal from '@ts/ui/menu/menu' ;
2117
2218import type { ColumnHeadersView } from '../column_headers/m_column_headers' ;
@@ -80,6 +76,7 @@ const FILTER_MODIFIED_CLASS = 'dx-filter-modified';
8076const EDITORS_INPUT_SELECTOR = 'input:not([type=\'hidden\'])' ;
8177
8278const BETWEEN_OPERATION_DATA_TYPES = [ 'date' , 'datetime' , 'number' ] ;
79+ const MULTISELECT_EDITOR_NAMES = [ 'dxTagBox' , 'dxDateRangeBox' , 'dxCalendar' , 'dxRangeSlider' ] ;
8380
8481function isOnClickApplyFilterMode ( that ) {
8582 return that . option ( 'filterRow.applyFilter' ) === 'onClick' ;
@@ -130,10 +127,8 @@ const getColumnSelectedFilterOperation = function (that, column) {
130127
131128const hasMultiselectEditor = function ( $editorContainer ) : boolean {
132129 const editor = getEditorInstance ( $editorContainer ) ;
133- return editor instanceof TagBox
134- || editor instanceof DateRangeBox
135- || editor instanceof Calendar
136- || editor instanceof RangeSlider ;
130+ // @ts -expect-error
131+ return ! editor || MULTISELECT_EDITOR_NAMES . includes ( editor . NAME ) ;
137132} ;
138133
139134const isValidFilterValue = function ( filterValue , column , $editorContainer ) : boolean {
0 commit comments