Core: Fix viz pieChart + rangeSelector

DevExpress · Oct 15, 2024 · b5534bd · b5534bd
1 parent f569026
commit b5534bd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/packages/devextreme/js/__internal/core/m_template_manager.ts b/packages/devextreme/js/__internal/core/m_template_manager.ts
@@ -163,3 +163,5 @@ export class TemplateManager {
     });
   }
 }
+
+export default { TemplateManager }
diff --git a/packages/devextreme/js/__internal/core/widget/dom_component.ts b/packages/devextreme/js/__internal/core/widget/dom_component.ts
@@ -5,7 +5,7 @@ import { cleanDataRecursive } from '@js/core/element_data';
 import errors from '@js/core/errors';
 import type { dxElementWrapper } from '@js/core/renderer';
 import $ from '@js/core/renderer';
-import { TemplateManager } from '@js/core/template_manager';
+import TemplateManagerModule from '@ts/core/m_template_manager';
 // @ts-expect-error
 import { grep, noop } from '@js/core/utils/common';
 import { extend } from '@js/core/utils/extend';
@@ -82,8 +82,7 @@ class DOMComponent<
       disabled: false,
 
       integrationOptions: {},
-      // @ts-expect-error
-    }, this._useTemplates() ? TemplateManager.createDefaultOptions() : {});
+    }, this._useTemplates() ? TemplateManagerModule.TemplateManager.createDefaultOptions() : {});
   }
 
   ctor(element: Element, options: TProperties): void {
@@ -532,8 +531,7 @@ class DOMComponent<
     const { integrationOptions = {} } = this.option();
     const { createTemplate } = integrationOptions;
 
-    this._templateManager = new TemplateManager(
-      // @ts-expect-error
+    this._templateManager = new TemplateManagerModule.TemplateManager(
       createTemplate,
       this._getAnonymousTemplateName(),
     );

diff --git a/packages/devextreme/js/viz/range_selector/slider.js b/packages/devextreme/js/viz/range_selector/slider.js
@@ -1,13 +1,13 @@
 import { utils, formatValue } from './common';
 const animationSettings = utils.animationSettings;
 import SliderMarker from './slider_marker';
-import { touchEvents, pointerEvents } from '../../core/utils/support';
+import supportUtils from '../../__internal/core/utils/m_support';
 
 const SPLITTER_WIDTH = 8;
 const TOUCH_SPLITTER_WIDTH = 20;
 
 function getSliderTrackerWidth(sliderHandleWidth) {
-    return touchEvents || pointerEvents ? TOUCH_SPLITTER_WIDTH : (SPLITTER_WIDTH < sliderHandleWidth ? sliderHandleWidth : SPLITTER_WIDTH);
+    return supportUtils.touchEvents || supportUtils.pointerEvents ? TOUCH_SPLITTER_WIDTH : (SPLITTER_WIDTH < sliderHandleWidth ? sliderHandleWidth : SPLITTER_WIDTH);
 }
 
 function Slider(params, index) {

diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js
@@ -17,7 +17,7 @@ import {
     MockSeries, MockPoint, resetMockFactory,
     insertMockFactory, restoreMockFactory, seriesMockData
 } from '../../helpers/chartMocks.js';
-import TemplateManagerModule from 'core/template_manager';
+import TemplateManagerModule from '__internal/core/m_template_manager';
 import graphicObjects from '__internal/common/m_charts';
 import eventsEngine from 'events/core/events_engine';
 import devices from 'core/devices';

diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/slidersController.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/slidersController.tests.js
@@ -1,9 +1,9 @@
-const $ = require('jquery');
-const vizMocks = require('../../helpers/vizMocks.js');
-const SlidersController = require('viz/range_selector/sliders_controller').SlidersController;
-const rendererModule = require('viz/core/renderers/renderer');
-const translator2DModule = require('viz/translators/translator2d');
-const support = require('core/utils/support');
+import $ from 'jquery';
+import vizMocks from '../../helpers/vizMocks.js';
+import { SlidersController } from 'viz/range_selector/sliders_controller';
+import rendererModule from 'viz/core/renderers/renderer';
+import translator2DModule from 'viz/translators/translator2d';
+import support from '__internal/core/utils/m_support';
 
 const environment = {
     beforeEach: function() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,3 +163,5 @@ export class TemplateManager { @@
         });
       }
     }
+    export default { TemplateManager }