Skip to content

Commit ee17a61

Browse files
authored
DataGrid - remove isWinPhone method (DevExpress#30602)
1 parent 17231c0 commit ee17a61

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

packages/devextreme-scss/scss/widgets/base/_gridBase.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,10 +1074,6 @@
10741074
}
10751075
}
10761076

1077-
.dx-#{$widget-name}-notouch-action {
1078-
touch-action: none;
1079-
}
1080-
10811077
.dx-#{$widget-name}-column-chooser-list.dx-treeview {
10821078
.dx-treeview-item,
10831079
.dx-empty-message {

packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable max-classes-per-file */
22
import messageLocalization from '@js/common/core/localization/message';
3-
import devices from '@js/core/devices';
43
import $ from '@js/core/renderer';
54
import { deferUpdate } from '@js/core/utils/common';
65
import { extend } from '@js/core/utils/extend';
@@ -23,7 +22,6 @@ import { defaultOptions } from './const';
2322

2423
const COLUMN_CHOOSER_CLASS = 'column-chooser';
2524
const COLUMN_CHOOSER_BUTTON_CLASS = 'column-chooser-button';
26-
const NOTOUCH_ACTION_CLASS = 'notouch-action';
2725
const COLUMN_CHOOSER_LIST_CLASS = 'column-chooser-list';
2826
const COLUMN_CHOOSER_PLAIN_CLASS = 'column-chooser-plain';
2927
const COLUMN_CHOOSER_DRAG_CLASS = 'column-chooser-mode-drag';
@@ -145,11 +143,6 @@ export class ColumnChooserView extends ColumnsView {
145143

146144
}
147145

148-
private _isWinDevice() {
149-
// @ts-expect-error
150-
return !!devices.real().win;
151-
}
152-
153146
private _initializePopupContainer() {
154147
const that = this;
155148
const columnChooserClass = that.addWidgetPrefix(COLUMN_CHOOSER_CLASS);
@@ -171,11 +164,6 @@ export class ColumnChooserView extends ColumnsView {
171164
width: columnChooserOptions.width,
172165
height: columnChooserOptions.height,
173166
rtlEnabled: that.option('rtlEnabled'),
174-
onHidden() {
175-
if (that._isWinDevice()) {
176-
$('body').removeClass(that.addWidgetPrefix(NOTOUCH_ACTION_CLASS));
177-
}
178-
},
179167
container: columnChooserOptions.container,
180168
_loopFocus: true,
181169
} as PopupProperties;
@@ -250,10 +238,6 @@ export class ColumnChooserView extends ColumnsView {
250238
searchEditorOptions: columnChooser.search?.editorOptions,
251239
};
252240

253-
if (this._isWinDevice()) {
254-
treeViewConfig.useNativeScrolling = false;
255-
}
256-
257241
extend(treeViewConfig, isSelectMode ? this._prepareSelectModeConfig() : this._prepareDragModeConfig());
258242

259243
if (this._columnChooserList) {
@@ -481,10 +465,6 @@ export class ColumnChooserView extends ColumnsView {
481465
this.render();
482466
}
483467
this._popupContainer.show();
484-
485-
if (this._isWinDevice()) {
486-
$('body').addClass(this.addWidgetPrefix(NOTOUCH_ACTION_CLASS));
487-
}
488468
}
489469

490470
private hideColumnChooser() {

0 commit comments

Comments
 (0)