Core: use ts device in events to try to fix mobile tests

DevExpress · Oct 16, 2024 · 6b4a9e5 · 6b4a9e5
1 parent 8437164
commit 6b4a9e5
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/packages/devextreme/js/__internal/core/m_devices.ts b/packages/devextreme/js/__internal/core/m_devices.ts
@@ -201,7 +201,7 @@ class Devices {
     return this._currentDevice;
   }
 
-  real(forceDevice) {
+  real(forceDevice?) {
     /// #DEBUG
     if (isPlainObject(forceDevice)) {
       extend(this._realDevice, forceDevice);

diff --git a/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts b/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts
@@ -1,5 +1,5 @@
 import Class from '@js/core/class';
-import devices from '@js/core/devices';
+import devices from '@ts/core/m_devices';
 import { ensureDefined, noop } from '@js/core/utils/common';
 import { contains } from '@js/core/utils/dom';
 import Emitter from '@js/events/core/emitter';

diff --git a/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.scroll.ts b/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.scroll.ts
@@ -1,12 +1,12 @@
 import { cancelAnimationFrame, requestAnimationFrame } from '@js/animation/frame';
 import Class from '@js/core/class';
-import devices from '@js/core/devices';
 import registerEmitter from '@js/events/core/emitter_registrator';
 import eventsEngine from '@js/events/core/events_engine';
 import GestureEmitter from '@js/events/gesture/emitter.gesture';
 import {
   addNamespace, eventData, eventDelta, isDxMouseWheelEvent, isMouseEvent,
 } from '@js/events/utils/index';
+import devices from '@ts/core/m_devices';
 
 const { abstract } = Class;
 

diff --git a/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.ts b/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.ts
@@ -1,4 +1,3 @@
-import devices from '@js/core/devices';
 import $ from '@js/core/renderer';
 import callOnce from '@js/core/utils/call_once';
 import { noop } from '@js/core/utils/common';
@@ -11,6 +10,7 @@ import eventsEngine from '@js/events/core/events_engine';
 import {
   createEvent, eventData, eventDelta, isDxMouseWheelEvent, isTouchEvent, needSkipEvent,
 } from '@js/events/utils/index';
+import devices from '@ts/core/m_devices';
 import domUtils from '@ts/core/utils/m_dom';
 
 const ready = readyCallbacks.add;

diff --git a/packages/devextreme/js/__internal/events/m_click.ts b/packages/devextreme/js/__internal/events/m_click.ts
@@ -1,5 +1,4 @@
 import { cancelAnimationFrame, requestAnimationFrame } from '@js/animation/frame';
-import devices from '@js/core/devices';
 import domAdapter from '@js/core/dom_adapter';
 import $ from '@js/core/renderer';
 import { resetActiveElement } from '@js/core/utils/dom';
@@ -10,6 +9,7 @@ import pointerEvents from '@js/events/pointer';
 import { subscribeNodesDisposing, unsubscribeNodesDisposing } from '@js/events/utils/event_nodes_disposing';
 import { getEventTarget } from '@js/events/utils/event_target';
 import { addNamespace, fireEvent } from '@js/events/utils/index';
+import devices from '@ts/core/m_devices';
 
 const CLICK_EVENT_NAME = 'dxclick';
 

diff --git a/packages/devextreme/js/__internal/events/m_contextmenu.ts b/packages/devextreme/js/__internal/events/m_contextmenu.ts
@@ -1,10 +1,10 @@
 import Class from '@js/core/class';
-import devices from '@js/core/devices';
 import $ from '@js/core/renderer';
 import registerEvent from '@js/events/core/event_registrator';
 import eventsEngine from '@js/events/core/events_engine';
 import holdEvent from '@js/events/hold';
 import { addNamespace, fireEvent, isMouseEvent } from '@js/events/utils/index';
+import devices from '@ts/core/m_devices';
 import supportUtils from '@ts/core/utils/m_support';
 
 const CONTEXTMENU_NAMESPACE = 'dxContexMenu';

diff --git a/packages/devextreme/js/__internal/events/m_hover.ts b/packages/devextreme/js/__internal/events/m_hover.ts
@@ -1,10 +1,10 @@
 import Class from '@js/core/class';
-import devices from '@js/core/devices';
 import { data as elementData, removeData } from '@js/core/element_data';
 import registerEvent from '@js/events/core/event_registrator';
 import eventsEngine from '@js/events/core/events_engine';
 import pointerEvents from '@js/events/pointer';
 import { addNamespace, fireEvent, isTouchEvent } from '@js/events/utils/index';
+import devices from '@ts/core/m_devices';
 
 const HOVERSTART_NAMESPACE = 'dxHoverStart';
 const HOVERSTART = 'dxhoverstart';

diff --git a/packages/devextreme/js/__internal/events/m_pointer.ts b/packages/devextreme/js/__internal/events/m_pointer.ts
@@ -1,10 +1,10 @@
 import GlobalConfig from '@js/core/config';
-import devices from '@js/core/devices';
 import { each } from '@js/core/utils/iterator';
 import registerEvent from '@js/events/core/event_registrator';
 import MouseStrategy from '@js/events/pointer/mouse';
 import MouseAndTouchStrategy from '@js/events/pointer/mouse_and_touch';
 import TouchStrategy from '@js/events/pointer/touch';
+import devices from '@ts/core/m_devices';
 import support from '@ts/core/utils/m_support';
 
 const getStrategy = (support, { tablet, phone }) => {

diff --git a/packages/devextreme/js/__internal/events/pointer/m_touch.ts b/packages/devextreme/js/__internal/events/pointer/m_touch.ts
@@ -1,7 +1,7 @@
-import devices from '@js/core/devices';
 import { extend } from '@js/core/utils/extend';
 import { each } from '@js/core/utils/iterator';
 import BaseStrategy from '@js/events/pointer/base';
+import devices from '@ts/core/m_devices';
 
 /* eslint-disable spellcheck/spell-checker */
 const eventMap = {